Commits · 7a7d603bbeb3188d06e3ba37ad490dfa43f3c362 · marketing-web / marketing · GitLab

24 Mar, 2021 3 commits
- Merge branch 'feature/卡券调整' · 7a7d603b
```
# Conflicts:
#	src/views/card/partials/status-render.js
```
  luojie authored Mar 25, 2021
  7a7d603b Browse Files
- update: dist · 803d0eda
  caoyanzhi authored Mar 24, 2021
  
  803d0eda Browse Files
- Merge branch 'feature/3.0年后需求-卡券调整' · e620a685
  caoyanzhi authored Mar 24, 2021
  
  e620a685 Browse Files
19 Mar, 2021 1 commit
- update: 卡券库调整 · 1407dd69
  黑潮 authored Mar 19, 2021
  
  1407dd69 Browse Files
18 Mar, 2021 1 commit
- update: dist · 56bd576f
  caoyanzhi authored Mar 18, 2021
  
  56bd576f Browse Files
17 Mar, 2021 1 commit
- update: 门店选择器回显 · ade414c9
  caoyanzhi authored Mar 17, 2021
  
  ade414c9 Browse Files
16 Mar, 2021 1 commit
- update: 卡券调整 · a79bc9ed
  黑潮 authored Mar 16, 2021
  
  a79bc9ed Browse Files
15 Mar, 2021 2 commits
- update: 卡券调整 · 91c7d71b
  caoyanzhi authored Mar 15, 2021
  
  91c7d71b Browse Files
- update: 卡券调整 · 9700b32b
  caoyanzhi authored Mar 15, 2021
  
  9700b32b Browse Files
10 Mar, 2021 2 commits
- update: 卡券调整 · e25c55c0
  caoyanzhi authored Mar 10, 2021
  
  e25c55c0 Browse Files
- fix: 新增卡券-修复兑换券使用条件的bug · 67546122
  caoyanzhi authored Mar 10, 2021
  
  67546122 Browse Files
09 Mar, 2021 4 commits
- update: 调整文案 · 74bfe1d9
  caoyanzhi authored Mar 09, 2021
  
  74bfe1d9 Browse Files
- update: 请求参数调整 · 95038329
  caoyanzhi authored Mar 09, 2021
  
  95038329 Browse Files
- update: 卡券调整、卡券选择器调整 · 0d5c46c5
  caoyanzhi authored Mar 09, 2021
  
  0d5c46c5 Browse Files
- update: 卡券选择器调整 · 868dc2a5
  caoyanzhi authored Mar 09, 2021
  
  868dc2a5 Browse Files
08 Mar, 2021 1 commit
- update: 3.0年后需求-卡券调整 · 1f6ed3ae
  caoyanzhi authored Mar 08, 2021
  
  1f6ed3ae Browse Files
03 Mar, 2021 2 commits
- Merge branch 'feature/update-selector.21' into 'master' · 0113c4de
```
Feature/update selector.21

See merge request !149
```
  chenxin authored Mar 03, 2021
  0113c4de Browse Files
- Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into… · 0cf5fd96
```
Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/update-selector.21

# Conflicts:
#	dist/index.html
```
  chenxin authored Mar 03, 2021
  0cf5fd96 Browse Files
25 Feb, 2021 12 commits
- update: 样式处理 · 13cd555a
  fox authored Feb 26, 2021
  
  13cd555a Browse Files
- fix: 压缩H5链接根据配置控制展示与否 · bc77b59e
  fox authored Feb 26, 2021
  
  bc77b59e Browse Files
- Merge branch 'bugfix3' into 'master' · 912b212a
```
fix: rebuild

See merge request !147
```
  chenxin authored Feb 25, 2021
  912b212a Browse Files
- fix: rebuild · 99e1f093
  chenxin authored Feb 25, 2021
  
  99e1f093 Browse Files
- update: dist · 43455aed
  caoyanzhi authored Feb 25, 2021
  
  43455aed Browse Files
- Merge branch 'feature/3.0年后需求-短信营销调整' · 48bec4a2
  caoyanzhi authored Feb 25, 2021
  
  48bec4a2 Browse Files
- update: dist · 75b11ed2
  caoyanzhi authored Feb 25, 2021
  
  75b11ed2 Browse Files
- Merge branch 'feature/3.0节前需求-短信打开小程序' · 88b9e790
  caoyanzhi authored Feb 25, 2021
  
  88b9e790 Browse Files
- update: 短信打开小程序 · ddeb3ba9
  caoyanzhi authored Feb 25, 2021
  
  ddeb3ba9 Browse Files
- update: dist · 5c564311
  caoyanzhi authored Feb 25, 2021
  
  5c564311 Browse Files
- Merge branch 'feature/3.0节前需求-短信打开小程序' · 7fd9084d
  caoyanzhi authored Feb 25, 2021
  
  7fd9084d Browse Files
- Merge branch 'feature/模板消息通知权限' · 73f8c9d6
  caoyanzhi authored Feb 25, 2021
  
  73f8c9d6 Browse Files
24 Feb, 2021 8 commits
- update: 商品.21 · 7022bc87
  chenxin authored Feb 24, 2021
  
  7022bc87 Browse Files
- Merge branch 'bugfix' into 'master' · 739185c9
```
update: 回退商品至.20

See merge request !146
```
  chenxin authored Feb 24, 2021
  739185c9 Browse Files
- update: 回退商品至.20 · 18a5d3c0
  chenxin authored Feb 24, 2021
  
  18a5d3c0 Browse Files
- update: 短信打开小程序 · 5f64975b
  caoyanzhi authored Feb 24, 2021
  
  5f64975b Browse Files
- update: 短信打开小程序 · 490041f3
  caoyanzhi authored Feb 24, 2021
  
  490041f3 Browse Files
- Merge branch 'feature/update-groups-2.25' into 'master' · f2ec4580
```
update: selector.1.2.21

See merge request !145
```
  chenxin authored Feb 24, 2021
  f2ec4580 Browse Files
- Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into… · 7e943aba
```
Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/update-groups-2.25

# Conflicts:
#	dist/index.html
```
  chenxin authored Feb 24, 2021
  7e943aba Browse Files
- Merge branch 'bugfix' into 'master' · 38617ae2
```
Bugfix

See merge request !144
```
  chenxin authored Feb 24, 2021
  38617ae2 Browse Files
23 Feb, 2021 2 commits
- update: 短信打开小程序 · 5af7d937
  caoyanzhi authored Feb 23, 2021
  
  5af7d937 Browse Files
- update: e袋洗下载文件 · be3f7682
  chenxin authored Feb 23, 2021
  
  be3f7682 Browse Files