Commits · 20be18fc174cb3f40ea93d33a3ac6203336e51b4 · marketing-web / marketing · GitLab

27 Apr, 2021 5 commits
- update:触达效果ui调整 · 20be18fc
  liuchenxi authored Apr 27, 2021
  
  20be18fc Browse Files
- update: 文本格式 · e49b75c9
  黑潮 authored Apr 27, 2021
  
  e49b75c9 Browse Files
- 触达效果提交--- · 6c91774b
  liuchenxi authored Apr 27, 2021
  
  6c91774b Browse Files
- update: ui优化 · a6362447
  黑潮 authored Apr 27, 2021
  
  a6362447 Browse Files
- 触达效果提交 · 20887552
  liuchenxi authored Apr 27, 2021
  
  20887552 Browse Files
26 Apr, 2021 7 commits
- 触达效果--------- · 2efacd3e
  liuchenxi authored Apr 26, 2021
  
  2efacd3e Browse Files
- Merge branch 'feature/销售线索' of http://git.gicdev.com/marketing-web/marketing into feature/销售线索 · bbeadb2b
  liuchenxi authored Apr 26, 2021
  
  bbeadb2b Browse Files
- 触达 · 9f2b8590
  liuchenxi authored Apr 26, 2021
  
  9f2b8590 Browse Files
- update: 卡券选择器 · 5ca88967
  黑潮 authored Apr 26, 2021
  
  5ca88967 Browse Files
- 触达效果----- · 04e8d7a8
  liuchenxi authored Apr 26, 2021
  
  04e8d7a8 Browse Files
- fix: 修复报错 · eeeb5c65
  黑潮 authored Apr 26, 2021
  
  eeeb5c65 Browse Files
- update: 营销分析设置 · 7c444e32
  黑潮 authored Apr 26, 2021
  
  7c444e32 Browse Files
25 Apr, 2021 2 commits
- --触达效果-- · e85752ef
  liuchenxi authored Apr 25, 2021
  
  e85752ef Browse Files
- --触达效果-- · 7cc7c8ff
  liuchenxi authored Apr 25, 2021
  
  7cc7c8ff Browse Files
24 Apr, 2021 1 commit
- -触达效果- · 7878e30d
  liuchenxi authored Apr 24, 2021
  
  7878e30d Browse Files
23 Apr, 2021 10 commits
- Merge branch 'feature/销售线索' of http://git.gicdev.com/marketing-web/marketing into feature/销售线索 · 3a8594d6
  liuchenxi authored Apr 23, 2021
  
  3a8594d6 Browse Files
- 触达效果 · b7d52d07
  liuchenxi authored Apr 23, 2021
  
  b7d52d07 Browse Files
- update: 逾期控制 · 3db45e7b
  黑潮 authored Apr 23, 2021
  
  3db45e7b Browse Files
- 触达效果测试 · 4c18e5da
  liuchenxi authored Apr 23, 2021
  
  4c18e5da Browse Files
- update: 触发配置 · 54f3b207
  黑潮 authored Apr 23, 2021
  
  54f3b207 Browse Files
- update: 营销事件类型筛选 · 680330b5
  黑潮 authored Apr 23, 2021
  
  680330b5 Browse Files
- Merge branch 'feature/销售线索' of http://115.159.76.241/marketing-web/marketing into feature/销售线索 · 7a52d2bd
```
# Conflicts:
#	src/views/ecm/list.vue
```
  黑潮 authored Apr 23, 2021
  7a52d2bd Browse Files
- update: 筛选条件 · 1b9aa362
  黑潮 authored Apr 23, 2021
  
  1b9aa362 Browse Files
- Merge branch 'dev' of http://git.gicdev.com/marketing-web/marketing into dev · c39feeb1
  liuchenxi authored Apr 23, 2021
  
  c39feeb1 Browse Files
- 触达效果 · 4c29c632
  liuchenxi authored Apr 23, 2021
  
  4c29c632 Browse Files
22 Apr, 2021 2 commits
- update: 任务规则 · 84cdcb62
  黑潮 authored Apr 22, 2021
  
  84cdcb62 Browse Files
- update: 触达效果 · ab57751f
  liuchenxi authored Apr 22, 2021
  
  ab57751f Browse Files
21 Apr, 2021 3 commits
- update: 企微任务详情 · c1107728
  黑潮 authored Apr 21, 2021
  
  c1107728 Browse Files
- update: 样式 · 28cba854
  黑潮 authored Apr 21, 2021
  
  28cba854 Browse Files
- fix: 字段错误 · be436714
  黑潮 authored Apr 21, 2021
  
  be436714 Browse Files
20 Apr, 2021 4 commits
- update: 文案修改 · e9ab010e
  黑潮 authored Apr 20, 2021
  
  e9ab010e Browse Files
- update: 已失效素材 · bfcf430d
  黑潮 authored Apr 20, 2021
  
  bfcf430d Browse Files
- update: 选择素材 · 3d723f28
  黑潮 authored Apr 20, 2021
  
  3d723f28 Browse Files
- update: 素材回显 · 59784a5d
  黑潮 authored Apr 20, 2021
  
  59784a5d Browse Files
19 Apr, 2021 2 commits
- update: 营销分析设置 · 3cd29e66
  黑潮 authored Apr 19, 2021
  
  3cd29e66 Browse Files
- update: 营销事件 · 7a64c5d8
  黑潮 authored Apr 19, 2021
  
  7a64c5d8 Browse Files
16 Apr, 2021 3 commits
- update: 调整 · 0f44549b
  黑潮 authored Apr 16, 2021
  
  0f44549b Browse Files
- Merge branch 'master' into feature/销售线索 · c8212b17
```
# Conflicts:
#	index.html
#	src/views/ecm/form.vue
#	src/views/ecm/marketing-event/index.vue
```
  黑潮 authored Apr 16, 2021
  c8212b17 Browse Files
- update: 短信模板 · f3e12f34
  黑潮 authored Apr 16, 2021
  
  f3e12f34 Browse Files
15 Apr, 2021 1 commit
- update: dist · a3031bdc
  caoyanzhi authored Apr 16, 2021
  
  a3031bdc Browse Files