Commits · 91c17232cf4f289942203148719447078fbcfa12 · 高淑倩 / 7-Eleven · GitLab

28 Aug, 2019 14 commits
- Merge branch 'dev_7.1.0' into feature-zyw-sc · 91c17232
```
# Conflicts:
#	src/project.config.json
```
  赵雅纹 authored Aug 28, 2019
  91c17232 Browse Files
- 分享 · 9a5770b3
  赵雅纹 authored Aug 28, 2019
  
  9a5770b3 Browse Files
- add: 下单页支付参数 · fed1c226
  高淑倩 authored Aug 28, 2019
  
  fed1c226 Browse Files
- add: 下单页商品信息 · b4ad1e14
  高淑倩 authored Aug 28, 2019
  
  b4ad1e14 Browse Files
- add：退单详情＿status · 05b28005
  高淑倩 authored Aug 28, 2019
  
  05b28005 Browse Files
- modify: 退单列表跳转查看详情 · 60638108
  高淑倩 authored Aug 28, 2019
  
  60638108 Browse Files
- modify: 退单列表_status · 8637730a
  高淑倩 authored Aug 28, 2019
  
  8637730a Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · 990b8215
```
Feature zyw sc

See merge request !88
```
  赵雅纹 authored Aug 28, 2019
  990b8215 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · f52d1736
  赵雅纹 authored Aug 28, 2019
  
  f52d1736 Browse Files
- 图片上传 · d65a0320
  赵雅纹 authored Aug 28, 2019
  
  d65a0320 Browse Files
- add: 订单详情_商品信息 · 1b001430
  高淑倩 authored Aug 28, 2019
  
  1b001430 Browse Files
- add: 进制转换 · 35fde4bb
  高淑倩 authored Aug 28, 2019
  
  35fde4bb Browse Files
- add: 退单详情 · 2c021055
  高淑倩 authored Aug 28, 2019
  
  2c021055 Browse Files
- add: 退货列表count · ef43cb00
  高淑倩 authored Aug 28, 2019
  
  ef43cb00 Browse Files
27 Aug, 2019 1 commit
- modify: 分享 · 55cbde3c
  高淑倩 authored Aug 27, 2019
  
  55cbde3c Browse Files
26 Aug, 2019 14 commits
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · adb321e8
```
Feature zyw sc

See merge request !87
```
  赵雅纹 authored Aug 26, 2019
  adb321e8 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · da7453b8
  赵雅纹 authored Aug 26, 2019
  
  da7453b8 Browse Files
- 上传图片 · 029ac84a
  赵雅纹 authored Aug 26, 2019
  
  029ac84a Browse Files
- add:退单详情背景图 · c6a5e140
  高淑倩 authored Aug 26, 2019
  
  c6a5e140 Browse Files
- 711_授权字体 · 0f13b610
  高淑倩 authored Aug 26, 2019
  
  0f13b610 Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · c6c124e2
  高淑倩 authored Aug 26, 2019
  
  c6c124e2 Browse Files
- modify：支付图片 · 1e875733
  高淑倩 authored Aug 26, 2019
  
  1e875733 Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · 01042cf4
```
Feature zyw sc

See merge request !86
```
  赵雅纹 authored Aug 26, 2019
  01042cf4 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · 264705b2
  赵雅纹 authored Aug 26, 2019
  
  264705b2 Browse Files
- 种草专区 · c0ff0dc5
  赵雅纹 authored Aug 26, 2019
  
  c0ff0dc5 Browse Files
- add: 下单参数 · 67347fe4
  高淑倩 authored Aug 26, 2019
  
  67347fe4 Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · b7c68781
```
Feature zyw sc

See merge request !85
```
  赵雅纹 authored Aug 26, 2019
  b7c68781 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · 77cedff3
  赵雅纹 authored Aug 26, 2019
  
  77cedff3 Browse Files
- 关联商品 · 29dda26e
  赵雅纹 authored Aug 26, 2019
  
  29dda26e Browse Files
24 Aug, 2019 2 commits
- add: 退单详情 · d442da71
  高淑倩 authored Aug 24, 2019
  
  d442da71 Browse Files
- add：退单列表状态 · a6547afa
  高淑倩 authored Aug 24, 2019
  
  a6547afa Browse Files
23 Aug, 2019 9 commits
- add: 退单状态 · 6feb8e69
  高淑倩 authored Aug 23, 2019
  
  6feb8e69 Browse Files
- add: 退单列表 · b6d9e0ef
  高淑倩 authored Aug 23, 2019
  
  b6d9e0ef Browse Files
- modify: 购物车支付 · f6cb1beb
  高淑倩 authored Aug 23, 2019
  
  f6cb1beb Browse Files
- add：下单计算优惠接口 · b2ec9124
  高淑倩 authored Aug 23, 2019
  
  b2ec9124 Browse Files
- modify: 购物车_下单页路径 · addc8f38
  高淑倩 authored Aug 23, 2019
  
  addc8f38 Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · f277aad4
```
Feature zyw sc

See merge request !84
```
  赵雅纹 authored Aug 23, 2019
  f277aad4 Browse Files
- Merge branch 'dev_7.1.0' into feature-zyw-sc · 13132676
  赵雅纹 authored Aug 23, 2019
  
  13132676 Browse Files
- 分类商品列表更改 · 9c42da3c
  赵雅纹 authored Aug 23, 2019
  
  9c42da3c Browse Files
- Merge branch 'feature-zyw-sc' into 'dev_7.1.0' · 72aa8584
```
Feature zyw sc

See merge request !83
```
  赵雅纹 authored Aug 23, 2019
  72aa8584 Browse Files