Commits · b64254e13b1550830eb40d8e25b56bdd78c31022 · new-sing / admin-base

22 Aug, 2019 2 commits
- Merge branch 'callback' into dev · b64254e1
  赵茹林 authored Aug 22, 2019
```
# Conflicts:
#	src/util/wordbook.js
```
  b64254e1
- 回访信息 - 标签新增、编辑、删除 · 9de13154
  赵茹林 authored Aug 22, 2019
```
回访信息 - 列表 展示、新增
```
  9de13154
20 Aug, 2019 5 commits
- 增加一次性物流信息最后更新时间 · 06cccc36
  赵茹林 authored Aug 20, 2019
```
修复 一次性物流信息 导出无效
```
  06cccc36
- update · 68344a42
  赵茹林 authored Aug 20, 2019
  
  68344a42
- update · d29b945e
  赵茹林 authored Aug 20, 2019
  
  d29b945e
- update · 74ed0710
  赵茹林 authored Aug 20, 2019
  
  74ed0710
- 新增一次性物流信息编辑 · dd43036e
  赵茹林 authored Aug 20, 2019
  
  dd43036e
19 Aug, 2019 2 commits
- 新增一次性物流信息展示、筛选、导出（编辑todo） · 0f3705a5
  赵茹林 authored Aug 19, 2019
  
  0f3705a5
- 新增用户信息接口对接 · a6758f51
  赵茹林 authored Aug 19, 2019
```
新增 用户标签接口对接
```
  a6758f51
15 Aug, 2019 7 commits
- Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev · 5792c118
  赵茹林 authored Aug 15, 2019
  
  5792c118
- 修复商品日课月课切换不对的问题 · 88692bdb
  赵茹林 authored Aug 15, 2019
  
  88692bdb
- Merge branch 'master' into dev · cfb86794
  chenyishuai@singsingenglish.com authored Aug 15, 2019
  
  cfb86794
- Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev · dab733d3
  chenyishuai@singsingenglish.com authored Aug 15, 2019
  
  dab733d3
- Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin · f9ee9372
  chenyishuai@singsingenglish.com authored Aug 15, 2019
  
  f9ee9372
- 修复编辑商品看不到课程列表的问题 · a57e31b9
  赵茹林 authored Aug 15, 2019
  
  a57e31b9
- 新增导出完课用户的权限 · fa719c17
  赵茹林 authored Aug 15, 2019
  
  fa719c17
14 Aug, 2019 16 commits
- 814 · 3fb4993c
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  3fb4993c
- Merge branch 'dev' · ac9d3c71
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  ac9d3c71
- update · ad61aa1e
  赵茹林 authored Aug 14, 2019
  
  ad61aa1e
- 814 · c70bf725
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  c70bf725
- Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev · c0bb4e35
  赵茹林 authored Aug 14, 2019
  
  c0bb4e35
- 更新最近更新时间 · 55a2fe29
  赵茹林 authored Aug 14, 2019
  
  55a2fe29
- 814 · 82c6eb09
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  82c6eb09
- 814 · f56be171
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  f56be171
- Merge branch 'master' into dev · 6740ee96
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  6740ee96
- Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev · bdee372f
  赵茹林 authored Aug 14, 2019
  
  bdee372f
- 新增导出完课用户 · 4622dd7a
  赵茹林 authored Aug 14, 2019
```
新增 数据管理更新时间
新增 设备移交原因
新增 用户转移
更新 期数名称3个
优化 选择用户样式
```
  4622dd7a
- 814 · e62447b9
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  e62447b9
- 814 · da755988
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  da755988
- 814 · cade2375
  chenyishuai@singsingenglish.com authored Aug 14, 2019
  
  cade2375
- Merge branch 'master' into dev · 230fd530
  赵茹林 authored Aug 14, 2019
```
# Conflicts:
#	index.html
#	src/components/logistics/index.vue
#	src/components/notBuyClass/index.vue
#	src/components/order/index.vue
#	src/components/system/tag.vue
```
  230fd530
- update · 7b28e250
  赵茹林 authored Aug 14, 2019
  
  7b28e250
13 Aug, 2019 6 commits
- 期数名称 · 5bb62fd3
  赵茹林 authored Aug 13, 2019
  
  5bb62fd3
- 修复标签页弹窗bug · e9d96da5
  赵茹林 authored Aug 13, 2019
```
更新静态文件CDN链接
```
  e9d96da5
- 812 · 9eb0f525
  chenyishuai@singsingenglish.com authored Aug 13, 2019
  
  9eb0f525
- 812 · 1c9f7eb5
  chenyishuai@singsingenglish.com authored Aug 13, 2019
  
  1c9f7eb5
- 812 · 4b6bc265
  chenyishuai@singsingenglish.com authored Aug 13, 2019
  
  4b6bc265
- 812 · bcf74f68
  chenyishuai@singsingenglish.com authored Aug 13, 2019
  
  bcf74f68
12 Aug, 2019 2 commits
- update · d0797f22
  赵茹林 authored Aug 12, 2019
  
  d0797f22
- 标签页新增搜索、高级搜索、导出、权限配置 · a49dae2b
  赵茹林 authored Aug 12, 2019
```
9个期数搜索框更新
```
  a49dae2b