Commits · 789f97dc5c65ccb081de3f5c77309d8faf2e7f99 · marketing-web / marketing

22 Jan, 2021 3 commits
- fix: track · 789f97dc
  chenxin authored Jan 22, 2021
  
  789f97dc Browse Files
- Merge branch 'feature/update-store-new.2.0.68' into 'master' · fa29c7bf
```
update: store-new.2.0.68

See merge request !134
```
  chenxin authored Jan 22, 2021
  fa29c7bf Browse Files
- update: store-new.2.0.68 · 4c3a1c0a
  chenxin authored Jan 22, 2021
  
  4c3a1c0a Browse Files
18 Jan, 2021 2 commits
- Merge branch 'feature/update-header.45' into 'master' · e55d32bf
```
fix: build

See merge request !133
```
  chenxin authored Jan 18, 2021
  e55d32bf Browse Files
- fix: build · 0e597ee1
  chenxin authored Jan 18, 2021
  
  0e597ee1 Browse Files
15 Jan, 2021 2 commits
- Merge branch 'bugix' into 'master' · 48c11c54
```
fix: 扫码营销文案

See merge request !132
```
  chenxin authored Jan 15, 2021
  48c11c54 Browse Files
- fix: 扫码营销文案 · ac68acd0
  chenxin authored Jan 15, 2021
  
  ac68acd0 Browse Files
14 Jan, 2021 3 commits
- Merge branch 'feature/1.12更新-卡券自动领取' into 'master' · 6ff34a5f
```
fix: build

See merge request !131
```
  chenxin authored Jan 14, 2021
  6ff34a5f Browse Files
- fix: build · 82499dc9
  chenxin authored Jan 14, 2021
  
  82499dc9 Browse Files
- Merge branch 'feature/1.12更新-卡券自动领取' into 'master' · 827a438e
```
Feature/1.12更新 卡券自动领取

See merge request !130
```
  chenxin authored Jan 14, 2021
  827a438e Browse Files
13 Jan, 2021 3 commits
- fix: bug · 53eca0b4
  chenxin authored Jan 13, 2021
  
  53eca0b4 Browse Files
- fix: ecm 提示 · e7660f0f
  chenxin authored Jan 13, 2021
  
  e7660f0f Browse Files
- fix: build · d0bbd682
  chenxin authored Jan 13, 2021
  
  d0bbd682 Browse Files
12 Jan, 2021 1 commit
- fix: 自动领取 · a7ed4ace
  chenxin authored Jan 12, 2021
  
  a7ed4ace Browse Files
07 Jan, 2021 4 commits
- Merge branch 'bugfix' into 'master' · a1f20b7e
```
Bugfix

See merge request !129
```
  chenxin authored Jan 07, 2021
  a1f20b7e Browse Files
- update: activity-select 1.0.2.1 · 0dcb2b4c
  chenxin authored Jan 07, 2021
  
  0dcb2b4c Browse Files
- fix: 隐藏自动领取功能 · 0b718cfc
  chenxin authored Jan 07, 2021
  
  0b718cfc Browse Files
- fix: 卡券直投 templateUseEnable未赋值；更新activity-select版本跳转路径写错 · 6cf901c5
  chenxin authored Jan 07, 2021
  
  6cf901c5 Browse Files
06 Jan, 2021 5 commits
- Merge branch 'hotfix' into 'master' · 4951c798
```
fix: build

See merge request !128
```
  chenxin authored Jan 06, 2021
  4951c798 Browse Files
- fix: build · 151aa51c
  chenxin authored Jan 06, 2021
  
  151aa51c Browse Files
- Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing · 758ace1d
```
# Conflicts:
#	dist/index.html
```
  chenxin authored Jan 06, 2021
  758ace1d Browse Files
- Merge branch 'hotfix' · 1ade64a1
  chenxin authored Jan 06, 2021
  
  1ade64a1 Browse Files
