Commits · 39d1304155c943ca7a8aaedfaade24a508020fc7 · marketing-web / marketing · GitLab

07 May, 2020 1 commit
- fix: card form加提示文字；卡券包 storeMode判断修改 · 39d13041
  chenxin authored May 07, 2020
  
  39d13041 Browse Files
06 May, 2020 1 commit
- fix:build · 9d961e12
  chenxin authored May 06, 2020
  
  9d961e12 Browse Files
29 Apr, 2020 3 commits
- 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 1 commit
- fix:build record-get 新打开 · b9cb8ee6
  chenxin authored Apr 28, 2020
  
  b9cb8ee6 Browse Files
27 Apr, 2020 3 commits
- fix:build · 884fda75
  chenxin authored Apr 27, 2020
  
  884fda75 Browse Files
- Merge branch 'dev' into 'master' · 3ca58357
```
Dev

See merge request !57
```
  chenxin authored Apr 27, 2020
  3ca58357 Browse Files
- fix:e袋洗添加文案提示 · 685596c6
  chenxin authored Apr 27, 2020
  
  685596c6 Browse Files
24 Apr, 2020 1 commit
- fix: 卡券通知方式配置默认不通知0 · 4b5c9d42
  chenxin authored Apr 24, 2020
  
  4b5c9d42 Browse Files
21 Apr, 2020 3 commits
- Merge branch 'dev' into 'master' · ff98cc2c
```
Dev

See merge request !56
```
  chenxin authored Apr 21, 2020
  ff98cc2c Browse Files
- fix:build · 4c277c8f
  chenxin authored Apr 21, 2020
  
  4c277c8f Browse Files
- fix:card 有效天数 max 99 · f0412f11
  chenxin authored Apr 21, 2020
  
  f0412f11 Browse Files
16 Apr, 2020 3 commits
- Merge branch 'dev' into 'master' · fe638ecb
```
Dev

See merge request !55
```
  chenxin authored Apr 16, 2020
  fe638ecb Browse Files
- fix: upload.js · e42b66ba
  chenxin authored Apr 16, 2020
  
  e42b66ba Browse Files
- fix: 短信导入文件格式 · 5c1b684c
  chenxin authored Apr 16, 2020
  
  5c1b684c Browse Files
15 Apr, 2020 6 commits
- Merge branch 'dev' into 'master' · 33ad6330
```
Dev

See merge request !54
```
  chenxin authored Apr 15, 2020
  33ad6330 Browse Files
- fix:文案修改 · a100dfac
  chenxin authored Apr 15, 2020
  
  a100dfac Browse Files
- fix: 文案修改 · 837efe8c
  chenxin authored Apr 15, 2020
  
  837efe8c Browse Files
- Merge branch 'dev' into 'master' · c9b08b84
```
Dev

See merge request !53
```
  chenxin authored Apr 15, 2020
  c9b08b84 Browse Files
- fix: id隐藏;msg edit 头部隐藏颜色控制 · 01451f39
  chenxin authored Apr 15, 2020
  
  01451f39 Browse Files
- fix:冒号 · 3fd0f8e8
  chenxin authored Apr 15, 2020
  
  3fd0f8e8 Browse Files
14 Apr, 2020 9 commits
- fix:build · e2ab1dc2
  chenxin authored Apr 15, 2020
  
  e2ab1dc2 Browse Files
- fix:解开导入 · 5494dc86
  chenxin authored Apr 15, 2020
  
  5494dc86 Browse Files
- fix：build · d843bd13
  chenxin authored Apr 14, 2020
  
  d843bd13 Browse Files
- fix:build · ca5723da
  chenxin authored Apr 14, 2020
  
  ca5723da Browse Files
- fix: 群发定时必填时间限制 · 81753bc4
  chenxin authored Apr 14, 2020
  
  81753bc4 Browse Files
- fix:merge 营销活动 · 449ad3c2
  chenxin authored Apr 14, 2020
  
  449ad3c2 Browse Files
- fix:小数位 · 6a2629b7
  chenxin authored Apr 14, 2020
  
  6a2629b7 Browse Files
- fix:小数位 · 31013d69
  chenxin authored Apr 14, 2020
  
  31013d69 Browse Files
- fix: data-view 文案修改 · 5d53a5b5
  chenxin authored Apr 14, 2020
  
  5d53a5b5 Browse Files
13 Apr, 2020 9 commits
- fix:merge devv2 · 39f1c414
  chenxin authored Apr 13, 2020
  
  39f1c414 Browse Files
- Merge branch 'devv2' · a783ea63
```
# Conflicts:
#	dist/index.html
#	src/views/message/temp.vue
```
  chenxin authored Apr 13, 2020
  a783ea63 Browse Files
- fix: 分支devv2 · 804a8cca
  chenxin authored Apr 13, 2020
  
  804a8cca Browse Files
- Merge branch 'master' of http://115.159.76.241/marketing-web/marketing · 15c67a06
  chenxin authored Apr 13, 2020
  
  15c67a06 Browse Files
- fix:build · 6751ac66
  chenxin authored Apr 13, 2020
  
  6751ac66 Browse Files
- fix:build message 隐藏id · 523b2d8c
  chenxin authored Apr 13, 2020
  
  523b2d8c Browse Files
- fix:build message 隐藏id · f64b4fdf
  chenxin authored Apr 13, 2020
  
  f64b4fdf Browse Files
- fix:build · 1f3f166c
  chenxin authored Apr 13, 2020
  
  1f3f166c Browse Files
- fix:build · df750294
  chenxin authored Apr 13, 2020
  
  df750294 Browse Files