Commits · 06adad3e4c0e3d7a8638a6867cea10d4b023b0c6 · 高淑倩 / 7-Eleven · GitLab

17 Jun, 2019 12 commits
- Merge branch 'dev_7.0.1' into feature-zyw · 06adad3e
  赵雅纹 authored Jun 17, 2019
  
  06adad3e Browse Files
- 时间 · c1c578a6
  赵雅纹 authored Jun 17, 2019
  
  c1c578a6 Browse Files
- add: 首页弹框_判断展示 · 7799567a
  高淑倩 authored Jun 17, 2019
  
  7799567a Browse Files
- modify: console · 15fb943f
  高淑倩 authored Jun 17, 2019
  
  15fb943f Browse Files
- modify: 初始化显示弹框 · af5fcb07
  高淑倩 authored Jun 17, 2019
  
  af5fcb07 Browse Files
- modify: 图片导航弹框 · 02ba2d32
  高淑倩 authored Jun 17, 2019
  
  02ba2d32 Browse Files
- Merge branch 'dev_7.0.1' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into dev_7.0.1 · db5badc9
  高淑倩 authored Jun 17, 2019
  
  db5badc9 Browse Files
- modify: 样式 · 3ce0eb07
  高淑倩 authored Jun 17, 2019
  
  3ce0eb07 Browse Files
- Merge branch 'feature-zyw' into 'dev_7.0.1' · 053c130b
```
Feature zyw

See merge request !29
```
  赵雅纹 authored Jun 17, 2019
  053c130b Browse Files
- Merge branch 'dev_7.0.1' into feature-zyw · 9aeaea39
  赵雅纹 authored Jun 17, 2019
  
  9aeaea39 Browse Files
- 优惠券说明 · 2ec7afea
  赵雅纹 authored Jun 17, 2019
  
  2ec7afea Browse Files
- modify: setTimeout_barcode · 557c6640
  高淑倩 authored Jun 17, 2019
  
  557c6640 Browse Files
15 Jun, 2019 20 commits
- modify: 手机判断开卡 · 6dab1219
  高淑倩 authored Jun 15, 2019
  
  6dab1219 Browse Files
- modifty: 激活成功跳转 · 5da5985b
  高淑倩 authored Jun 15, 2019
  
  5da5985b Browse Files
- modify: 个人中心显示隐藏 · e18c264f
  高淑倩 authored Jun 15, 2019
  
  e18c264f Browse Files
- modify: 手机号码 · b16296df
  高淑倩 authored Jun 15, 2019
  
  b16296df Browse Files
- modify: 手机号判断展示 · 7008ed97
  高淑倩 authored Jun 15, 2019
  
  7008ed97 Browse Files
- Merge branch 'feature-zyw' into 'dev' · 83fd299b
```
Feature zyw

See merge request !28
```
  赵雅纹 authored Jun 15, 2019
  83fd299b Browse Files
- Merge branch 'dev' into feature-zyw · d6493893
  赵雅纹 authored Jun 15, 2019
  
  d6493893 Browse Files
- update · 5c096e62
  赵雅纹 authored Jun 15, 2019
  
  5c096e62 Browse Files
- modify: kabao · 3084d050
  高淑倩 authored Jun 15, 2019
  
  3084d050 Browse Files
- modify: 弹框判断 · 024edd4b
  高淑倩 authored Jun 15, 2019
  
  024edd4b Browse Files
- modify: 报错 · 1d000e8c
  高淑倩 authored Jun 15, 2019
  
  1d000e8c Browse Files
- modify: 首页展示问题 · e58ed150
  高淑倩 authored Jun 15, 2019
  
  e58ed150 Browse Files
- modify: type=1_不弹框 · 6774bdd6
  高淑倩 authored Jun 15, 2019
  
  6774bdd6 Browse Files
- modify: 冲突 · d6f593c0
  高淑倩 authored Jun 15, 2019
  
  d6f593c0 Browse Files
- modify: 激活逻辑 · eed19070
  高淑倩 authored Jun 15, 2019
  
  eed19070 Browse Files
- Merge branch 'feature-zyw' into 'dev' · 5b525414
```
登录过期问题

See merge request !27
```
  赵雅纹 authored Jun 15, 2019
  5b525414 Browse Files
- 登录过期问题 · ed2f928f
  赵雅纹 authored Jun 15, 2019
  
  ed2f928f Browse Files
- modify: 激活失败逻辑 · 7ce95834
  高淑倩 authored Jun 15, 2019
  
  7ce95834 Browse Files
- add: 激活领卡失败逻辑 · 743950da
  高淑倩 authored Jun 15, 2019
  
  743950da Browse Files
- add: 动态子页面 · f925711c
  高淑倩 authored Jun 15, 2019
  
  f925711c Browse Files
14 Jun, 2019 8 commits
- modify: 打开登录弹框_return false · 14f7fff3
  高淑倩 authored Jun 14, 2019
  
  14f7fff3 Browse Files
- modify: 图片导航弹框 · 5f219db6
  高淑倩 authored Jun 14, 2019
  
  5f219db6 Browse Files
- modify: 首页_type跳转 · d11e4c83
  高淑倩 authored Jun 14, 2019
  
  d11e4c83 Browse Files
- modify: 优惠券列表_swiperTab · 6f663702
  高淑倩 authored Jun 14, 2019
  
  6f663702 Browse Files
- modify: 首页data_pageId · 93215825
  高淑倩 authored Jun 14, 2019
  
  93215825 Browse Files
- modify: 分包 · 0064b5ba
  高淑倩 authored Jun 14, 2019
  
  0064b5ba Browse Files
- add: 动态子页面 · e15065d0
  高淑倩 authored Jun 14, 2019
  
  e15065d0 Browse Files
- modify: pages/integralWater/integralWater_style · cd20156c
  高淑倩 authored Jun 14, 2019
  
  cd20156c Browse Files