Commits · 0428f2f73101e0e9d05206cbece0d9f52e310126 · 高淑倩 / 7-Eleven · GitLab

31 Aug, 2019 40 commits
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · 0428f2f7
```
推广

See merge request !107
```
  赵雅纹 authored Aug 31, 2019
  0428f2f7 Browse Files
- 推广 · f5e7318f
  赵雅纹 authored Aug 31, 2019
  
  f5e7318f Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · cf3541f0
```
Feature zyw sc

See merge request !106
```
  赵雅纹 authored Aug 31, 2019
  cf3541f0 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · 09d7838a
  赵雅纹 authored Aug 31, 2019
  
  09d7838a Browse Files
- 推广 · c68bef94
  赵雅纹 authored Aug 31, 2019
  
  c68bef94 Browse Files
- add:推广组件 · 3bb6dbd4
  高淑倩 authored Aug 31, 2019
  
  3bb6dbd4 Browse Files
- plus_bgc · 67e1cced
  高淑倩 authored Aug 31, 2019
  
  67e1cced Browse Files
- 优化 · b94bf7c8
  高淑倩 authored Aug 31, 2019
  
  b94bf7c8 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · 50d356ba
  高淑倩 authored Aug 31, 2019
  
  50d356ba Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · adcfa7a7
```
Feature zyw sc

See merge request !105
```
  赵雅纹 authored Aug 31, 2019
  adcfa7a7 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · ff28a65a
  赵雅纹 authored Aug 31, 2019
  
  ff28a65a Browse Files
- add: 组件生命周期隐藏重置 · c4fca1cc
  高淑倩 authored Aug 31, 2019
  
  c4fca1cc Browse Files
- 商品排序 · d6a3421a
  赵雅纹 authored Aug 31, 2019
  
  d6a3421a Browse Files
- 下单 · c0baa9e0
  高淑倩 authored Aug 31, 2019
  
  c0baa9e0 Browse Files
- 退款回退 · 2d4c87bb
  高淑倩 authored Aug 31, 2019
  
  2d4c87bb Browse Files
- 切换状态显示订单 · ab529f45
  高淑倩 authored Aug 31, 2019
  
  ab529f45 Browse Files
- 检验退款流程 · 3f7aa772
  高淑倩 authored Aug 31, 2019
  
  3f7aa772 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · ccd09302
  高淑倩 authored Aug 31, 2019
  
  ccd09302 Browse Files
- 订单支付 · 7f8b34ed
  高淑倩 authored Aug 31, 2019
  
  7f8b34ed Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · 39fab16e
```
Feature zyw sc

See merge request !104
```
  赵雅纹 authored Aug 31, 2019
  39fab16e Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · 7130727c
  赵雅纹 authored Aug 31, 2019
  
  7130727c Browse Files
- 分享 · 25d0a2b3
  赵雅纹 authored Aug 31, 2019
  
  25d0a2b3 Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · c49ffd48
```
Feature zyw sc

See merge request !103
```
  赵雅纹 authored Aug 31, 2019
  c49ffd48 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · 2fc4668c
  赵雅纹 authored Aug 31, 2019
  
  2fc4668c Browse Files
- 分享 · aa3b1153
  赵雅纹 authored Aug 31, 2019
  
  aa3b1153 Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · 45e60ccb
```
Feature zyw sc

See merge request !102
```
  赵雅纹 authored Aug 31, 2019
  45e60ccb Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · 8cb518a1
  赵雅纹 authored Aug 31, 2019
  
  8cb518a1 Browse Files
- 推广商品分享 · 53f18953
  赵雅纹 authored Aug 31, 2019
  
  53f18953 Browse Files
- 确认订单地址 · 243e7bda
  高淑倩 authored Aug 31, 2019
  
  243e7bda Browse Files
- 立即购买样式 · f1350a3d
  高淑倩 authored Aug 31, 2019
  
  f1350a3d Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · d16c5c54
  高淑倩 authored Aug 31, 2019
  
  d16c5c54 Browse Files
- 地址 · 525941af
  高淑倩 authored Aug 31, 2019
  
  525941af Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · e711863a
```
Feature zyw sc

See merge request !101
```
  赵雅纹 authored Aug 31, 2019
  e711863a Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · bce8644d
  赵雅纹 authored Aug 31, 2019
  
  bce8644d Browse Files
- 我的邀请订单收益 · c98d7886
  赵雅纹 authored Aug 31, 2019
  
  c98d7886 Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · 7ea881c6
```
Feature zyw sc

See merge request !100
```
  赵雅纹 authored Aug 31, 2019
  7ea881c6 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · eb4ed70c
```
# Conflicts:
#	src/subPackage/page/pages/myInvite/myInvite.wxml
#	src/subPackage/page/pages/share/share.wxml
```
  赵雅纹 authored Aug 31, 2019
  eb4ed70c Browse Files
- 邀请好友保存海报 · fe9ed00f
  赵雅纹 authored Aug 31, 2019
  
  fe9ed00f Browse Files
- modify: 商品详情购买去下单页 · 6f742c2d
  高淑倩 authored Aug 31, 2019
  
  6f742c2d Browse Files
- add: 商品详情添加购物车 · 4e6e0c85
  高淑倩 authored Aug 31, 2019
  
  4e6e0c85 Browse Files