Commits · 603a735276bd66b063e128240eb04a6bb247934b · 高淑倩 / 7-Eleven · GitLab

21 Sep, 2019 35 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 603a7352
```
Fixbug zyw

See merge request !141
```
  赵雅纹 authored Sep 21, 2019
  603a7352 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 4cc4ee29
  赵雅纹 authored Sep 21, 2019
  
  4cc4ee29 Browse Files
- 收益订单 · f60114b7
  赵雅纹 authored Sep 21, 2019
  
  f60114b7 Browse Files
- 订单列表_退货寄回 · 28815b8e
  高淑倩 authored Sep 21, 2019
  
  28815b8e Browse Files
- 订单列表 · a9856668
  高淑倩 authored Sep 21, 2019
  
  a9856668 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 3d135425
  赵雅纹 authored Sep 21, 2019
  
  3d135425 Browse Files
- 地址报错 · 1d42b485
  赵雅纹 authored Sep 21, 2019
  
  1d42b485 Browse Files
- 订单详情_删除_订单列表 · 39c449b1
  高淑倩 authored Sep 21, 2019
  
  39c449b1 Browse Files
- 订单详情_取消成功_跳转订单列表 · 518cf574
  高淑倩 authored Sep 21, 2019
  
  518cf574 Browse Files
- plus_重新登陆更新缓存 · d6a95277
  高淑倩 authored Sep 21, 2019
  
  d6a95277 Browse Files
- 订单_活动优惠/优惠 · 661ecb83
  高淑倩 authored Sep 21, 2019
  
  661ecb83 Browse Files
- 优化 · 56f175df
  高淑倩 authored Sep 21, 2019
  
  56f175df Browse Files
- plus会员差价 · c7c0e2f2
  高淑倩 authored Sep 21, 2019
  
  c7c0e2f2 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 087f33bb
  赵雅纹 authored Sep 21, 2019
  
  087f33bb Browse Files
- bug修复 · add3832d
  赵雅纹 authored Sep 21, 2019
  
  add3832d Browse Files
- Merge branch 'dev_7.1.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.1.0 · 9c1a5558
  高淑倩 authored Sep 21, 2019
  
  9c1a5558 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · ba283047
```
Fixbug zyw

See merge request !140
```
  赵雅纹 authored Sep 21, 2019
  ba283047 Browse Files
- 商品合计 · f13fe62a
  高淑倩 authored Sep 21, 2019
  
  f13fe62a Browse Files
- plus 购买之后调登录 · afbdf0d6
  高淑倩 authored Sep 21, 2019
  
  afbdf0d6 Browse Files
- plus 字体颜色 · 4c3fd646
  高淑倩 authored Sep 21, 2019
  
  4c3fd646 Browse Files
- 下单页不是会员显示plus · fb318744
  高淑倩 authored Sep 21, 2019
  
  fb318744 Browse Files
- 合并支付 · 7dcac4e1
  高淑倩 authored Sep 21, 2019
  
  7dcac4e1 Browse Files
- plus · d71975d4
  高淑倩 authored Sep 21, 2019
  
  d71975d4 Browse Files
- 活动折扣 · 0e42942a
  高淑倩 authored Sep 21, 2019
  
  0e42942a Browse Files
- 订单列表状态 · 5606b0b0
  高淑倩 authored Sep 21, 2019
  
  5606b0b0 Browse Files
- setwatch · 73d89965
  高淑倩 authored Sep 21, 2019
  
  73d89965 Browse Files
- add watch · ef86203a
  高淑倩 authored Sep 21, 2019
  
  ef86203a Browse Files
- header · 0bcc4b80
  高淑倩 authored Sep 21, 2019
  
  0bcc4b80 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · ccdddb01
```
Fixbug zyw

See merge request !139
```
  赵雅纹 authored Sep 21, 2019
  ccdddb01 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · abb5b0e1
  赵雅纹 authored Sep 21, 2019
  
  abb5b0e1 Browse Files
- 商品价格/100,发布种草bug修复 · 365ae6b8
  赵雅纹 authored Sep 21, 2019
  
  365ae6b8 Browse Files
- warning · acba3e72
  高淑倩 authored Sep 21, 2019
  
  acba3e72 Browse Files
- 退单_查看详情 · 760726ad
  高淑倩 authored Sep 21, 2019
  
  760726ad Browse Files
- 订单列表查看物流 · 1a7ffa5d
  高淑倩 authored Sep 21, 2019
  
  1a7ffa5d Browse Files
- memberId · 6080b63d
  高淑倩 authored Sep 21, 2019
  
  6080b63d Browse Files
20 Sep, 2019 5 commits
- 默认优惠价 · eade8b7a
  daqian authored Sep 20, 2019
  
  eade8b7a Browse Files
- 撤销退款 · f183ca51
  高淑倩 authored Sep 20, 2019
  
  f183ca51 Browse Files
- 物流_申请退货 · 31a0852c
  高淑倩 authored Sep 20, 2019
  
  31a0852c Browse Files
- 优化 · 72f64804
  高淑倩 authored Sep 20, 2019
  
  72f64804 Browse Files
- share · 9ba7cd91
  高淑倩 authored Sep 20, 2019
  
  9ba7cd91 Browse Files