Commits · e9a575a615483ada2893d4ef46497174632f56bb · integralMall / integral-mall · GitLab

25 Nov, 2021 5 commits
- Merge branch 'feature/11月迭代' into dev · e9a575a6
  liuchenxi authored Nov 25, 2021
  
  e9a575a6 Browse Files
- update: 自提点配置 · 899d04da
  liuchenxi authored Nov 25, 2021
  
  899d04da Browse Files
- update: build · 1ddd3a92
  liuchenxi authored Nov 25, 2021
  
  1ddd3a92 Browse Files
- Merge branch 'feature/11月迭代' into dev · 0291cd85
  liuchenxi authored Nov 25, 2021
  
  0291cd85 Browse Files
- update: 兑换渠道文案调整 · 7f478bc5
  liuchenxi authored Nov 25, 2021
  
  7f478bc5 Browse Files
22 Nov, 2021 9 commits
- update: dist · 2f17fc5b
  caoyanzhi authored Nov 22, 2021
  
  2f17fc5b Browse Files
- Merge branch 'bugfix/自提点回显bug' into dev · 72f1ef20
  caoyanzhi authored Nov 22, 2021
  
  72f1ef20 Browse Files
- fix: 自提点组件回显bug · e00e5a47
  caoyanzhi authored Nov 22, 2021
  
  e00e5a47 Browse Files
- update: dist · b6e6b233
  caoyanzhi authored Nov 22, 2021
  
  b6e6b233 Browse Files
- Merge branch 'bugfix/自提点回显bug' into dev · 75b6f51f
  caoyanzhi authored Nov 22, 2021
  
  75b6f51f Browse Files
- update: 修复自提点回显bug · f783f159
  caoyanzhi authored Nov 22, 2021
  
  f783f159 Browse Files
- update: build · d1f02bf1
  liuchenxi authored Nov 22, 2021
  
  d1f02bf1 Browse Files
- Merge branch 'bugfix/实物礼品删除规格时保存异常' into dev · 7823d85c
  liuchenxi authored Nov 22, 2021
  
  7823d85c Browse Files
- bugfix: 实物礼品删除规格保存时异常 · 07c6c23a
  liuchenxi authored Nov 22, 2021
  
  07c6c23a Browse Files
19 Nov, 2021 3 commits
- update: build · 2477942a
  liuchenxi authored Nov 19, 2021
  
  2477942a Browse Files
- Merge branch 'feature/11月迭代' into dev · 425143c0
  liuchenxi authored Nov 19, 2021
  
  425143c0 Browse Files
- update: 兑换渠道文案 · 8e71147e
  liuchenxi authored Nov 19, 2021
  
  8e71147e Browse Files
18 Nov, 2021 3 commits
- update: build · a0f15d69
  liuchenxi authored Nov 18, 2021
  
  a0f15d69 Browse Files
- Merge branch 'feature/11月迭代' into dev · 1b149372
  liuchenxi authored Nov 18, 2021
  
  1b149372 Browse Files
- update: 定时上架时间 · dd07d8b7
  liuchenxi authored Nov 18, 2021
  
  dd07d8b7 Browse Files
17 Nov, 2021 3 commits
- update: build · 75989f8d
  liuchenxi authored Nov 17, 2021
  
  75989f8d Browse Files
- Merge branch 'feature/11月迭代' into dev · 6009be1d
  liuchenxi authored Nov 17, 2021
  
  6009be1d Browse Files
- update: 卡券状态文案修改 · 3466d634
  liuchenxi authored Nov 17, 2021
  
  3466d634 Browse Files
16 Nov, 2021 3 commits
- update: build · c8404730
  liuchenxi authored Nov 16, 2021
  
  c8404730 Browse Files
- Merge branch 'feature/11月迭代' into dev · 35fb85fb
  liuchenxi authored Nov 16, 2021
  
  35fb85fb Browse Files
- update: 定时上架校验 · 28113d4b
  liuchenxi authored Nov 16, 2021
  
  28113d4b Browse Files
15 Nov, 2021 3 commits
- update: dist · c2ea9cdd
  caoyanzhi authored Nov 15, 2021
  
  c2ea9cdd Browse Files
- Merge branch 'feature/去掉footer' into dev · 93629766
  caoyanzhi authored Nov 15, 2021
  
  93629766 Browse Files
- update: 去掉footer · 4fdfb1fd
  caoyanzhi authored Nov 15, 2021
  
  4fdfb1fd Browse Files
12 Nov, 2021 3 commits
- update: build · 20654cf4
  liuchenxi authored Nov 12, 2021
  
  20654cf4 Browse Files
- Merge branch 'feature/11月迭代' into dev · 9f1ab15f
  liuchenxi authored Nov 12, 2021
  
  9f1ab15f Browse Files
- update: 自提点增加调货配置 · ca6c0f27
  liuchenxi authored Nov 12, 2021
  
  ca6c0f27 Browse Files
10 Nov, 2021 3 commits
- Merge branch 'feature/11月迭代' into feature/11月UI调整优化 · b9850766
```
# Conflicts:
#	src/views/goods/coupon/info.vue
#	src/views/goods/gift/info.vue
```
  liuchenxi authored Nov 10, 2021
  b9850766 Browse Files
- Merge branch 'feature/11月迭代' into dev · 93de43ea
  liuchenxi authored Nov 10, 2021
  
  93de43ea Browse Files
- update: 文案调整 · 7134056e
  liuchenxi authored Nov 10, 2021
  
  7134056e Browse Files
09 Nov, 2021 5 commits
- update: build · 1f682b35
  liuchenxi authored Nov 09, 2021
  
  1f682b35 Browse Files
- Merge branch 'feature/11月迭代' into dev · 531b6921
```
# Conflicts:
#	package-lock.json
```
  liuchenxi authored Nov 09, 2021
  531b6921 Browse Files
- update: 11月迭代积分商城内容 · 4fe21850
  liuchenxi authored Nov 09, 2021
  
  4fe21850 Browse Files
- Merge branch 'feature/打包调整' into dev · 45db741d
  caoyanzhi authored Nov 09, 2021
  
  45db741d Browse Files
- update: 调整devServer配置 · 8c112f2c
  caoyanzhi authored Nov 09, 2021
  
  8c112f2c Browse Files