Commits · c9c126fe080c91e0fcaf8b6ba9a6ff9d944cb0e7 · memberTag / memberTag-web · GitLab

04 Jan, 2021 1 commit
- update: dist · c9c126fe
  wangyusheng authored Jan 04, 2021
  
  c9c126fe Browse Files
30 Dec, 2020 2 commits
- Merge branch 'feature/卡券选择器' of http://115.159.76.241/memberTag/memberTag-web into dev · d274a0c7
  Kyle_Li authored Dec 30, 2020
  
  d274a0c7 Browse Files
- update: selector 1.2.20 store-new 2.0.65 · 868900ff
  Kyle_Li authored Dec 30, 2020
  
  868900ff Browse Files
28 Dec, 2020 3 commits
- Merge branch 'feature/卡券选择器' of http://115.159.76.241/memberTag/memberTag-web into dev · 682fa347
  Kyle_Li authored Dec 28, 2020
  
  682fa347 Browse Files
- update: build · 45ba0746
  Kyle_Li authored Dec 28, 2020
  
  45ba0746 Browse Files
- fix: card · 5155af15
  chenxin authored Dec 28, 2020
  
  5155af15 Browse Files
25 Dec, 2020 2 commits
- Merge branch 'feature/表格提示' of http://115.159.76.241/memberTag/memberTag-web into dev · ef6e2d9e
  Kyle_Li authored Dec 25, 2020
  
  ef6e2d9e Browse Files
- update: 分组表格提示 · a4cb3837
  Kyle_Li authored Dec 25, 2020
  
  a4cb3837 Browse Files
24 Dec, 2020 2 commits
- Merge branch 'feature/卡券选择器' into dev · c78c54c2
```
# Conflicts:
#	dist/index.html
#	index.html
```
  Kyle_Li authored Dec 24, 2020
  c78c54c2 Browse Files
- 卡券选择器其实并没有用到，卡券选择器不符合该项目业务场景，他用的是自己的项目里的卡券选择器 · fefd73f2
  Kyle_Li authored Dec 24, 2020
  
  fefd73f2 Browse Files
16 Dec, 2020 2 commits
- Merge branch 'feature/卡券选择器' of http://115.159.76.241/memberTag/memberTag-web into dev · a519316f
  Kyle_Li authored Dec 16, 2020
  
  a519316f Browse Files
- update: card.2.0.16 · b9765196
  Kyle_Li authored Dec 16, 2020
  
  b9765196 Browse Files
15 Dec, 2020 2 commits
- Merge branch 'feature/编辑判断bug' into 'master' · cdc0275e
```
Feature/编辑判断bug

See merge request !15
```
  wangyusheng authored Dec 16, 2020
  cdc0275e Browse Files
- update:build · 9d213e28
  Kyle_Li authored Dec 15, 2020
  
  9d213e28 Browse Files
10 Dec, 2020 2 commits
- Merge branch 'feature/编辑判断bug' of http://115.159.76.241/memberTag/memberTag-web into dev · b6af04e5
  Kyle_Li authored Dec 10, 2020
  
  b6af04e5 Browse Files
- fix: 编辑判断条件更改 · 126a771a
  Kyle_Li authored Dec 10, 2020
  
  126a771a Browse Files
08 Dec, 2020 6 commits
- Merge branch 'feature/分组编辑按钮显示' into 'master' · d291efd1
```
Feature/分组编辑按钮显示

See merge request !14
```
  wangyusheng authored Dec 08, 2020
  d291efd1 Browse Files
- update: build · 14142701
  Kyle_Li authored Dec 08, 2020
  
  14142701 Browse Files
- Merge branch 'feature/门店选择器' of http://115.159.76.241/memberTag/memberTag-web into feature/分组编辑按钮显示 · 6270e2ce
  Kyle_Li authored Dec 08, 2020
  
  6270e2ce Browse Files
- Merge branch 'feature/分组删除提示文案调整' of… · a10447dc
```
Merge branch 'feature/分组删除提示文案调整' of http://115.159.76.241/memberTag/memberTag-web into feature/分组编辑按钮显示
```
  Kyle_Li authored Dec 08, 2020
  a10447dc Browse Files
- Merge branch 'feature/门店选择器' of http://115.159.76.241/memberTag/memberTag-web into dev · 3f3cede1
  Kyle_Li authored Dec 08, 2020
  
  3f3cede1 Browse Files
- update: store-new.2.0.64 · d9818ad4
  Kyle_Li authored Dec 08, 2020
  
  d9818ad4 Browse Files
07 Dec, 2020 8 commits
- Merge branch 'feature/分组编辑按钮显示' of http://115.159.76.241/memberTag/memberTag-web into dev · 862e24af
  Kyle_Li authored Dec 07, 2020
  
  862e24af Browse Files
- update: 编辑按钮显示更改 · 3192745e
  Kyle_Li authored Dec 07, 2020
  
  3192745e Browse Files
- Merge branch 'feature/门店选择器' of http://115.159.76.241/memberTag/memberTag-web into dev · 9de0b3b0
  Kyle_Li authored Dec 07, 2020
  
  9de0b3b0 Browse Files
- update: store-new.2.0.62 · 4e3ed8f7
  Kyle_Li authored Dec 07, 2020
  
  4e3ed8f7 Browse Files
- Update index.html · c4ab1f1b
  member authored Dec 07, 2020
  
  c4ab1f1b Browse Files
- Merge branch 'feature/分组删除提示文案调整' into dev · e08560b9
  wangyusheng authored Dec 07, 2020
  
  e08560b9 Browse Files
- update: 分组删除提示文案调整 · 82183cf8
  wangyusheng authored Dec 07, 2020
  
  82183cf8 Browse Files
- Update index.html · a432212c
  member authored Dec 07, 2020
  
  a432212c Browse Files
03 Dec, 2020 10 commits
- Merge branch 'feature/会员分组变更日志' · 134e50a7
  luojie authored Dec 04, 2020
  
  134e50a7 Browse Files
- update: build · 140b7411
  luojie authored Dec 04, 2020
  
  140b7411 Browse Files
- fix: 修复接口链接 · bbb4ad60
  luojie authored Dec 04, 2020
  
  bbb4ad60 Browse Files
- Merge branch 'feature/会员分组变更日志' into 'master' · bb191e09
```
Feature/会员分组变更日志

See merge request !13
```
  wangyusheng authored Dec 03, 2020
  bb191e09 Browse Files
- update: 修改表格列宽度 · 7b82a3fd
  黑潮 authored Dec 03, 2020
  
  7b82a3fd Browse Files
- Merge branch 'feature/会员分组变更日志' into dev · c0c972e5
```
# Conflicts:
#	dist/index.html
#	dist/static/js/6.c0082e0760646e1b398f.js
#	dist/static/js/7.3942f2ed9fd061ac7b65.js
#	dist/static/js/7.5c03be74455e6564e4bb.js
```
  黑潮 authored Dec 03, 2020
  c0c972e5 Browse Files
- update: 修改表格列宽度 · 6c9d24c2
  黑潮 authored Dec 03, 2020
  
  6c9d24c2 Browse Files
- fix: 删除按钮 · 6ed80d03
  黑潮 authored Dec 03, 2020
  
  6ed80d03 Browse Files
- Merge branch 'feature/会员分组变更日志' into 'master' · 4da79507
```
Feature/会员分组变更日志

See merge request !11
```
  wangyusheng authored Dec 03, 2020
  4da79507 Browse Files
- update: build · ba697c5c
  黑潮 authored Dec 03, 2020
  
  ba697c5c Browse Files