Commits · 48bec4a23aeffb25871150ff0c7ec57714b6066d · marketing-web / marketing · GitLab

25 Feb, 2021 7 commits
- 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 7 commits
- 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 4 commits
- update: 短信打开小程序 · 5af7d937
  caoyanzhi authored Feb 23, 2021
  
  5af7d937 Browse Files
- update: e袋洗下载文件 · be3f7682
  chenxin authored Feb 23, 2021
  
  be3f7682 Browse Files
- update: 短信打开小程序请求参数调整 · 603a7f71
  caoyanzhi authored Feb 23, 2021
  
  603a7f71 Browse Files
- update: 短信营销调整 · c3f5c22a
  caoyanzhi authored Feb 23, 2021
  
  c3f5c22a Browse Files
22 Feb, 2021 1 commit
- update: 短信打开小程序 · 9f5ab9d4
  caoyanzhi authored Feb 22, 2021
  
  9f5ab9d4 Browse Files
20 Feb, 2021 1 commit
- fix: card 历史数据不校验carddon · f844c9dc
  chenxin authored Feb 20, 2021
  
  f844c9dc Browse Files
19 Feb, 2021 1 commit
- update: selector.1.2.21 · b7be7f7f
  chenxin authored Feb 19, 2021
  
  b7be7f7f Browse Files
08 Feb, 2021 1 commit
- fix: 修复bug · c2ede9b3
  caoyanzhi authored Feb 08, 2021
  
  c2ede9b3 Browse Files
05 Feb, 2021 1 commit
- update: 短信打开小程序 · eec4e27b
  caoyanzhi authored Feb 05, 2021
  
  eec4e27b Browse Files
04 Feb, 2021 2 commits
- Merge branch 'master' into feature/模板消息通知权限 · a487bf79
  caoyanzhi authored Feb 04, 2021
  
  a487bf79 Browse Files
- Merge branch 'bugfix' into 'master' · ddf22833
```
fix: 去除文案

See merge request !142
```
  chenxin authored Feb 04, 2021
  ddf22833 Browse Files
03 Feb, 2021 1 commit
- fix: 去除文案 · a2d0c9e8
  chenxin authored Feb 03, 2021
  
  a2d0c9e8 Browse Files
02 Feb, 2021 1 commit
- update: 模板消息通知权限 · 7ebd98ee
  caoyanzhi authored Feb 02, 2021
  
  7ebd98ee Browse Files
29 Jan, 2021 2 commits
- Merge branch 'bugfix' into 'master' · 09458121
```
fix: build bug

See merge request !141
```
  chenxin authored Jan 29, 2021
  09458121 Browse Files
- fix: build bug · 4273b686
  chenxin authored Jan 29, 2021
  
  4273b686 Browse Files
28 Jan, 2021 4 commits
- Merge branch 'bugfix' into 'master' · d942591c
```
fix: 转赠图尺寸调整 by ui

See merge request !140
```
  chenxin authored Jan 28, 2021
  d942591c Browse Files
- fix: 转赠图尺寸调整 by ui · 82bc774f
  chenxin authored Jan 28, 2021
  
  82bc774f Browse Files
- Merge branch 'bugfix' into 'master' · 3a92a002
```
fix: bug + 文案

See merge request !139
```
  chenxin authored Jan 28, 2021
  3a92a002 Browse Files
- fix: bug + 文案 · 8bdf9af8
  chenxin authored Jan 28, 2021
  
  8bdf9af8 Browse Files
27 Jan, 2021 6 commits
- Merge branch 'release' into 'master' · 61204214
```
fix: 文案调整

See merge request !138
```
  chenxin authored Jan 27, 2021
  61204214 Browse Files
- fix: 文案调整 · 8acdd4fd
  chenxin authored Jan 27, 2021
  
  8acdd4fd Browse Files
- Merge branch 'release' into 'master' · 9388186f
```
Release

See merge request !137
```
  chenxin authored Jan 27, 2021
  9388186f Browse Files
- fix: 文案调整 · c5eeb5b0
  chenxin authored Jan 27, 2021
  
  c5eeb5b0 Browse Files
- fix: 转赠增加默认图片 · 2c0ff0df
  chenxin authored Jan 27, 2021
  
  2c0ff0df Browse Files
- fix: bug · dcf75b5e
  chenxin authored Jan 27, 2021
  
  dcf75b5e Browse Files
26 Jan, 2021 1 commit
- fix: build · 425a4df3
  chenxin authored Jan 26, 2021
  
  425a4df3 Browse Files