Commits · ccd093026b0a7f3a9af7d62086eb2829ee22c59f · 高淑倩 / 7-Eleven · GitLab

31 Aug, 2019 23 commits
- 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
30 Aug, 2019 17 commits
- 商品详情页 · 4e7d4871
  高淑倩 authored Aug 30, 2019
  
  4e7d4871 Browse Files
- 优化 · 9f6658cb
  高淑倩 authored Aug 30, 2019
  
  9f6658cb Browse Files
- 优化 · b71d9518
  高淑倩 authored Aug 30, 2019
  
  b71d9518 Browse Files
- add: 内部功能页_goHome · de565860
  高淑倩 authored Aug 30, 2019
  
  de565860 Browse Files
- add: 分包_goHome · 0032f05d
  高淑倩 authored Aug 30, 2019
  
  0032f05d Browse Files
- add: 默认隐藏回到首页不存在 5 tabBar 显示 · ce7575b3
  高淑倩 authored Aug 30, 2019
  
  ce7575b3 Browse Files
- 商品详情页图片 · 9cc762a8
  高淑倩 authored Aug 30, 2019
  
  9cc762a8 Browse Files
- modify: 商品详情页_轮播图 · c6a70596
  高淑倩 authored Aug 30, 2019
  
  c6a70596 Browse Files
- add：商品详情页_图文详情 · 93780232
  高淑倩 authored Aug 30, 2019
  
  93780232 Browse Files
- modify: 初始化购物车 · c3f5dd10
  高淑倩 authored Aug 30, 2019
  
  c3f5dd10 Browse Files
- add: goHome · 235b56c3
  高淑倩 authored Aug 30, 2019
  
  235b56c3 Browse Files
- 去掉console · 592ac943
  高淑倩 authored Aug 30, 2019
  
  592ac943 Browse Files
- add:轮播图&&图片导航跳转 · 7547ce91
  高淑倩 authored Aug 30, 2019
  
  7547ce91 Browse Files
- modify: plus_img · fbd1c04d
  高淑倩 authored Aug 30, 2019
  
  fbd1c04d Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · 649e30e9
  高淑倩 authored Aug 30, 2019
  
  649e30e9 Browse Files
- plus(9/5-权重高) · 2470cdaa
  高淑倩 authored Aug 30, 2019
  
  2470cdaa Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · 476ebd3b
```
Feature zyw sc

See merge request !99
```
  赵雅纹 authored Aug 30, 2019
  476ebd3b Browse Files