Commits · bfcf430d07b084c8ffc0d523b7fad7eab5cf7f75 · marketing-web / marketing

20 Apr, 2021 3 commits
- 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 17 commits
- update: dist · a3031bdc
  caoyanzhi authored Apr 16, 2021
  
  a3031bdc Browse Files
- Merge branch 'feature/门店签到需求' · 1dc3f2b1
  caoyanzhi authored Apr 16, 2021
  
  1dc3f2b1 Browse Files
- update: 修复bug · e2ed1870
  陈羽 authored Apr 16, 2021
  
  e2ed1870 Browse Files
- update: dist · 6161cae8
  caoyanzhi authored Apr 16, 2021
  
  6161cae8 Browse Files
- Merge branch 'feature/门店签到需求' into 'master' · 5c93ec21
```
Feature/门店签到需求

See merge request !152
```
  caoyanzhi authored Apr 16, 2021
  5c93ec21 Browse Files
- Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/门店签到需求 · c010be28
  陈羽 authored Apr 16, 2021
  
  c010be28 Browse Files
- update: 修复bug · 6f816a1d
  陈羽 authored Apr 16, 2021
  
  6f816a1d Browse Files
- update: build · 87c48316
  黑潮 authored Apr 15, 2021
  
  87c48316 Browse Files
- Merge branch 'feature/3月迭代' into master · 91353e86
```
# Conflicts:
#	src/views/ecm/form.vue
```
  黑潮 authored Apr 15, 2021
  91353e86 Browse Files
- Merge branch 'bugfix2/短信营销' into master · 4d086ebe
  黑潮 authored Apr 15, 2021
  
  4d086ebe Browse Files
- Merge remote-tracking branch 'origin/feature/门店签到需求' into master · 53a40167
```
# Conflicts:
#	index.html
#	src/router/routes.js
```
  黑潮 authored Apr 15, 2021
  53a40167 Browse Files
- fix: 文案修改 · 9097a491
  黑潮 authored Apr 15, 2021
  
  9097a491 Browse Files
- update: 配置任务完成方式 · 52b26308
  黑潮 authored Apr 15, 2021
  
  52b26308 Browse Files
- update: ui调整 · 9fd5d33a
  黑潮 authored Apr 15, 2021
  
  9fd5d33a Browse Files
- Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/弹窗推广 · 75dce083
  陈羽 authored Apr 15, 2021
  
  75dce083 Browse Files
- Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/门店签到需求 · 57c7174f
```
# Conflicts:
#	dist/index.html
#	dist/static/css/main.611ef6dbce9d0672c7efe94156a40035.css
#	dist/static/css/main.6ed2e160bad883eb93b49341fe8b1b48.css
#	dist/static/css/main.799551577273f91360048ffa3bbb3d1c.css
#	dist/static/js/card.c713da56138b5476aad3.js
#	dist/static/js/cdKey.af811e90e79a76129b6d.js
#	dist/static/js/ewash.14da927c4cfa606cba4f.js
#	dist/static/js/ewash.2aea6e7dfdf4a40cb08d.js
#	dist/static/js/ewash.c8a5e5c668cdc258c3c4.js
#	dist/static/js/game.398009c91a7388812f00.js
#	dist/static/js/main.71b4c4e2af7595947b49.js
#	dist/static/js/recharge.c4dfb3d423bc3d3905eb.js
#	dist/static/js/recharge.e5cd16e4f5e1229ea313.js
#	dist/static/js/recharge.fd4ef6af3cd790ec9e39.js
#	dist/static/js/vendor.a8703cbaa9498f2b02af.js
```
  陈羽 authored Apr 15, 2021
  57c7174f Browse Files
- updtae: 企微任务判断 · 03eaab05
  黑潮 authored Apr 15, 2021
  
  03eaab05 Browse Files
14 Apr, 2021 6 commits
- update: 样式调整 · b6799985
  陈羽 authored Apr 14, 2021
  
  b6799985 Browse Files
- update: 字段结构 · bc3038e2
  黑潮 authored Apr 14, 2021
  
  bc3038e2 Browse Files
- update: 修改门店组件版本 · aabdd930
  陈羽 authored Apr 14, 2021
  
  aabdd930 Browse Files
- update: 企微任务 · 5af5496d
  黑潮 authored Apr 14, 2021
  
  5af5496d Browse Files
- update: 跳转链接非必传 · 3041a2fd
  陈羽 authored Apr 14, 2021
  
  3041a2fd Browse Files
- update: 企微任务 · df28798c
  黑潮 authored Apr 14, 2021
  
  df28798c Browse Files
13 Apr, 2021 6 commits
- update: 更改样式 · c9f7eace
  陈羽 authored Apr 13, 2021
  
  c9f7eace Browse Files
- update: 添加手动结束提示文案 · 0b85ce16
  陈羽 authored Apr 13, 2021
  
  0b85ce16 Browse Files
- update: 新建计划时间文案修改 · 1ec34ade
  陈羽 authored Apr 13, 2021
  
  1ec34ade Browse Files
- update: 新建计划按钮文案更新 · a477454d
  陈羽 authored Apr 13, 2021
  
  a477454d Browse Files
- update: 营销分析设置 · dab8606e
  黑潮 authored Apr 13, 2021
  
  dab8606e Browse Files
- Merge branch 'feature/3月迭代' into feature/销售线索 · 0b970d90
  黑潮 authored Apr 13, 2021
  
  0b970d90 Browse Files
12 Apr, 2021 2 commits
- update: 弹窗卡券5张后隐藏按钮 · 230cbd29
  陈羽 authored Apr 12, 2021
  
  230cbd29 Browse Files
- fix: 短信倒计时 · bf3ccb32
  黑潮 authored Apr 12, 2021
  
  bf3ccb32 Browse Files
09 Apr, 2021 1 commit
- update: 添加计划时间校验接口 · 8e68cde1
  陈羽 authored Apr 09, 2021
  
  8e68cde1 Browse Files