Commits · 93cf0dc76bf9212b465608f82e95327045a25750 · memberTag / memberTag-web · GitLab

16 Apr, 2019 3 commits
- 实现标签的拖拽功能 · 93cf0dc7
  caoyanzhi authored Apr 16, 2019
  
  93cf0dc7 Browse Files
- Merge branch 'dev' of http://115.159.76.241/memberTag/memberTag-web into dev-dingdang · 8b22ef1a
  caoyanzhi authored Apr 16, 2019
  
  8b22ef1a Browse Files
- 解决编辑会员分组时，添加一组标签，标签组之间关系异常的问题 · 94d0f593
  caoyanzhi authored Apr 16, 2019
  
  94d0f593 Browse Files
15 Apr, 2019 19 commits
- 解决编辑之后的新数据不更新的问题 · 504d9048
  caoyanzhi authored Apr 15, 2019
  
  504d9048 Browse Files
- 新增会员分组 · add172a2
  member authored Apr 15, 2019
  
  add172a2 Browse Files
- 优化代码实现 · 18104794
  caoyanzhi authored Apr 15, 2019
  
  18104794 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev-dingdang · dcfa7ca9
  member authored Apr 15, 2019
  
  dcfa7ca9 Browse Files
- 修改会员标签配置 · 733dead7
  member authored Apr 15, 2019
  
  733dead7 Browse Files
- 删除无用的代码 · 710837cc
  caoyanzhi authored Apr 15, 2019
  
  710837cc Browse Files
- 删除console · dfb88d3c
  caoyanzhi authored Apr 15, 2019
  
  dfb88d3c Browse Files
- 修改验证规则的字段名 · c19573fe
  caoyanzhi authored Apr 15, 2019
  
  c19573fe Browse Files
- 提交错了 · 621f2930
  caoyanzhi authored Apr 15, 2019
  
  621f2930 Browse Files
- 修改样式 · 3f975152
  caoyanzhi authored Apr 15, 2019
  
  3f975152 Browse Files
- 将添加标签和编辑标签的弹窗抽出来做成一个组件 · 727113a5
  caoyanzhi authored Apr 15, 2019
  
  727113a5 Browse Files
- 修改字段名称 · d0aebbfb
  caoyanzhi authored Apr 15, 2019
  
  d0aebbfb Browse Files
- 安装2.5.2 · bb7a3b29
  member authored Apr 15, 2019
  
  bb7a3b29 Browse Files
- Merge branch 'dev' of http://115.159.76.241/memberTag/memberTag-web into dev-dingdang · 7302c58d
  caoyanzhi authored Apr 15, 2019
  
  7302c58d Browse Files
- 提交合并 · be3f0c26
  member authored Apr 15, 2019
  
  be3f0c26 Browse Files
- 1.解决搜索框不能搜索标签的问题 · 4ea16765
```
2.解决选择的标签不能显示的问题
```
  caoyanzhi authored Apr 15, 2019
  4ea16765 Browse Files
- 修改添加按钮的样式 · 9477b73a
  caoyanzhi authored Apr 15, 2019
  
  9477b73a Browse Files
- Merge branch 'dev' of http://115.159.76.241/memberTag/memberTag-web into dev-dingdang · 8e8500d3
  caoyanzhi authored Apr 15, 2019
  
  8e8500d3 Browse Files
- 右侧的创建按钮 · 0eeec886
  member authored Apr 15, 2019
  
  0eeec886 Browse Files
13 Apr, 2019 9 commits
- 添加标签 · 7542caa0
  member authored Apr 13, 2019
  
  7542caa0 Browse Files
- 注释两行不需要的代码 · 1b10ae76
  caoyanzhi authored Apr 13, 2019
  
  1b10ae76 Browse Files
- Merge branch 'dev-dingdang' into dev · e1d8abd8
  member authored Apr 13, 2019
  
  e1d8abd8 Browse Files
- 对接添加标签组件 · 2b676e87
  member authored Apr 13, 2019
  
  2b676e87 Browse Files
- 调整组件，暴露出当前标签组的索引 · fe7d1dae
  caoyanzhi authored Apr 13, 2019
  
  fe7d1dae Browse Files
- Merge branch 'dev-dingdang' of 115.159.76.241:memberTag/memberTag-web into dev-dingdang · d4950bd1
  member authored Apr 13, 2019
  
  d4950bd1 Browse Files
- 优化组件 · 2f0bbad4
  caoyanzhi authored Apr 13, 2019
  
  2f0bbad4 Browse Files
- 修改会员标签设置 · 8192f25b
  member authored Apr 13, 2019
  
  8192f25b Browse Files
- 下拉菜单展示“添加标签”可配置 · 66c5e01d
  caoyanzhi authored Apr 13, 2019
  
  66c5e01d Browse Files
12 Apr, 2019 7 commits
- 优化实现 · c5c8073d
  caoyanzhi authored Apr 12, 2019
  
  c5c8073d Browse Files
- 优化实现 · f33c2af0
  caoyanzhi authored Apr 12, 2019
  
  f33c2af0 Browse Files
- 删除不用的代码 · 2bdec947
  caoyanzhi authored Apr 12, 2019
  
  2bdec947 Browse Files
- 解决dialog 内容在遮罩层下面的问题 · 9a175938
  caoyanzhi authored Apr 12, 2019
  
  9a175938 Browse Files
- 调整样式 · 9f35920e
  caoyanzhi authored Apr 12, 2019
  
  9f35920e Browse Files
- 修改标签组选中样式 · b09ae4d6
  caoyanzhi authored Apr 12, 2019
  
  b09ae4d6 Browse Files
- 实现展示标签组详情的组件 · 48f2f100
  caoyanzhi authored Apr 12, 2019
  
  48f2f100 Browse Files
11 Apr, 2019 2 commits
- j解决冲突 · 5a75a082
  caoyanzhi authored Apr 11, 2019
  
  5a75a082 Browse Files
- Merge branch 'dev' of http://115.159.76.241/memberTag/memberTag-web into dev-dingdang · 9dd4aef7
```
# Conflicts:
#	src/view/memberGroup/memberGroupDetail.vue
```
  caoyanzhi authored Apr 11, 2019
  9dd4aef7 Browse Files