Commits · 6d43006479683f96a3db785cdd8a0552104473dc · 高淑倩 / 7-Eleven · GitLab

25 Sep, 2019 19 commits
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 6d430064
  赵雅纹 authored Sep 25, 2019
  
  6d430064 Browse Files
- 触点bug · f6ec0591
  赵雅纹 authored Sep 25, 2019
  
  f6ec0591 Browse Files
- 详情页支付url · 7e2b9e16
  高淑倩 authored Sep 25, 2019
  
  7e2b9e16 Browse Files
- bottom-img · 5bbb8e87
  高淑倩 authored Sep 25, 2019
  
  5bbb8e87 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · b7803f94
```
bug修复

See merge request !157
```
  赵雅纹 authored Sep 25, 2019
  b7803f94 Browse Files
- bug修复 · ada8544e
  赵雅纹 authored Sep 25, 2019
  
  ada8544e Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 9572c232
```
订单完成查看物流

See merge request !156
```
  赵雅纹 authored Sep 25, 2019
  9572c232 Browse Files
- 订单完成查看物流 · 9eb69282
  赵雅纹 authored Sep 25, 2019
  
  9eb69282 Browse Files
- getDetailLimitCount&&status · d1b39fed
  高淑倩 authored Sep 25, 2019
  
  d1b39fed Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · c8f142b3
  高淑倩 authored Sep 25, 2019
  
  c8f142b3 Browse Files
- 订单倒计时 · d1e20fee
  高淑倩 authored Sep 25, 2019
  
  d1e20fee Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · a9538e74
```
Fixbug zyw

See merge request !155
```
  赵雅纹 authored Sep 25, 2019
  a9538e74 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 1142ec15
  赵雅纹 authored Sep 25, 2019
  
  1142ec15 Browse Files
- 优惠券价格 · 78fcc703
  赵雅纹 authored Sep 25, 2019
  
  78fcc703 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · 365303fa
  高淑倩 authored Sep 25, 2019
  
  365303fa Browse Files
- 订单相关 · 4bb54ee2
  高淑倩 authored Sep 25, 2019
  
  4bb54ee2 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 45021212
```
Fixbug zyw

See merge request !154
```
  赵雅纹 authored Sep 25, 2019
  45021212 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · a8dabfd7
  赵雅纹 authored Sep 25, 2019
  
  a8dabfd7 Browse Files
- 收益tradeId · 5daa5d9e
  赵雅纹 authored Sep 25, 2019
  
  5daa5d9e Browse Files
24 Sep, 2019 3 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 0a1648a7
```
Fixbug zyw

See merge request !153
```
  赵雅纹 authored Sep 24, 2019
  0a1648a7 Browse Files
- 图片自适应 · c482af98
  赵雅纹 authored Sep 24, 2019
  
  c482af98 Browse Files
- 样式bug · 7614b325
  赵雅纹 authored Sep 24, 2019
  
  7614b325 Browse Files
23 Sep, 2019 18 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · ef6bf2b6
```
Fixbug zyw

See merge request !152
```
  赵雅纹 authored Sep 23, 2019
  ef6bf2b6 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 52bf2509
  赵雅纹 authored Sep 23, 2019
  
  52bf2509 Browse Files
- 海报样式bug · 3fb4917a
  赵雅纹 authored Sep 23, 2019
  
  3fb4917a Browse Files
- 集点 · 51be3781
  高淑倩 authored Sep 23, 2019
  
  51be3781 Browse Files
- 集点 · 65e7cb51
  高淑倩 authored Sep 23, 2019
  
  65e7cb51 Browse Files
- 集点 · 27e00ab0
  高淑倩 authored Sep 23, 2019
  
  27e00ab0 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · ce33a9e5
  高淑倩 authored Sep 23, 2019
  
  ce33a9e5 Browse Files
- 默认优惠券id · 927bef9e
  高淑倩 authored Sep 23, 2019
  
  927bef9e Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 4897aa4e
```
Fixbug zyw

See merge request !151
```
  赵雅纹 authored Sep 23, 2019
  4897aa4e Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · b6a86458
  赵雅纹 authored Sep 23, 2019
  
  b6a86458 Browse Files
- 我的收益 · 9211820f
  赵雅纹 authored Sep 23, 2019
  
  9211820f Browse Files
- 退款preview参数 · 9ba9ce1d
  高淑倩 authored Sep 23, 2019
  
  9ba9ce1d Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · c6f7cbb3
```
Fixbug zyw

See merge request !150
```
  赵雅纹 authored Sep 23, 2019
  c6f7cbb3 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · dcf1aa31
  赵雅纹 authored Sep 23, 2019
  
  dcf1aa31 Browse Files
- 种草商品展示 · 76cedc4f
  赵雅纹 authored Sep 23, 2019
  
  76cedc4f Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · ce2dab3b
```
Fixbug zyw

See merge request !149
```
  赵雅纹 authored Sep 23, 2019
  ce2dab3b Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 26cb5b8f
  赵雅纹 authored Sep 23, 2019
  
  26cb5b8f Browse Files
- 上传图片判断 · dafd1138
  赵雅纹 authored Sep 23, 2019
  
  dafd1138 Browse Files