Commits · 7302c58d13ab4a9ff508efea54d63f0af06518e2 · memberTag / memberTag-web · GitLab

15 Apr, 2019 6 commits
- 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 18 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
- 合并标签配置项 · 70454fbd
  member authored Apr 11, 2019
  
  70454fbd Browse Files
- 删除不用的代码 · e888e230
  caoyanzhi authored Apr 11, 2019
  
  e888e230 Browse Files
- 修改自定义表格字段按钮的样式 · a62b61c8
  caoyanzhi authored Apr 11, 2019
  
  a62b61c8 Browse Files
- Merge branch 'dev' of http://115.159.76.241/memberTag/memberTag-web into dev-dingdang · a4fdc237
  caoyanzhi authored Apr 11, 2019
  
  a4fdc237 Browse Files
- 优化实现 · ce296e1d
  caoyanzhi authored Apr 11, 2019
  
  ce296e1d Browse Files
- 修改样式 · ab78ca19
  caoyanzhi authored Apr 11, 2019
  
  ab78ca19 Browse Files
- 配置项 · ffaeb011
  member authored Apr 11, 2019
  
  ffaeb011 Browse Files
- 修改样式 · bce11e26
  caoyanzhi authored Apr 11, 2019
  
  bce11e26 Browse Files
- 解决遮罩在弹窗上面的问题 · 8dcc60e8
  caoyanzhi authored Apr 11, 2019
  
  8dcc60e8 Browse Files
- 修改样式 · e019ff0e
  caoyanzhi authored Apr 11, 2019
  
  e019ff0e Browse Files
- 注释 · 02a38af6
  caoyanzhi authored Apr 11, 2019
  
  02a38af6 Browse Files
- 添加判断标签是否存在的代码 · 49a2ddb9
  caoyanzhi authored Apr 11, 2019
  
  49a2ddb9 Browse Files
- 调整代码 · e1da0a2e
  caoyanzhi authored Apr 11, 2019
  
  e1da0a2e Browse Files
- 删除不用的代码 · c9800619
  caoyanzhi authored Apr 11, 2019
  
  c9800619 Browse Files
- 修改样式 · f92e5435
  caoyanzhi authored Apr 11, 2019
  
  f92e5435 Browse Files
- 新增会员分组 · 58d6961c
  caoyanzhi authored Apr 11, 2019
  
  58d6961c Browse Files