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

10 Oct, 2019 15 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · a87f27d0
```
Fixbug zyw

See merge request !166
```
  赵雅纹 authored Oct 10, 2019
  a87f27d0 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 14b8dbc7
```
# Conflicts:
#	src/pages/my/my.wxml
```
  赵雅纹 authored Oct 10, 2019
  14b8dbc7 Browse Files
- 海报优化 · 1cafd1b9
  赵雅纹 authored Oct 10, 2019
  
  1cafd1b9 Browse Files
- update · ecdbc7e8
  高淑倩 authored Oct 10, 2019
  
  ecdbc7e8 Browse Files
- 请选择规格 · 0752e590
  高淑倩 authored Oct 10, 2019
  
  0752e590 Browse Files
- 个人中心 · 75b3d33f
  高淑倩 authored Oct 10, 2019
  
  75b3d33f Browse Files
- 详情页描述 · c3a9014c
  高淑倩 authored Oct 10, 2019
  
  c3a9014c Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · dbf2a382
  赵雅纹 authored Oct 10, 2019
  
  dbf2a382 Browse Files
- bug修复 · f709c443
  赵雅纹 authored Oct 10, 2019
  
  f709c443 Browse Files
- 下单页取消支付跳订单列表 · 50a76778
  高淑倩 authored Oct 10, 2019
  
  50a76778 Browse Files
- icon · c1d8f465
  高淑倩 authored Oct 10, 2019
  
  c1d8f465 Browse Files
- icon · 48cb4e93
  高淑倩 authored Oct 10, 2019
  
  48cb4e93 Browse Files
- 3 去掉订单页面付费会员后面”>“的样式 · ed6b69c8
  高淑倩 authored Oct 10, 2019
  
  ed6b69c8 Browse Files
- 去掉微信支付 · 6b90f86d
  高淑倩 authored Oct 10, 2019
  
  6b90f86d Browse Files
- 3001 · 2af800ad
  高淑倩 authored Oct 10, 2019
  
  2af800ad Browse Files
09 Oct, 2019 5 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 8f5ad584
```
Fixbug zyw

See merge request !165
```
  赵雅纹 authored Oct 09, 2019
  8f5ad584 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 3ad0b41e
  赵雅纹 authored Oct 09, 2019
  
  3ad0b41e Browse Files
- 优化 · 9ad7f2be
  赵雅纹 authored Oct 09, 2019
  
  9ad7f2be Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 8643eb74
```
Fixbug zyw

See merge request !164
```
  赵雅纹 authored Oct 09, 2019
  8643eb74 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 9224a170
```
# Conflicts:
#	src/component/plus/plus.js
#	src/utils/Http.js
```
  赵雅纹 authored Oct 09, 2019
  9224a170 Browse Files
30 Sep, 2019 6 commits
- 商品列表 · 6cb510cc
  高淑倩 authored Sep 30, 2019
  
  6cb510cc Browse Files
- + 高度 · dab699e4
  高淑倩 authored Sep 30, 2019
  
  dab699e4 Browse Files
- 购物车警告 · ea4f1d77
  高淑倩 authored Sep 30, 2019
  
  ea4f1d77 Browse Files
- active_tab · af24302e
  高淑倩 authored Sep 30, 2019
  
  af24302e Browse Files
- 聚FUN · 24735c6e
  高淑倩 authored Sep 30, 2019
  
  24735c6e Browse Files
- 测试_tunnel-token · 97e4fc6a
  高淑倩 authored Sep 30, 2019
  
  97e4fc6a Browse Files
29 Sep, 2019 5 commits
- update · 51a49f7e
  赵雅纹 authored Sep 29, 2019
  
  51a49f7e Browse Files
- 我的 · c43599c0
  赵雅纹 authored Sep 29, 2019
  
  c43599c0 Browse Files
- 我的推广 · f8364a45
  赵雅纹 authored Sep 29, 2019
  
  f8364a45 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 968ff962
  赵雅纹 authored Sep 29, 2019
  
  968ff962 Browse Files
- token · 309cd5e3
  赵雅纹 authored Sep 29, 2019
  
  309cd5e3 Browse Files
27 Sep, 2019 9 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 62b3815e
```
Fixbug zyw

See merge request !163
```
  赵雅纹 authored Sep 27, 2019
  62b3815e Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · f5eb4738
  赵雅纹 authored Sep 27, 2019
  
  f5eb4738 Browse Files
- 种草触点header带参 · 5d2884d6
  赵雅纹 authored Sep 27, 2019
  
  5d2884d6 Browse Files
- remark · 04a37123
  高淑倩 authored Sep 27, 2019
  
  04a37123 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 705e8130
```
Fixbug zyw

See merge request !162
```
  赵雅纹 authored Sep 27, 2019
  705e8130 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 9d2288bf
  赵雅纹 authored Sep 27, 2019
  
  9d2288bf Browse Files
- 种草bug · 2e587dbd
  赵雅纹 authored Sep 27, 2019
  
  2e587dbd Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · b8e221f4
```
Fixbug zyw

See merge request !161
```
  赵雅纹 authored Sep 27, 2019
  b8e221f4 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 5e2eec87
  赵雅纹 authored Sep 27, 2019
  
  5e2eec87 Browse Files