Commits · f68a93f48bf36dbb0fd8730b89a7c44f6715671f · new-sing / admin-base

12 Sep, 2018 6 commits
- Merge remote-tracking branch 'origin/development' into development · f68a93f4
  wangwei authored Sep 12, 2018
```
# Conflicts:
#	src/components/periods/index.vue
```
  f68a93f4
- 菜单权限按钮权限 · 6db49bd1
  wangwei authored Sep 12, 2018
  
  6db49bd1
- build · 441d2224
  王 authored Sep 12, 2018
  
  441d2224
- 期数添加按钮靠右 · 8451fa92
  王 authored Sep 12, 2018
  
  8451fa92
- 期数列表bug · 476a361a
  王 authored Sep 12, 2018
  
  476a361a
- build · 196c84f5
  王 authored Sep 12, 2018
  
  196c84f5
11 Sep, 2018 19 commits
- build · 528a1525
  王 authored Sep 11, 2018
  
  528a1525
- build · 810ee971
  王 authored Sep 11, 2018
  
  810ee971
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · b6a94d11
  王 authored Sep 11, 2018
  
  b6a94d11
- bug fix · 9abf529c
  王 authored Sep 11, 2018
  
  9abf529c
- 课包上传修改 · b93ad32e
  wangwei authored Sep 11, 2018
  
  b93ad32e
- Merge remote-tracking branch 'origin/development' into development · 64229407
  wangwei authored Sep 11, 2018
```
# Conflicts:
#	dist/index.html
#	dist/static/css/app.89fe2d1e7c46dbcfba5b58f69aa75a66.css
#	dist/static/js/1.71e62809b2eeddc9ec6b.js
#	dist/static/js/12.82360f4459283c54454a.js
```
  64229407
- 课包上传修改 · 84eeba67
  wangwei authored Sep 11, 2018
  
  84eeba67
- build · cc0d45bc
  王 authored Sep 11, 2018
  
  cc0d45bc
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · 74df5037
  王 authored Sep 11, 2018
  
  74df5037
- 菜单排序 · 2bf44f83
  王 authored Sep 11, 2018
  
  2bf44f83
- 盒子添加搜索和库存 · 88104ee9
  wangwei authored Sep 11, 2018
  
  88104ee9
- Merge remote-tracking branch 'origin/development' into development · 1b48b4d4
  wangwei authored Sep 11, 2018
  
  1b48b4d4
- 盒子添加搜索和库存 · 72653d0e
  wangwei authored Sep 11, 2018
  
  72653d0e
- remove unused code · 6960f7af
  王 authored Sep 11, 2018
  
  6960f7af
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · ea923599
  王 authored Sep 11, 2018
  
  ea923599
- 公众号自动回复 · 85987c63
  王 authored Sep 11, 2018
  
  85987c63
- 盒子添加搜索和库存 · 0db31aa2
  wangwei authored Sep 11, 2018
  
  0db31aa2
- 打包 · 718aa6b4
  wangwei authored Sep 11, 2018
  
  718aa6b4
- 菜单管理 · e99afee9
  王 authored Sep 11, 2018
  
  e99afee9
10 Sep, 2018 11 commits
- conflit · 1bf64e23
  王 authored Sep 10, 2018
  
  1bf64e23
- 公众号菜单名字修改 · 215eca8f
  王 authored Sep 10, 2018
  
  215eca8f
- Merge remote-tracking branch 'origin/development' into development · 79c7caed
  wangwei authored Sep 10, 2018
  
  79c7caed
- build · 5a7948bf
  王 authored Sep 10, 2018
  
  5a7948bf
- 课程管理bug&.. · 9483849d
  王 authored Sep 10, 2018
  
  9483849d
- 打包 · ace92b79
  wangwei authored Sep 10, 2018
  
  ace92b79
- bug fix 课程 · edb86fab
  王 authored Sep 10, 2018
  
  edb86fab
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · 7eca7a63
  王 authored Sep 10, 2018
  
  7eca7a63
- 去除tab/home注释开发中... · f7ad327c
  王 authored Sep 10, 2018
  
  f7ad327c
- 打包 · 02ae646c
  wangwei authored Sep 10, 2018
  
  02ae646c
- 打包 · a71e4c12
  wangwei authored Sep 10, 2018
  
  a71e4c12
07 Sep, 2018 4 commits
- build · 7c9b1052
  王 authored Sep 07, 2018
  
  7c9b1052
- confilt · d0a51cbe
  王 authored Sep 07, 2018
  
  d0a51cbe
- bug fix · ed9b8c13
  王 authored Sep 07, 2018
  
  ed9b8c13
- 主页图片 · 2c57a5aa
  wangwei authored Sep 07, 2018
```
菜单打开
```
  2c57a5aa