Commits · 58610fdc6ca2c8d9211b03312b9271069a19c44b · marketing-web / marketing · GitLab

14 May, 2019 1 commit
- fix:ggk bug await · 58610fdc
  chenxin authored May 14, 2019
  
  58610fdc Browse Files
13 May, 2019 3 commits
- update:dist · 2afd3da0
  chenxin authored May 13, 2019
  
  2afd3da0 Browse Files
- Merge branch 'dev' into 'master' · 8e7df1b0
```
fix:game-人群筛选器 编辑需要主动掉人群筛选器组件的回显

See merge request !15
```
  chenxin authored May 13, 2019
  8e7df1b0 Browse Files
- fix:game-人群筛选器编辑需要主动掉人群筛选器组件的回显 · 44723f3a
  chenxin authored May 13, 2019
  
  44723f3a Browse Files
10 May, 2019 2 commits
- Merge branch 'dev' into 'master' · a22e84a2
```
fix:表格宽度；ecm 消费触发可以不填；klfl的礼品bug

See merge request !14
```
  chenxin authored May 10, 2019
  a22e84a2 Browse Files
- fix:表格宽度；ecm 消费触发可以不填；klfl的礼品bug · 403945ea
  chenxin authored May 10, 2019
  
  403945ea Browse Files
08 May, 2019 12 commits
- Merge branch 'dev' into 'master' · 44d8f3b3
```
fix:bug 适用人群不可编辑

See merge request !13
```
  chenxin authored May 09, 2019
  44d8f3b3 Browse Files
- fix:bug 适用人群不可编辑 · 1824b762
  chenxin authored May 09, 2019
  
  1824b762 Browse Files
- Merge branch 'dev' into 'master' · 41435f70
```
Dev

See merge request !12
```
  chenxin authored May 08, 2019
  41435f70 Browse Files
- Merge branch 'master' into 'dev' · fc70f1aa
```
# Conflicts:
#   index.html
```
  chenxin authored May 08, 2019
  fc70f1aa Browse Files
- fix:回执状态和发送状态对掉 · ba5af6e2
  chenxin authored May 08, 2019
  
  ba5af6e2 Browse Files
- fix:通话发送状态 · ea64a7d5
  chenxin authored May 08, 2019
  
  ea64a7d5 Browse Files
- fix:口令福利，增加礼品后清除id · a436cc6a
  chenxin authored May 08, 2019
  
  a436cc6a Browse Files
- fix:klfl奖品名称 · b67c53d2
  chenxin authored May 08, 2019
  
  b67c53d2 Browse Files
- fix:klfl 策略 · 746f9040
  chenxin authored May 08, 2019
  
  746f9040 Browse Files
- fix:klfl 策略-礼品-新增-数量update · 3e80174d
  chenxin authored May 08, 2019
  
  3e80174d Browse Files
- fix:znm策略设置0条BUG · 4c6fc8f4
  chenxin authored May 08, 2019
  
  4c6fc8f4 Browse Files
- fix: klfl策略删除只剩一条不刷新bug ;ptyx 皮肤2的排行榜向左，加入<p>规则</p>;export-excel 2.0.04; · 78dd61c0
  chenxin authored May 08, 2019
  
  78dd61c0 Browse Files
07 May, 2019 1 commit
- fix:表格换行修改 · bf96a75c
  chenxin authored May 07, 2019
  
  bf96a75c Browse Files
06 May, 2019 1 commit
- fix:时间修改为换行，游戏图片上传的提示文字，upload的文件大小限制1mb · f77b8d3c
  chenxin authored May 06, 2019
  
  f77b8d3c Browse Files
05 May, 2019 1 commit
- fix:通话的bug · be689ead
  chenxin authored May 05, 2019
  
  be689ead Browse Files
30 Apr, 2019 1 commit
- fix:图片大与10k base64 · 3ed41892
  chenxin authored Apr 30, 2019
  
  3ed41892 Browse Files
29 Apr, 2019 2 commits
- fix: · b3659011
```
所有游戏的游戏门槛的对应默认图片，
dzp/ggk时间不可以选择之前的，
dzp/ggk用户上传图片不显示
klfl文案错误
```
  chenxin authored Apr 29, 2019
  b3659011 Browse Files
- Update index.html 更新header2.0.20 更改：风险模式增加7天和30天的时长 · e761abc4
  chenxin authored Apr 29, 2019
  
  e761abc4 Browse Files
28 Apr, 2019 1 commit
- fix: bug 大转盘刮刮卡的默认图片；专属导购显示姓名 · 73fec2eb
  chenxin authored Apr 28, 2019
  
  73fec2eb Browse Files
26 Apr, 2019 2 commits
- build:klfl bug 打包 · e122f269
  chenxin authored Apr 26, 2019
  
  e122f269 Browse Files
- fix:klfl share参数传错 · 0fb1d510
  chenxin authored Apr 26, 2019
  
  0fb1d510 Browse Files
25 Apr, 2019 10 commits
- build:一些bug · 3aa60062
  chenxin authored Apr 25, 2019
  
  3aa60062 Browse Files
- Merge branch 'cx' into 'dev' · 70b5883a
```
Cx

See merge request !11
```
  chenxin authored Apr 25, 2019
  70b5883a Browse Files
- Merge branch 'dev' of 115.159.76.241:marketing-web/marketing into cx · 38091b03
  chenxin authored Apr 25, 2019
  
  38091b03 Browse Files
- fix:webpack跨域配置 · 6ac3270c
  chenxin authored Apr 25, 2019
  
  6ac3270c Browse Files
- add:znm配置新增游戏次数限制 · 8a8be75a
  chenxin authored Apr 25, 2019
  
  8a8be75a Browse Files
- fix:一些bug · 6a2acbe5
  chenxin authored Apr 25, 2019
  
  6a2acbe5 Browse Files
- build:通话记录+一些bug · 910088a7
  chenxin authored Apr 25, 2019
  
  910088a7 Browse Files
- Merge branch 'cx' into 'dev' · 6f95c437
```
Cx

See merge request !10
```
  chenxin authored Apr 25, 2019
  6f95c437 Browse Files
- fix:字段错误 · d2ddf1ac
  chenxin authored Apr 25, 2019
  
  d2ddf1ac Browse Files
- fix:通话记录，通话设置，ecm编辑bug和一些其他bug · 661fe815
  chenxin authored Apr 25, 2019
  
  661fe815 Browse Files
24 Apr, 2019 3 commits
- build:router ecm bug · d99c03da
  chenxin authored Apr 24, 2019
  
  d99c03da Browse Files
- Merge branch 'cx' into 'dev' · aaa74b24
```
fix:ecm拆除form.js路由错误

See merge request !9
```
  chenxin authored Apr 24, 2019
  aaa74b24 Browse Files
- fix:ecm拆除form.js路由错误 · 80baa611
  chenxin authored Apr 24, 2019
  
  80baa611 Browse Files