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

17 Sep, 2019 17 commits
- Merge branch 'dev_7.1.0' into fixbug-ZYW · d96dc159
  赵雅纹 authored Sep 17, 2019
  
  d96dc159 Browse Files
- 邀请注册判断 · 8548b5a1
  赵雅纹 authored Sep 17, 2019
  
  8548b5a1 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · 319e4cba
  高淑倩 authored Sep 17, 2019
  
  319e4cba Browse Files
- 首页图片报错 · f9270f18
  高淑倩 authored Sep 17, 2019
  
  f9270f18 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 730e4204
  赵雅纹 authored Sep 17, 2019
  
  730e4204 Browse Files
- 触点 · abbb870b
  赵雅纹 authored Sep 17, 2019
  
  abbb870b Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · a935d1b4
```
Fixbug zyw

See merge request !129
```
  赵雅纹 authored Sep 17, 2019
  a935d1b4 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 2067783c
  赵雅纹 authored Sep 17, 2019
  
  2067783c Browse Files
- 触点bug修改 · ecc0121c
  赵雅纹 authored Sep 17, 2019
  
  ecc0121c Browse Files
- 支付状态 · 31fbfb09
  高淑倩 authored Sep 17, 2019
  
  31fbfb09 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · edb29a1e
  高淑倩 authored Sep 17, 2019
  
  edb29a1e Browse Files
- baseUserInfo · 8200cc6f
  高淑倩 authored Sep 17, 2019
  
  8200cc6f Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · eee67ff5
```
Fixbug zyw

See merge request !128
```
  赵雅纹 authored Sep 17, 2019
  eee67ff5 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · a2da13c8
  赵雅纹 authored Sep 17, 2019
  
  a2da13c8 Browse Files
- update · 85ee9b63
  赵雅纹 authored Sep 17, 2019
  
  85ee9b63 Browse Files
- 支付失败图片 · 5d1e489d
  高淑倩 authored Sep 17, 2019
  
  5d1e489d Browse Files
- 重新登录 · b5cb012a
  高淑倩 authored Sep 17, 2019
  
  b5cb012a Browse Files
16 Sep, 2019 23 commits
- 暂无推广商品 · c022d172
  高淑倩 authored Sep 16, 2019
  
  c022d172 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 7eef437d
```
Fixbug zyw

See merge request !127
```
  赵雅纹 authored Sep 16, 2019
  7eef437d Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 21f44b3e
  赵雅纹 authored Sep 16, 2019
  
  21f44b3e Browse Files
- bug修复 · 0e604500
  赵雅纹 authored Sep 16, 2019
  
  0e604500 Browse Files
- 支付页面绑定事件 · b36cf03f
  高淑倩 authored Sep 16, 2019
  
  b36cf03f Browse Files
- tab · ad402218
  高淑倩 authored Sep 16, 2019
  
  ad402218 Browse Files
- 支付金额 · 3d8d75b7
  高淑倩 authored Sep 16, 2019
  
  3d8d75b7 Browse Files
- vip · 431659ee
  高淑倩 authored Sep 16, 2019
  
  431659ee Browse Files
- 优惠券优惠 · 1846eac6
  高淑倩 authored Sep 16, 2019
  
  1846eac6 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · 1c2fc8a7
  高淑倩 authored Sep 16, 2019
  
  1c2fc8a7 Browse Files
- 优惠券id · 4ad19c2b
  高淑倩 authored Sep 16, 2019
  
  4ad19c2b Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 6564f307
```
Fixbug zyw

See merge request !126
```
  赵雅纹 authored Sep 16, 2019
  6564f307 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · e41311c0
```
# Conflicts:
#	src/pages/confirmOrder/confirmOrder.js
```
  赵雅纹 authored Sep 16, 2019
  e41311c0 Browse Files
- 购物车金额问题和订单地址bug · b803f356
  赵雅纹 authored Sep 16, 2019
  
  b803f356 Browse Files
- btn · 09da528c
  高淑倩 authored Sep 16, 2019
  
  09da528c Browse Files
- 警告 · 71b2083e
  高淑倩 authored Sep 16, 2019
  
  71b2083e Browse Files
- tab · d97e70b9
  高淑倩 authored Sep 16, 2019
  
  d97e70b9 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · 09c76fbc
  高淑倩 authored Sep 16, 2019
  
  09c76fbc Browse Files
- coupon · 6dc3a2d5
  高淑倩 authored Sep 16, 2019
  
  6dc3a2d5 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 3a4c8ec7
```
Fixbug zyw

See merge request !125
```
  赵雅纹 authored Sep 16, 2019
  3a4c8ec7 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 154c71fb
  赵雅纹 authored Sep 16, 2019
  
  154c71fb Browse Files
- 购物车和立即购买条件判断 · 1cf72d19
  赵雅纹 authored Sep 16, 2019
  
  1cf72d19 Browse Files
- 实付款 · 657118ac
  高淑倩 authored Sep 16, 2019
  
  657118ac Browse Files