Commits · adf8abd1c35e2f1807857053efc71c4333b8dfbc · marketing-web / marketing

09 Oct, 2020 1 commit

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

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
11 Sep, 2020 1 commit
- fix： link · 4e50bf1e
  chenxin authored Sep 11, 2020
  
  4e50bf1e Browse Files
09 Sep, 2020 1 commit
- fix: 营销活动，添加链接 · a201f30d
  chenxin authored Sep 09, 2020
  
  a201f30d Browse Files
07 Sep, 2020 1 commit
- fix：微信图文发送记录 table header tooltip · 5706f9c2
  chenxin authored Sep 07, 2020
  
  5706f9c2 Browse Files
03 Sep, 2020 2 commits
- Merge branch 'dev' into 'master' · 31de6a24
```
fix: build wx-text 更换为textarea  涉及ecm和微信群发，要关注历史计划里的展示

See merge request !94
```
  chenxin authored Sep 03, 2020
  31de6a24 Browse Files
- fix: build wx-text 更换为textarea 涉及ecm和微信群发，要关注历史计划里的展示 · e5963813
  chenxin authored Sep 03, 2020
  
  e5963813 Browse Files
02 Sep, 2020 4 commits
- Merge branch 'dev' into 'master' · a2818bb3
```
fix: build

See merge request !93
```
  chenxin authored Sep 02, 2020
  a2818bb3 Browse Files
- fix: build · edd77137
  chenxin authored Sep 02, 2020
  
  edd77137 Browse Files
- Merge branch 'dev' into 'master' · 13000211
```
fix: 文本bug；文案

See merge request !92
```
  chenxin authored Sep 02, 2020
  13000211 Browse Files
- fix: 文本bug；文案 · a8cf93f3
  chenxin authored Sep 02, 2020
  
  a8cf93f3 Browse Files
27 Aug, 2020 3 commits
- Merge branch 'dev' into 'master' · 3d7f5310
```
Dev

See merge request !91
```
  chenxin authored Aug 27, 2020
  3d7f5310 Browse Files
- fix: merge · 9fb416a3
  chenxin authored Aug 27, 2020
  
  9fb416a3 Browse Files
- fix: ecm 失效bug · 30a36166
  chenxin authored Aug 27, 2020
  
  30a36166 Browse Files
26 Aug, 2020 4 commits
- Merge branch 'dev' into 'master' · 97c40e51
```
fix: 兑换码的卡券删除状态

See merge request !90
```
  chenxin authored Aug 26, 2020
  97c40e51 Browse Files
- fix: 兑换码的卡券删除状态 · 195974de
  chenxin authored Aug 26, 2020
  
  195974de Browse Files
- Merge branch 'dev' into 'master' · 043f0dfe
```
fix: 一些优化

See merge request !89
```
  chenxin authored Aug 26, 2020
  043f0dfe Browse Files
- fix: 一些优化 · 61edbb07
  chenxin authored Aug 26, 2020
  
  61edbb07 Browse Files
25 Aug, 2020 6 commits
- fix: build · a210e132
  chenxin authored Aug 25, 2020
  
  a210e132 Browse Files
- Merge branch 'master' of 115.159.76.241:marketing-web/marketing · af062f69
```
# Conflicts:
#	dist/index.html
```
  chenxin authored Aug 25, 2020
  af062f69 Browse Files
- Merge branch 'dev' · 58955ce4
```
# Conflicts:
#	dist/index.html
#	dist/static/css/main.16524b67bb24459c8347f2ecd7f4dad5.css
#	dist/static/css/main.5ed283bf21f824d7cdfd3b36586748c7.css
#	dist/static/css/main.a3022baf5f6c7e5873682b66837a6b90.css
#	src/views/game/dzp/index.vue
```
  chenxin authored Aug 25, 2020
  58955ce4 Browse Files
- fix: build 忘记klfl了，也要去掉二次请求 · 769757c9
  chenxin authored Aug 25, 2020
  
  769757c9 Browse Files
- fix: build ggk dzp去掉searchType请求两次 · c092b5b0
  chenxin authored Aug 25, 2020
  
  c092b5b0 Browse Files
- fix：游戏导出50w条；暂时隐藏card和ecm的商品折扣 · 6c2f929d
  chenxin authored Aug 25, 2020
  
  6c2f929d Browse Files
24 Aug, 2020 1 commit
- Update index.html · 45e25e9a
  chenxin authored Aug 24, 2020
  
  45e25e9a Browse Files