Commits · 9225f40780f26f9dfe5fabbb5168c7ac0368b452 · marketing-web / marketing · GitLab

18 May, 2020 5 commits
- Merge branch 'master' of 115.159.76.241:marketing-web/marketing · 9225f407
```
# Conflicts:
#	dist/index.html
```
  chenxin authored May 18, 2020
  9225f407 Browse Files
- fix:merge · d8b6fb25
  chenxin authored May 18, 2020
  
  d8b6fb25 Browse Files
- fix:klfl 一些状态 · 1ad5b23e
  chenxin authored May 18, 2020
  
  1ad5b23e Browse Files
- fix:build · 7aa336da
  chenxin authored May 18, 2020
  
  7aa336da Browse Files
- fix: wm券号 · 980999b4
  chenxin authored May 18, 2020
  
  980999b4 Browse Files
14 May, 2020 9 commits
- fix:build · 836a887b
  chenxin authored May 14, 2020
  
  836a887b Browse Files
- fix:build · ce8a108c
  chenxin authored May 14, 2020
  
  ce8a108c Browse Files
- Update index.html · cde3b39d
  chenxin authored May 14, 2020
  
  cde3b39d Browse Files
- fix:klfl回滚，原调整库存的caculate.vue 加maxStock · 89af0d8a
  chenxin authored May 14, 2020
  
  89af0d8a Browse Files
- fix: ecm 商品选择器 · 13d38d1c
  chenxin authored May 14, 2020
  
  13d38d1c Browse Files
- fix:build klfl ajuststock · 310a2bed
  chenxin authored May 14, 2020
  
  310a2bed Browse Files
- fix: jifen · f9522c2b
  chenxin authored May 14, 2020
  
  f9522c2b Browse Files
- fix: 隐藏h5链接；klfl referid · 840babd1
  chenxin authored May 14, 2020
  
  840babd1 Browse Files
- fix:build 只有只调整了库存算作调整库存，传变动值，其他的都是传最终值，换了口令也算是编辑了 · 026555c6
  chenxin authored May 14, 2020
  
  026555c6 Browse Files
13 May, 2020 2 commits
- fix: klfl 原来更新不掉接口 · 064b37d5
  chenxin authored May 13, 2020
  
  064b37d5 Browse Files
- fix: klfl 库存 · 1e6dc997
  chenxin authored May 13, 2020
  
  1e6dc997 Browse Files
12 May, 2020 2 commits
- fix:修复bug · 7808ec3c
  chenxin authored May 12, 2020
  
  7808ec3c Browse Files
- fix:build ggk · 9996c40f
  chenxin authored May 12, 2020
  
  9996c40f Browse Files
09 May, 2020 6 commits
- fix: update member-group;级联选择器样式;ecm 会员分组 add 的bug · 84de8c3c
  chenxin authored May 09, 2020
  
  84de8c3c Browse Files
- uupdate:member-group · afa623e5
  chenxin authored May 09, 2020
  
  afa623e5 Browse Files
- fix:级联样式修改 · 0c54c2d6
  chenxin authored May 09, 2020
  
  0c54c2d6 Browse Files
- Update index.html · 43247b9c
  member authored May 09, 2020
  
  43247b9c Browse Files
- fix:build ecm 会员分组 isAdd 左移未处理的bug · 885a3832
  chenxin authored May 09, 2020
  
  885a3832 Browse Files
- update:membber-group · febe8f68
  chenxin authored May 09, 2020
  
  febe8f68 Browse Files
08 May, 2020 7 commits
- Update index.html · c851a0dc
  member authored May 08, 2020
  
  c851a0dc Browse Files
- update: mber-group · 4ce37971
  chenxin authored May 08, 2020
  
  4ce37971 Browse Files
- fix:库存 · 0cdc8be9
  chenxin authored May 08, 2020
  
  0cdc8be9 Browse Files
- update: member-group 2.2.3 · 7274ccbd
  chenxin authored May 08, 2020
  
  7274ccbd Browse Files
- update:member-group 2.2.13 · 1fa6299c
  chenxin authored May 08, 2020
  
  1fa6299c Browse Files
- fix:大转盘刮刮卡游戏编辑库存调整 · 7258a66b
  chenxin authored May 08, 2020
  
  7258a66b Browse Files
- fix: 游戏库存 · 2d3f1e12
  chenxin authored May 08, 2020
  
  2d3f1e12 Browse Files
07 May, 2020 1 commit
- fix: card form加提示文字；卡券包 storeMode判断修改 · 39d13041
  chenxin authored May 07, 2020
  
  39d13041 Browse Files
06 May, 2020 2 commits
- Merge branch 'dev' into 'master' · b3043375
```
fix:build

See merge request !60
```
  chenxin authored May 06, 2020
  b3043375 Browse Files
- fix:build · 9d961e12
  chenxin authored May 06, 2020
  
  9d961e12 Browse Files
29 Apr, 2020 4 commits
- Merge branch 'dev' into 'master' · b129d8dd
```
Dev

See merge request !59
```
  chenxin authored Apr 29, 2020
  b129d8dd Browse Files
- fix: record文案 · 7ed6bfca
  chenxin authored Apr 29, 2020
  
  7ed6bfca Browse Files
- fix: 找你马拼图游戏游戏记录隐藏手机号码 · 5d785d84
  chenxin authored Apr 29, 2020
  
  5d785d84 Browse Files
- fix: 微信图文编辑没有删除btn · 6b832fa7
  chenxin authored Apr 29, 2020
  
  6b832fa7 Browse Files
28 Apr, 2020 2 commits
- Merge branch 'dev' into 'master' · 14d43b8f
```
fix:build  record-get 新打开

See merge request !58
```
  chenxin authored Apr 28, 2020
  14d43b8f Browse Files
- fix:build record-get 新打开 · b9cb8ee6
  chenxin authored Apr 28, 2020
  
  b9cb8ee6 Browse Files