Commits · b5f4e4de3701c5cc35fccc0652a59188e1faec66 · memberTag / memberTag-web · GitLab

18 Jan, 2021 2 commits
- Merge branch 'feature/表格提示' of http://115.159.76.241/memberTag/memberTag-web into dev · b5f4e4de
  Kyle_Li authored Jan 18, 2021
  
  b5f4e4de Browse Files
- update: 文案修改 · a850238e
  Kyle_Li authored Jan 18, 2021
  
  a850238e Browse Files
14 Jan, 2021 2 commits
- Merge branch 'feature/金字塔调整' into dev · 0176e2af
  wangyusheng authored Jan 14, 2021
  
  0176e2af Browse Files
- add: 会员分层未开启提示 · 6f95c585
  wangyusheng authored Jan 14, 2021
  
  6f95c585 Browse Files
12 Jan, 2021 3 commits
- Merge branch 'feature/fix-edit' into 'master' · e1968de5
```
fix edit

See merge request !18
```
  wangyusheng authored Jan 12, 2021
  e1968de5 Browse Files
- Merge branch 'feature/fix-edit' of http://115.159.76.241/memberTag/memberTag-web into dev · bda8f4ae
  Kyle_Li authored Jan 12, 2021
  
  bda8f4ae Browse Files
- update: build · b3d46610
  Kyle_Li authored Jan 12, 2021
  
  b3d46610 Browse Files
11 Jan, 2021 2 commits
- Merge branch 'feature/头部' of http://115.159.76.241/memberTag/memberTag-web into dev · 194738d0
  Kyle_Li authored Jan 11, 2021
  
  194738d0 Browse Files
- update: header.2.0.45 · 4e5ebe8c
  Kyle_Li authored Jan 11, 2021
  
  4e5ebe8c Browse Files
04 Jan, 2021 6 commits
- Merge branch 'bugfix' into dev · f9461a9f
```
# Conflicts:
#	dist/index.html
#	dist/static/js/6.ba0d71bbe8d39566167a.js
#	dist/static/js/manifest.56940ee6e2b847f7c9c4.js
```
  wangyusheng authored Jan 05, 2021
  f9461a9f Browse Files
- Merge branch 'bugfix' into 'master' · e3e0f3dc
```
fix: date

See merge request !17
```
  chenxin authored Jan 05, 2021
  e3e0f3dc Browse Files
- fix: date · 322c1dc7
  wangyusheng authored Jan 05, 2021
  
  322c1dc7 Browse Files
- update: build · 8f2b88f1
  Kyle_Li authored Jan 04, 2021
  
  8f2b88f1 Browse Files
- update: dist · c9c126fe
  wangyusheng authored Jan 04, 2021
  
  c9c126fe Browse Files
- Merge branch 'feature/卡券选择器' into 'master' · 279aaca9
```
Feature/卡券选择器

See merge request !16
```
  chenxin authored Jan 04, 2021
  279aaca9 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 4 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