Commits · 0c476f78337bdaa41dd5b3b52caaa758546789e2 · marketing-web / marketing · GitLab

12 Oct, 2022 5 commits
- update: 商品选择器 · 0c476f78
  dingdang authored Oct 12, 2022
  
  0c476f78 Browse Files
- Merge branch 'feature/商品选择器' · 5014337a
  dingdang authored Oct 12, 2022
  
  5014337a Browse Files
- update: 禁用商品选择器 · 8cd82bdf
  dingdang authored Oct 12, 2022
  
  8cd82bdf Browse Files
- Merge branch 'feature/商品选择器' · 49da1cc8
  dingdang authored Oct 12, 2022
  
  49da1cc8 Browse Files
- update: 禁用商品选择器 · 75cf1353
  dingdang authored Oct 12, 2022
  
  75cf1353 Browse Files
11 Oct, 2022 2 commits
- update: dist · 3f7e5b27
  dingdang authored Oct 11, 2022
  
  3f7e5b27 Browse Files
- Merge branch 'feature/商品选择器' · f797d320
  dingdang authored Oct 11, 2022
  
  f797d320 Browse Files
30 Sep, 2022 2 commits
- update: dist · fb3485f1
  Jings authored Sep 30, 2022
  
  fb3485f1 Browse Files
- Merge remote-tracking branch 'origin/bugfix/导入群发添加loading' · 18ea9b1f
  Jings authored Sep 30, 2022
  
  18ea9b1f Browse Files
29 Sep, 2022 2 commits
- fix: 添加是否导入完成文件的提示校验 · ffdf8eb5
  Jings authored Sep 29, 2022
  
  ffdf8eb5 Browse Files
- fix: 卡券模板提示文案修改 · 9a456e2d
  Jings authored Sep 29, 2022
  
  9a456e2d Browse Files
28 Sep, 2022 1 commit
- update: 重置本地环境接口域名 · 9a6b2d35
  caoyanzhi authored Sep 28, 2022
  
  9a6b2d35 Browse Files
27 Sep, 2022 9 commits
- update: dist · 074e059d
  dingdang authored Sep 27, 2022
  
  074e059d Browse Files
- Merge branch 'bugfix/新建卡券-门店选择器bug' · c6fa79d2
  dingdang authored Sep 27, 2022
  
  c6fa79d2 Browse Files
- update: test · 3d15d7ab
  dingdang authored Sep 27, 2022
  
  3d15d7ab Browse Files
- update: 新建卡券 · 0f78386d
  dingdang authored Sep 27, 2022
  
  0f78386d Browse Files
- Merge branch 'bugfix/新建卡券-门店选择器bug' · 5e84751f
  dingdang authored Sep 27, 2022
  
  5e84751f Browse Files
- update: 新建卡券-门店选择器 · 15935a5b
  dingdang authored Sep 27, 2022
  
  15935a5b Browse Files
- update: dist · 71715b93
  dingdang authored Sep 27, 2022
  
  71715b93 Browse Files
- update: dist · 4310df81
  caoyanzhi authored Sep 27, 2022
  
  4310df81 Browse Files
- update: 新建卡券-卡券门店选择器 · ae80a52d
  caoyanzhi authored Sep 27, 2022
  
  ae80a52d Browse Files
26 Sep, 2022 5 commits
- update: 商品选择器 · e9a59b84
  caoyanzhi authored Sep 26, 2022
  
  e9a59b84 Browse Files
- update: dist · b5d7aad8
  caoyanzhi authored Sep 26, 2022
  
  b5d7aad8 Browse Files
- update: 商品选择器 · bb1b5955
  caoyanzhi authored Sep 26, 2022
  
  bb1b5955 Browse Files
- update: 弹窗推广列表bug · dd2cf7f2
  caoyanzhi authored Sep 26, 2022
  
  dd2cf7f2 Browse Files
- update: 商品选择器 · e48a70eb
  caoyanzhi authored Sep 26, 2022
  
  e48a70eb Browse Files
22 Sep, 2022 2 commits
- update: 智能营销对接商品选择器 · 45142112
  caoyanzhi authored Sep 22, 2022
  
  45142112 Browse Files
- update: 卡券模块接入商品选择器 · 657f1885
  caoyanzhi authored Sep 22, 2022
  
  657f1885 Browse Files
21 Sep, 2022 2 commits
- update: dist · ba75ad90
  黄冷 authored Sep 21, 2022
  
  ba75ad90 Browse Files
- update: dist · b8db235a
  黄冷 authored Sep 21, 2022
  
  b8db235a Browse Files
19 Sep, 2022 9 commits
- update: dist · 336b6020
  黄冷 authored Sep 19, 2022
  
  336b6020 Browse Files
- Merge branch 'bugfix/找你妈游戏' into master · 25331460
  黄冷 authored Sep 19, 2022
  
  25331460 Browse Files
- update: dist · 6722ced6
  caoyanzhi authored Sep 19, 2022
  
  6722ced6 Browse Files
- Merge branch 'feature/8月-奥莱定制' · f49f1b31
```
# Conflicts:
#	src/views/card/partials/status-render.js
```
  caoyanzhi authored Sep 19, 2022
  f49f1b31 Browse Files
- update: prizeReferType改为1 · 1a09ad69
  黄冷 authored Sep 19, 2022
  
  1a09ad69 Browse Files
- update: 奥莱定制 · 21d74487
  caoyanzhi authored Sep 19, 2022
  
  21d74487 Browse Files
- update: 奥莱卡券 · 9346500f
  caoyanzhi authored Sep 19, 2022
  
  9346500f Browse Files
- update: 奥莱卡券 · 7df75955
  caoyanzhi authored Sep 19, 2022
  
  7df75955 Browse Files
- update: 奥莱卡券 · 36615144
  caoyanzhi authored Sep 19, 2022
  
  36615144 Browse Files
16 Sep, 2022 1 commit
- update: 卡券复制、编辑权限 · 983c7ae4
  caoyanzhi authored Sep 16, 2022
  
  983c7ae4 Browse Files