Commits · d76955bf7c267fe7822d4cb95eb56ee4ed476bdf · marketing-web / marketing

26 Nov, 2020 1 commit
- update: 商品选择器 · d76955bf
  chenxin authored Nov 26, 2020
  
  d76955bf Browse Files
24 Nov, 2020 1 commit
- update: track · b725d602
  chenxin authored Nov 24, 2020
  
  b725d602 Browse Files
23 Nov, 2020 1 commit
- fix: card 添加提示 · cfee3529
  chenxin authored Nov 23, 2020
  
  cfee3529 Browse Files
19 Nov, 2020 1 commit
- Update index.html · d5c12876
  member authored Nov 19, 2020
  
  d5c12876 Browse Files
06 Nov, 2020 3 commits
- Merge branch 'feature/m10' into 'master' · 4b34f258
```
Feature/m10

See merge request !114
```
  chenxin authored Nov 06, 2020
  4b34f258 Browse Files
- fix: bug(row-key) · 60c1382a
  chenxin authored Nov 06, 2020
  
  60c1382a Browse Files
- fix: bug · 9da595ce
  chenxin authored Nov 06, 2020
  
  9da595ce Browse Files
05 Nov, 2020 2 commits
- Merge branch 'feature/m10' into 'master' · 0fe121c1
```
Feature/m10

See merge request !113
```
  wangyusheng authored Nov 05, 2020
  0fe121c1 Browse Files
- fix: 计划不触达 · 087da1b8
  chenxin authored Nov 05, 2020
  
  087da1b8 Browse Files
03 Nov, 2020 5 commits
- fix: bug · e4ff6927
  chenxin authored Nov 03, 2020
  
  e4ff6927 Browse Files
- fix: bug · 8b426b75
  chenxin authored Nov 03, 2020
  
  8b426b75 Browse Files
- fix: 非新增：运维开启正常展示||运维关闭开关开启 · bdff3f8e
  chenxin authored Nov 03, 2020
  
  bdff3f8e Browse Files
- fix: build · 091165f3
  chenxin authored Nov 03, 2020
  
  091165f3 Browse Files
- Merge branch 'master' of 115.159.76.241:marketing-web/marketing into feature/m10 · b34a3634
```
# Conflicts:
#	dist/index.html
#	dist/static/css/main.174bd9b787737716e6748787dc91154b.css
#	dist/static/css/main.e77c853f06ca6afcd7a78ad8e2ffb48f.css
#	dist/static/css/main.f1510709ae45e117bf4b0daa99ac4187.css
#	dist/static/js/manifest.5622d848304648a9fb21.js
```
  chenxin authored Nov 03, 2020
  b34a3634 Browse Files
02 Nov, 2020 6 commits
- Merge branch 'bugfix' into 'master' · 93290512
```
fix: klfl 保存数据项为空判定

See merge request !111
```
  wangyusheng authored Nov 02, 2020
  93290512 Browse Files
- fix: klfl 保存数据项为空判定 · a9a78d0c
  chenxin authored Nov 02, 2020
  
  a9a78d0c Browse Files
- Merge branch 'master' of 115.159.76.241:marketing-web/marketing into feature/m10 · fc7b3dd7
```
# Conflicts:
#	dist/index.html
#	dist/static/css/main.174bd9b787737716e6748787dc91154b.css
#	dist/static/css/main.60ee1a8bc48bdbb2f07dafb65e38c6f4.css
#	dist/static/css/main.771b4c51d705265c80f677181b92058d.css
#	dist/static/js/manifest.ddd618a85948c3a0fbe7.js
#	dist/static/js/message.629fde2a7541a483d950.js
```
  chenxin authored Nov 02, 2020
  fc7b3dd7 Browse Files
- Merge branch 'bugfix' into 'master' · 057d34f2
```
fix: klfl的奖品不能为空return提示

See merge request !110
```
  chenxin authored Nov 02, 2020
  057d34f2 Browse Files
- fix: klfl的奖品不能为空return提示 · 191cecfe
  chenxin authored Nov 02, 2020
  
  191cecfe Browse Files
- fix: scan · 09262811
  chenxin authored Nov 02, 2020
  
  09262811 Browse Files
29 Oct, 2020 6 commits
- fix: 优化 · 7710efb1
  chenxin authored Oct 29, 2020
  
  7710efb1 Browse Files
- fix: bug · e922306e
  chenxin authored Oct 29, 2020
  
  e922306e Browse Files
- Merge branch 'bugfix' into 'master' · 40599bef
```
fix：     没有accountStatus === 3的状态了 ，不允许透支

See merge request !106
```
  wangyusheng authored Oct 29, 2020
  40599bef Browse Files
- fix: 调整 · 98b4c913
  chenxin authored Oct 29, 2020
  
  98b4c913 Browse Files
- fix：没有accountStatus === 3的状态了，不允许透支 · 1c0f7ae9
  chenxin authored Oct 29, 2020
  
  1c0f7ae9 Browse Files
- fix: 退货退券 · a3ab9920
  chenxin authored Oct 29, 2020
  
  a3ab9920 Browse Files
28 Oct, 2020 3 commits
- fix: 调整 · 3da440d7
  chenxin authored Oct 28, 2020
  
  3da440d7 Browse Files
- 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 2 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