Commits · e6e0107334f7e9f6440f53e11ef2c3de67ce211a · marketing-web / marketing

11 Dec, 2018 1 commit
- fix:卡券状态的问题 · e6e01073
  zhangmeng authored Dec 11, 2018
  
  e6e01073 Browse Files
10 Dec, 2018 2 commits
- feat:迭代3完成 · abaf0536
  zhangmeng authored Dec 10, 2018
  
  abaf0536 Browse Files
- ecm · 9384621c
  zhangmeng authored Dec 10, 2018
  
  9384621c Browse Files
07 Dec, 2018 1 commit
- 迭代三bug · e5e0ee27
  zhangmeng authored Dec 07, 2018
  
  e5e0ee27 Browse Files
05 Dec, 2018 2 commits
- 准备发布 · 7c74ca35
  zhangmeng authored Dec 05, 2018
  
  7c74ca35 Browse Files
- 提交 · 00f55b90
  zhangmeng authored Dec 05, 2018
  
  00f55b90 Browse Files
03 Dec, 2018 2 commits
- 提交 · 8e442e1d
  zhangmeng authored Dec 03, 2018
  
  8e442e1d Browse Files
- 修改 · b7d61ecb
  zhangmeng authored Dec 03, 2018
  
  b7d61ecb Browse Files
30 Nov, 2018 2 commits
- Merge branch 'dd' into dev · e28a2974
```
* dd:
  提交测试

# Conflicts:
#	dist/index.html
```
  zhangmeng authored Nov 30, 2018
  e28a2974 Browse Files
- 提交测试 · bfb0473e
  zhangmeng authored Nov 30, 2018
  
  bfb0473e Browse Files
29 Nov, 2018 5 commits
- 迭代 · c3c1c460
  zhangmeng authored Nov 29, 2018
  
  c3c1c460 Browse Files
- Merge branch 'dd' into dev · 7bc3dd6e
```
* dd:
  迭代
  迭代
  迭代3
  bug
  找bug

# Conflicts:
#	dist/index.html
#	dist/static/js/app.17d418301a0f8d26bcdd.js
```
  zhangmeng authored Nov 29, 2018
  7bc3dd6e Browse Files
- 迭代 · 9c06bf15
  zhangmeng authored Nov 29, 2018
  
  9c06bf15 Browse Files
- 迭代 · e5b7c220
  zhangmeng authored Nov 29, 2018
  
  e5b7c220 Browse Files
- 迭代3 · eea379b9
  zhangmeng authored Nov 29, 2018
  
  eea379b9 Browse Files
28 Nov, 2018 7 commits
- bug · bed79cd6
  zhangmeng authored Nov 28, 2018
  
  bed79cd6 Browse Files
- 测试啊 · e10d9264
  zhangmeng authored Nov 28, 2018
  
  e10d9264 Browse Files
- Merge branch 'dev' of http://115.159.76.241/marketing-web/marketing into dev · 0c0350e9
```
* 'dev' of http://115.159.76.241/marketing-web/marketing:
  智能营销 卡券投放 加入模板消息
```
  zhangmeng authored Nov 28, 2018
  0c0350e9 Browse Files
- 测试 · 747c2737
  zhangmeng authored Nov 28, 2018
  
  747c2737 Browse Files
- bug · a24b9738
  zhangmeng authored Nov 28, 2018
  
  a24b9738 Browse Files
- bug · bf18bb9a
  zhangmeng authored Nov 28, 2018
  
  bf18bb9a Browse Files
- 找bug · f16c2f52
  zhangmeng authored Nov 28, 2018
  
  f16c2f52 Browse Files
27 Nov, 2018 1 commit
- 智能营销卡券投放加入模板消息 · eb3e7114
  zhangmeng authored Nov 27, 2018
  
  eb3e7114 Browse Files
23 Nov, 2018 1 commit
- 开始迭代3 · 521c447a
  zhangmeng authored Nov 23, 2018
  
  521c447a Browse Files
21 Nov, 2018 1 commit
- 迭代2bug · 5c1507ca
  zhangmeng authored Nov 21, 2018
  
  5c1507ca Browse Files
15 Nov, 2018 1 commit
- 更新了样式 · 215bf44d
  zhangmeng authored Nov 15, 2018
  
  215bf44d Browse Files
14 Nov, 2018 3 commits
- 迭代2 · b5ea4d94
  zhangmeng authored Nov 14, 2018
  
  b5ea4d94 Browse Files
- Merge branch 'dev' · 08f96dec
```
* dev:
  迭代2
  xxx
  bug

# Conflicts:
#	dist/index.html
```
  zhangmeng authored Nov 14, 2018
  08f96dec Browse Files
- 迭代2 · 29e88a1e
  zhangmeng authored Nov 14, 2018
  
  29e88a1e Browse Files
12 Nov, 2018 7 commits
- xxx · 8ed8ff90
  zhangmeng authored Nov 13, 2018
  
  8ed8ff90 Browse Files
- bug · 3142b6fd
  zhangmeng authored Nov 12, 2018
  
  3142b6fd Browse Files
- Merge branch 'dev' · 41ff0d1d
```
* dev: (30 commits)
  bug
  dev
  发布
  修改了dm-input
  bug
  bug
  迭代
  迭代2
  卡券门店限制
  门店组件
  卡券弹窗更新
  no message
  dd
  ecm
  测试
  发布
  ecm
  ecm提交
  人群筛选器更新
  迭代
  ...

# Conflicts:
#	dist/index.html
```
  zhangmeng authored Nov 12, 2018
  41ff0d1d Browse Files
- bug · 71199f13
  zhangmeng authored Nov 12, 2018
  
  71199f13 Browse Files
- dev · 00485e11
  zhangmeng authored Nov 12, 2018
  
  00485e11 Browse Files
- 发布 · 9eb3f621
  zhangmeng authored Nov 12, 2018
  
  9eb3f621 Browse Files
- 修改了dm-input · 9a3729df
  zhangmeng authored Nov 12, 2018
  
  9a3729df Browse Files
11 Nov, 2018 4 commits
- bug · 323680af
  zhangmeng authored Nov 11, 2018
  
  323680af Browse Files
- bug · 79200eda
  zhangmeng authored Nov 11, 2018
  
  79200eda Browse Files
- 迭代 · f12b1004
  zhangmeng authored Nov 11, 2018
  
  f12b1004 Browse Files
- 迭代2 · d7178f38
  zhangmeng authored Nov 11, 2018
  
  d7178f38 Browse Files