Commits · 982c4fc4e9540941d41a102e64b1e5e60e8d1414 · marketing-web / marketing

23 May, 2019 5 commits
- Merge branch 'dev' into 'master' · 982c4fc4
```
fix:记录限制时间

See merge request !17
```
  chenxin authored May 24, 2019
  982c4fc4 Browse Files
- fix:记录限制时间 · ada9a50a
  chenxin authored May 24, 2019
  
  ada9a50a Browse Files
- Merge branch 'dev' into 'master' · 5a285912
```
Dev

See merge request !16
```
  chenxin authored May 23, 2019
  5a285912 Browse Files
- fix:人群筛选器更到 people.2.0.25 · 141519fb
  chenxin authored May 23, 2019
  
  141519fb Browse Files
- fix:window对象undefined · 5048fbc7
  chenxin authored May 23, 2019
  
  5048fbc7 Browse Files
22 May, 2019 2 commits
- fix:上次打包没打完整 · a2b171e9
  chenxin authored May 22, 2019
  
  a2b171e9 Browse Files
- fix:bug 第一次跳转member;people组件升级20.023 · 738cda32
  chenxin authored May 22, 2019
  
  738cda32 Browse Files
21 May, 2019 3 commits
- fix:修改bug：卡券适用商品需要置空；复制卡券，微盟适用商品无法修改参数和参数值 · 35fd4573
  chenxin authored May 21, 2019
  
  35fd4573 Browse Files
- fix:bug · 8bfe3123
  chenxin authored May 21, 2019
  
  8bfe3123 Browse Files
- fix:bug · b8712bb2
  chenxin authored May 21, 2019
  
  b8712bb2 Browse Files
20 May, 2019 2 commits
- fix:一些bug · a3959198
  chenxin authored May 20, 2019
  
  a3959198 Browse Files
- fix:计费-通话记录去掉search的type，表格去掉类型；卡券-投放记录-记录修改文案 · 67268456
  chenxin authored May 20, 2019
  
  67268456 Browse Files
17 May, 2019 4 commits
- fix:时间调整 · 45ffe4f6
  chenxin authored May 17, 2019
  
  45ffe4f6 Browse Files
- fix:样式优化（info位置调整；投放记录-记录form位置调整） · 0277b45c
  chenxin authored May 17, 2019
  
  0277b45c Browse Files
- fix:一些bug · 3bf50612
  chenxin authored May 17, 2019
  
  3bf50612 Browse Files
- fix:卡券投放记录-记录；header加自定义参数sign；微盟bug调整 · d45fab18
  chenxin authored May 17, 2019
  
  d45fab18 Browse Files
15 May, 2019 1 commit
- update:卡券新增适用商品参数 · ec4e9aae
  chenxin authored May 15, 2019
  
  ec4e9aae Browse Files
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 1 commit

fix: · b3659011

所有游戏的游戏门槛的对应默认图片，
dzp/ggk时间不可以选择之前的，
dzp/ggk用户上传图片不显示
klfl文案错误

authored Apr 29, 2019

b3659011 Browse Files