Commits · 61dd67dfb8feeaf63afba75dbc274833dbdc3c1a · new-sing / admin-base

14 Sep, 2018 3 commits
- build · 61dd67df
  王 authored Sep 14, 2018
  
  61dd67df
- ”班级列表查询bug“ · b979f2d4
  王 authored Sep 14, 2018
  
  b979f2d4
- 所有分页的添加 · c8d3e1e8
  王 authored Sep 14, 2018
  
  c8d3e1e8
13 Sep, 2018 10 commits
- log · 00b2a719
  王 authored Sep 13, 2018
  
  00b2a719
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · 8df7b387
  王 authored Sep 13, 2018
  
  8df7b387
- log · 082a1314
  王 authored Sep 13, 2018
  
  082a1314
- 打包 · a94ae54b
  wangwei authored Sep 13, 2018
  
  a94ae54b
- 单品盒子修改 · 41a1b884
  王 authored Sep 13, 2018
  
  41a1b884
- 样式修改 · 5d96b1c6
  王 authored Sep 13, 2018
  
  5d96b1c6
- Merge branch 'development' of http://git.singsingenglish.com/new-sing/admin into development · 2760a6de
  王 authored Sep 13, 2018
  
  2760a6de
- 订单管理 · 2cbcc9fd
  王 authored Sep 13, 2018
  
  2cbcc9fd
- 课包：模板添加更新 · 691301c8
  wangwei authored Sep 13, 2018
```
 列表滚动 删除确定 编辑加序号说明
```
  691301c8
- add readonly for button · 09c2daa5
  王 authored Sep 13, 2018
  
  09c2daa5
12 Sep, 2018 7 commits
- 菜单权限按钮权限 · 61cc4136
  wangwei authored Sep 12, 2018
  
  61cc4136
- 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 1 commit
- conflit · 1bf64e23
  王 authored Sep 10, 2018
  
  1bf64e23