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

06 Jun, 2019 28 commits
- Merge branch 'dev' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev · ccebe01e
  高淑倩 authored Jun 06, 2019
  
  ccebe01e Browse Files
- modify: 优惠券点击 · 2e706906
  高淑倩 authored Jun 06, 2019
  
  2e706906 Browse Files
- Merge branch 'feature-zyw' into 'dev' · 282aaec9
```
update

See merge request !14
```
  赵雅纹 authored Jun 06, 2019
  282aaec9 Browse Files
- update · 822f7664
  赵雅纹 authored Jun 06, 2019
  
  822f7664 Browse Files
- Merge branch 'feature-zyw' into 'dev' · 7952b990
```
优惠券详情

See merge request !13
```
  赵雅纹 authored Jun 06, 2019
  7952b990 Browse Files
- 优惠券详情 · af24062b
  赵雅纹 authored Jun 06, 2019
  
  af24062b Browse Files
- Merge branch 'feature-zyw' into 'dev' · 3ab47876
```
Feature zyw

See merge request !12
```
  赵雅纹 authored Jun 06, 2019
  3ab47876 Browse Files
- Merge branch 'dev' into feature-zyw · 252807b7
  赵雅纹 authored Jun 06, 2019
  
  252807b7 Browse Files
- 优惠券详情 · 43e48d7a
  赵雅纹 authored Jun 06, 2019
  
  43e48d7a Browse Files
- modify: 外卖 · 992ccaa0
  高淑倩 authored Jun 06, 2019
  
  992ccaa0 Browse Files
- modify: 配置 · c7ff90cd
  高淑倩 authored Jun 06, 2019
  
  c7ff90cd Browse Files
- add: 未激活样式 · 6464e87a
  高淑倩 authored Jun 06, 2019
  
  6464e87a Browse Files
- add: 消费列表 · 0e679342
  高淑倩 authored Jun 06, 2019
  
  0e679342 Browse Files
- modify:appjson_配置 · 2edb060e
  高淑倩 authored Jun 06, 2019
  
  2edb060e Browse Files
- modify: 我的会员样式 · fd39f172
  高淑倩 authored Jun 06, 2019
  
  fd39f172 Browse Files
- modify: 会员首页 · 98507c47
  高淑倩 authored Jun 06, 2019
  
  98507c47 Browse Files
- modify: coupon_code · 60646f01
  高淑倩 authored Jun 06, 2019
  
  60646f01 Browse Files
- modify: brandid · 466049b0
  高淑倩 authored Jun 06, 2019
  
  466049b0 Browse Files
- Merge branch 'feature-zyw' into 'dev' · 15d204ac
```
Feature zyw

See merge request !11
```
  赵雅纹 authored Jun 06, 2019
  15d204ac Browse Files
- modify: 积分兑换吸底 · 3b26adb3
  高淑倩 authored Jun 06, 2019
  
  3b26adb3 Browse Files
- Merge branch 'dev' into feature-zyw · cdb28491
```
# Conflicts:
#	src/project.config.json
```
  赵雅纹 authored Jun 06, 2019
  cdb28491 Browse Files
- 首页 · 200dfa4f
  赵雅纹 authored Jun 06, 2019
  
  200dfa4f Browse Files
- modify: 配置 · f9536d51
  高淑倩 authored Jun 06, 2019
  
  f9536d51 Browse Files
- modify: 我的会员样式 · 9d8f5d22
  高淑倩 authored Jun 06, 2019
  
  9d8f5d22 Browse Files
- add: 优惠券详情 · c6942ce2
  高淑倩 authored Jun 06, 2019
  
  c6942ce2 Browse Files
- modify: 取缓存会员id · c5dd3e2d
  高淑倩 authored Jun 06, 2019
  
  c5dd3e2d Browse Files
- modify: 积分流水样式 · 992f73f7
  高淑倩 authored Jun 06, 2019
  
  992f73f7 Browse Files
- add: 优惠券初始化 · 8b63b737
  高淑倩 authored Jun 06, 2019
  
  8b63b737 Browse Files
05 Jun, 2019 12 commits
- modify: 2019.6.5 · 5a749ff2
  高淑倩 authored Jun 05, 2019
  
  5a749ff2 Browse Files
- modify: 积分兑换详情页样式 · d87fcfe1
  高淑倩 authored Jun 05, 2019
  
  d87fcfe1 Browse Files
- modify:样式 · c9cec132
  高淑倩 authored Jun 05, 2019
  
  c9cec132 Browse Files
- add: 外卖跳转 · 7f081ec8
  高淑倩 authored Jun 05, 2019
  
  7f081ec8 Browse Files
- modify: 积分商城图片 · 7ff0b8d1
  高淑倩 authored Jun 05, 2019
  
  7ff0b8d1 Browse Files
- modify: console · 9ac21fb5
  高淑倩 authored Jun 05, 2019
  
  9ac21fb5 Browse Files
- modify: 个人中心 · 76053f30
  高淑倩 authored Jun 05, 2019
  
  76053f30 Browse Files
- modify: 适配 · 50e4e625
  高淑倩 authored Jun 05, 2019
  
  50e4e625 Browse Files
- Merge branch 'feature-zyw' into 'dev' · 470e3f0e
```
Feature zyw

See merge request !10
```
  赵雅纹 authored Jun 05, 2019
  470e3f0e Browse Files
- Merge branch 'dev' into feature-zyw · d9eca4d2
```
# Conflicts:
#	src/component/personCenter/personCenter.js
```
  赵雅纹 authored Jun 05, 2019
  d9eca4d2 Browse Files
- 积分规则 · 57f6ff1d
  赵雅纹 authored Jun 05, 2019
  
  57f6ff1d Browse Files
- add: 外部小程序appid · 6c133907
  高淑倩 authored Jun 05, 2019
  
  6c133907 Browse Files