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

26 Sep, 2019 7 commits
- 订单列表支付 · ca529559
  高淑倩 authored Sep 26, 2019
  
  ca529559 Browse Files
- skuImgUrl · 8c2da126
  高淑倩 authored Sep 26, 2019
  
  8c2da126 Browse Files
- 物流公司条件判断 · 2a5c3689
  高淑倩 authored Sep 26, 2019
  
  2a5c3689 Browse Files
- 退单_退款总金额 · 72611192
  高淑倩 authored Sep 26, 2019
  
  72611192 Browse Files
- 下单页skuImgUrl · 010bd219
  高淑倩 authored Sep 26, 2019
  
  010bd219 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · e83a06ed
```
地址库变更

See merge request !159
```
  赵雅纹 authored Sep 26, 2019
  e83a06ed Browse Files
- 地址库变更 · 84e14c8c
  赵雅纹 authored Sep 26, 2019
  
  84e14c8c Browse Files
25 Sep, 2019 20 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 813d7b57
```
Fixbug zyw

See merge request !158
```
  赵雅纹 authored Sep 25, 2019
  813d7b57 Browse Files
- 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 10 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