Commits · 9a5379a665c559378beffb550dd818755669e391 · marketing-web / marketing · GitLab

02 Apr, 2021 1 commit
- update: 弹窗推广调整 · 9a5379a6
  caoyanzhi authored Apr 02, 2021
  
  9a5379a6 Browse Files
01 Apr, 2021 6 commits
- update: 弹窗推广 · f6cdc13d
  caoyanzhi authored Apr 01, 2021
  
  f6cdc13d Browse Files
- update: 弹窗调整 · 459c3b7d
  caoyanzhi authored Apr 01, 2021
  
  459c3b7d Browse Files
- updaate: 弹窗计划调整 · f97eb03a
  caoyanzhi authored Apr 01, 2021
  
  f97eb03a Browse Files
- update: 弹窗推广调整 · 4146342d
  caoyanzhi authored Apr 01, 2021
  
  4146342d Browse Files
- update: 弹窗推广调整 · 4f2f2a47
  caoyanzhi authored Apr 01, 2021
  
  4f2f2a47 Browse Files
- update: 弹窗计划ui调整 · 9ffe3482
  caoyanzhi authored Apr 01, 2021
  
  9ffe3482 Browse Files
31 Mar, 2021 6 commits
- update: 添加删除弹窗计划的功能 · f68906ce
  caoyanzhi authored Mar 31, 2021
  
  f68906ce Browse Files
- update: 弹窗调整 · 0ac10535
  caoyanzhi authored Mar 31, 2021
  
  0ac10535 Browse Files
- update: 弹窗推广 · a6509e45
  caoyanzhi authored Mar 31, 2021
  
  a6509e45 Browse Files
- update: 弹窗调整 · 6e881d59
  caoyanzhi authored Mar 31, 2021
  
  6e881d59 Browse Files
- update: 弹窗推广调整 · e7a177ba
  caoyanzhi authored Mar 31, 2021
  
  e7a177ba Browse Files
- update: 弹窗推广 · e9b0c05e
  caoyanzhi authored Mar 31, 2021
  
  e9b0c05e Browse Files
30 Mar, 2021 1 commit
- update: 弹窗推广接口联调 · 1fa9aef2
  caoyanzhi authored Mar 30, 2021
  
  1fa9aef2 Browse Files
29 Mar, 2021 2 commits
- update:字段更新 · bef37e01
  陈羽 authored Mar 30, 2021
  
  bef37e01 Browse Files
- update:修改部分字段 · 56fcec35
  陈羽 authored Mar 29, 2021
  
  56fcec35 Browse Files
26 Mar, 2021 1 commit
- update:更改参数类型 · 8da14a2c
  陈羽 authored Mar 26, 2021
  
  8da14a2c Browse Files
22 Mar, 2021 1 commit
- add:添加列表与新建计划页面 · c05baec0
  陈羽 authored Mar 22, 2021
  
  c05baec0 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