Commits · 0c7c240f63672ba1c731acef40a54324a7b95f62 · marketing-web / marketing

28 Oct, 2020 2 commits
- fix: 一些调整 · 0c7c240f
  chenxin authored Oct 28, 2020
  
  0c7c240f Browse Files
- fix: 扫码营销 · 4cc86897
  chenxin authored Oct 28, 2020
  
  4cc86897 Browse Files
27 Oct, 2020 4 commits
- Merge branch 'master' of 115.159.76.241:marketing-web/marketing into feature/m10 · 1a99e77c
  chenxin authored Oct 27, 2020
  
  1a99e77c Browse Files
- Merge branch 'bugfix3' into 'master' · 4d865f1e
```
fix: record-get 卡券库-领取过来的时候不要调用getList

See merge request !102
```
  chenxin authored Oct 27, 2020
  4d865f1e Browse Files
- fix: record-get 卡券库-领取过来的时候不要调用getList · 42a17d40
  chenxin authored Oct 27, 2020
  
  42a17d40 Browse Files
- fix: 扫码营销 · ca243b07
  chenxin authored Oct 27, 2020
  
  ca243b07 Browse Files
23 Oct, 2020 1 commit
- fix: save scan form · ede3d071
  chenxin authored Oct 23, 2020
  
  ede3d071 Browse Files
22 Oct, 2020 4 commits
- fix: scan · b0750ea9
  chenxin authored Oct 22, 2020
  
  b0750ea9 Browse Files
- fix: 扫码营销 page · fe4c068e
  chenxin authored Oct 22, 2020
  
  fe4c068e Browse Files
- fix: build · 55606532
  chenxin authored Oct 22, 2020
  
  55606532 Browse Files
- fix: m · 8b89ec8b
  chenxin authored Oct 22, 2020
  
  8b89ec8b Browse Files
15 Oct, 2020 3 commits
- Merge branch 'bugfix' into 'master' · 81ae7de1
```
Bugfix

See merge request !100
```
  wangyusheng authored Oct 15, 2020
  81ae7de1 Browse Files
- update: vendor track 1.0.3 · 628a0445
  chenxin authored Oct 15, 2020
  
  628a0445 Browse Files
- fix: card disabled sync · add3300a
  chenxin authored Oct 15, 2020
  
  add3300a Browse Files
13 Oct, 2020 5 commits
- Merge branch 'bugfix2' into bugfix · 24634f94
```
# Conflicts:
#	dist/index.html
#	index.html
```
  chenxin authored Oct 13, 2020
  24634f94 Browse Files
- Merge branch 'bugfix2' into 'master' · bf2fb15e
```
update: track

See merge request !99
```
  wangyusheng authored Oct 13, 2020
  bf2fb15e Browse Files
- update: track · 909069bd
  chenxin authored Oct 13, 2020
  
  909069bd Browse Files
- fix: 调整 · dc7a2679
  chenxin authored Oct 13, 2020
  
  dc7a2679 Browse Files
- fix: 一些调整 · 9b72559f
  chenxin authored Oct 13, 2020
  
  9b72559f Browse Files
10 Oct, 2020 3 commits

Merge branch 'master' of 115.159.76.241:marketing-web/marketing into bugfix · 90b540ba

# Conflicts:
#	dist/index.html
#	dist/static/css/main.12587ce16d65d66288d37ae5458b95b2.css
#	dist/static/css/main.44c7b7a3c9eb3445fbfed62d7ad1a8f0.css
#	dist/static/css/main.8e052e255868d1c4ae8b2198d6478a96.css
#	dist/static/js/evaluation.bb52993eeb503345732a.js
#	dist/static/js/evaluation.d0ca60b9a64850af134d.js
#	dist/static/js/evaluation.faf17b909ac1f2528782.js

authored Oct 10, 2020

90b540ba Browse Files