- update: 人群筛选器 Module build failed: Error: Node Sass does not yet support your… · 843c62d5
```
update: 人群筛选器  Module build failed: Error: Node Sass does not yet support your current environment: OS X 64-bit wit
```
  chenxin authored Jan 06, 2021
  843c62d5 Browse Files
05 Jan, 2021 2 commits
- Merge branch 'bugfix2' into 'master' · 60822382
```
fix: 门店选择器可以在编辑状态下操作(产品：可以修改门店选择器id)

See merge request !126
```
  chenxin authored Jan 05, 2021
  60822382 Browse Files
- fix: 门店选择器可以在编辑状态下操作(产品：可以修改门店选择器id) · ad627795
  chenxin authored Jan 05, 2021
  
  ad627795 Browse Files
04 Jan, 2021 3 commits

Merge branch 'feature/m12-微信卡券' into 'master' · 60dbac60
```
Feature/m12 微信卡券

See merge request !125
```
chenxin authored Jan 04, 2021
60dbac60 Browse Files

Merge branch 'master' of http://git.gicdev.com/marketing-web/marketing into feature/m12-微信卡券 · 0c5fdf11

# Conflicts:
#	dist/index.html
#	dist/static/css/main.58a9e1928b371195d78a5de0576a067d.css
#	dist/static/css/main.61f227846be3dcd9a162c301df607d3a.css
#	dist/static/css/main.ee775b169e9eff6f6a92ec490bf4df56.css
#	dist/static/js/card.380ecd619c1a4b5aa7f4.js
#	dist/static/js/ewash.0bf76983dc9eb0dd5a72.js
#	dist/static/js/ewash.391130c8f773cb8775d6.js
#	dist/static/js/ewash.4fbee0c72db89a211d65.js
#	dist/static/js/manifest.4595b12679c131925d0d.js
#	src/views/card/form.js

authored Jan 04, 2021

0c5fdf11 Browse Files

fix: 跳转 · 852ab639
chenxin authored Jan 04, 2021

852ab639 Browse Files

30 Dec, 2020 1 commit
- update: vendor selector 1.2.20 store-new 2.0.65 store-card 2.0.24 · 4eb0e2c6
  chenxin authored Dec 30, 2020
  
  4eb0e2c6 Browse Files
29 Dec, 2020 1 commit
- fix: 处理json字符串 jumplink解析不出来的情况，防止意外 · 87264fab
  chenxin authored Dec 29, 2020
  
  87264fab Browse Files
28 Dec, 2020 5 commits
- fix: build · 5337413d
  chenxin authored Dec 28, 2020
  
  5337413d Browse Files
- fix: build ewash 手动领取 · d40718bf
  chenxin authored Dec 28, 2020
  
  d40718bf Browse Files
- fix: build · 22db53de
  chenxin authored Dec 28, 2020
  
  22db53de Browse Files
- fix: build · afabe831
  chenxin authored Dec 28, 2020
  
  afabe831 Browse Files
- fix: card.19 cardlimittype还是要显示的 · aa1f43e2
  chenxin authored Dec 28, 2020
  
  aa1f43e2 Browse Files
24 Dec, 2020 1 commit
- Merge branch 'bugfixs/shelfId' into 'master' · 8b77a776
```
fix: 展架id没删干净

See merge request !124
```
  chenxin authored Dec 24, 2020
  8b77a776 Browse Files
22 Dec, 2020 1 commit
- fix: 展架id没删干净 · bdcee525
  chenxin authored Dec 22, 2020
  
  bdcee525 Browse Files
21 Dec, 2020 3 commits
- fix: 文案 · 96295aa8
  chenxin authored Dec 21, 2020
  
  96295aa8 Browse Files
- fix: 后续增加的调整：领取xxx · 27820e6d
  chenxin authored Dec 21, 2020
  
  27820e6d Browse Files
- fix: 卡券颜色必填，且不支持编辑 · a0483e98
  chenxin authored Dec 21, 2020
  
  a0483e98 Browse Files