Merge branch 'bugfix2' into 'master' · fc5027b4
```
fix: 文案错误

See merge request !98
```
chenxin authored Oct 10, 2020
fc5027b4 Browse Files
fix: 文案错误 · 16b1c419
chenxin authored Oct 10, 2020

16b1c419 Browse Files

09 Oct, 2020 2 commits
- fix: 门店分组选择，close的时候触发，将传入的store比较一下，更新为传入值；ecm 营销事件通知至少保存一条营销事件 · d4b04563
  chenxin authored Oct 09, 2020
  
  d4b04563 Browse Files
- Merge branch 'master' of 115.159.76.241:marketing-web/marketing into bugfix · adf8abd1
```
# Conflicts:
#	dist/index.html
#	dist/static/css/main.44c7b7a3c9eb3445fbfed62d7ad1a8f0.css
#	dist/static/css/main.d397428627f7684ee62854a34eff9cd1.css
#	dist/static/css/main.d4748a352168845c5ab23eb726e96f6c.css
```
  chenxin authored Oct 09, 2020
  adf8abd1 Browse Files
02 Oct, 2020 1 commit
- update: dist · fe6ccd95
  caoyanzhi authored Oct 02, 2020
  
  fe6ccd95 Browse Files
01 Oct, 2020 1 commit
- fix: 解决编辑微信营销-发送记录编辑后保存报会员分组不能为空的问题 · d645f62b
  caoyanzhi authored Oct 01, 2020
  
  d645f62b Browse Files
29 Sep, 2020 1 commit
- fix:智能营销-定时-生日前几天触发增加生日类型配置 · 90b1bac6
  chenxin authored Sep 29, 2020
  
  90b1bac6 Browse Files
28 Sep, 2020 1 commit
- Merge branch 'bugfix' into 'master' · 9fb8d7c0
```
Bugfix

See merge request !97
```
  wangyusheng authored Sep 28, 2020
  9fb8d7c0 Browse Files
25 Sep, 2020 1 commit
- fix: index.html <% if (process.env.NODE_ENV !== 'dev' ) { %><% } %> 本地环境不加track.xx.js 这个脚本 · ff66c8dc
  chenxin authored Sep 25, 2020
  
  ff66c8dc Browse Files
23 Sep, 2020 2 commits
- update: vendor header.2.0.38 · 62f0cd1a
  chenxin authored Sep 23, 2020
  
  62f0cd1a Browse Files
- fix: 埋点 · 27557b0b
  chenxin authored Sep 23, 2020
  
  27557b0b Browse Files
17 Sep, 2020 3 commits
- Merge branch 'feature/200917' into 'master' · 96a75d76
```
Feature/200917

See merge request !96
```
  chenxin authored Sep 17, 2020
  96a75d76 Browse Files
- fix: 文案 · fdfdb96c
  chenxin authored Sep 17, 2020
  
  fdfdb96c Browse Files
- fix: 数据对话厅文案提示 · 5994fcdb
  chenxin authored Sep 17, 2020
  
  5994fcdb Browse Files
16 Sep, 2020 2 commits
- fix: build 新建短信模板优化 · e281c014
  chenxin authored Sep 16, 2020
  
  e281c014 Browse Files
- fix: 文案调整 · a69c9e5d
  chenxin authored Sep 16, 2020
  
  a69c9e5d Browse Files
15 Sep, 2020 3 commits
- update: 会员分组组件2.2.23 · ff365df8
  wangyusheng authored Sep 15, 2020
  
  ff365df8 Browse Files
- Merge branch 'dev' into 'master' · 52c98577
```
Dev

See merge request !95
```
  chenxin authored Sep 15, 2020
  52c98577 Browse Files
- fix: 营销活动改为数据对话；ecm折扣打开 · 60cb70e6
  chenxin authored Sep 15, 2020
  
  60cb70e6 Browse Files
14 Sep, 2020 1 commit
- fix: 富文本的iframe加上<meta name="referrer" content="never" /> · 3a020496
  chenxin authored Sep 14, 2020
  
  3a020496 Browse Files