Commits · 2996062b96b3033aa4d7688f4369bd4dcc9bd4fc · 高淑倩 / 7-Eleven · GitLab

22 Oct, 2019 3 commits
- 销售任务&&招募任务 · 2996062b
  高淑倩 authored Oct 22, 2019
  
  2996062b Browse Files
- 招募&&门店榜单 · 52c53bdc
  高淑倩 authored Oct 22, 2019
  
  52c53bdc Browse Files
- 开发 tunnel-token · 69129ba6
  高淑倩 authored Oct 22, 2019
  
  69129ba6 Browse Files
21 Oct, 2019 9 commits
- 会员详情 · 76f33f5d
  谢中龙 authored Oct 21, 2019
  
  76f33f5d Browse Files
- add new pages · c90280fb
  谢中龙 authored Oct 21, 2019
  
  c90280fb Browse Files
- add new pages · 48b5d7a1
  谢中龙 authored Oct 21, 2019
  
  48b5d7a1 Browse Files
- address · ef16b869
  高淑倩 authored Oct 21, 2019
  
  ef16b869 Browse Files
- 适用门店 · 1612ceb3
  高淑倩 authored Oct 21, 2019
  
  1612ceb3 Browse Files
- 适用门店 · c81133cd
  高淑倩 authored Oct 21, 2019
  
  c81133cd Browse Files
- 优惠券_title · f97a59fb
  高淑倩 authored Oct 21, 2019
  
  f97a59fb Browse Files
- 扫码优惠页面 · 0b6236a9
  高淑倩 authored Oct 21, 2019
  
  0b6236a9 Browse Files
- add new pages · 570f68de
  谢中龙 authored Oct 21, 2019
  
  570f68de Browse Files
18 Oct, 2019 9 commits
- 手动merge · 4d43e236
  谢中龙 authored Oct 18, 2019
  
  4d43e236 Browse Files
- 合并 · 66328e43
  谢中龙 authored Oct 18, 2019
  
  66328e43 Browse Files
- 导购 · a723c89f
  谢中龙 authored Oct 18, 2019
  
  a723c89f Browse Files
- 个人中心高度 · c83b62ca
  高淑倩 authored Oct 18, 2019
  
  c83b62ca Browse Files
- tab · fc208cf6
  高淑倩 authored Oct 18, 2019
  
  fc208cf6 Browse Files
- 积分流水跳消费详情 · e48ded7e
  高淑倩 authored Oct 18, 2019
  
  e48ded7e Browse Files
- 无权限跳转 · df3402f7
  高淑倩 authored Oct 18, 2019
  
  df3402f7 Browse Files
- 导购 tabBar · 503d5389
  高淑倩 authored Oct 18, 2019
  
  503d5389 Browse Files
- 企业微信区分环境登录 · 5e04947f
  高淑倩 authored Oct 18, 2019
  
  5e04947f Browse Files
16 Oct, 2019 3 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 36be4393
```
Fixbug zyw

See merge request !172
```
  赵雅纹 authored Oct 16, 2019
  36be4393 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · c1aea07c
  赵雅纹 authored Oct 16, 2019
  
  c1aea07c Browse Files
- 首页弹框问题 · 5502e180
  赵雅纹 authored Oct 16, 2019
  
  5502e180 Browse Files
12 Oct, 2019 8 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · 01abfa11
```
邀请好友海报优化

See merge request !171
```
  赵雅纹 authored Oct 12, 2019
  01abfa11 Browse Files
- 邀请好友海报优化 · cd93901e
  赵雅纹 authored Oct 12, 2019
  
  cd93901e Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · d678cf36
```
Fixbug zyw

See merge request !170
```
  赵雅纹 authored Oct 12, 2019
  d678cf36 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · a2e59b4d
  赵雅纹 authored Oct 12, 2019
  
  a2e59b4d Browse Files
- bug修复 · 1dffd518
  赵雅纹 authored Oct 12, 2019
  
  1dffd518 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · de675b1a
```
Fixbug zyw

See merge request !169
```
  赵雅纹 authored Oct 12, 2019
  de675b1a Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · e7105ba3
  赵雅纹 authored Oct 12, 2019
  
  e7105ba3 Browse Files
- 分享title · cd66d5ee
  赵雅纹 authored Oct 12, 2019
  
  cd66d5ee Browse Files
11 Oct, 2019 6 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · a3980ee0
```
Fixbug zyw

See merge request !168
```
  赵雅纹 authored Oct 11, 2019
  a3980ee0 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 61a8ba93
  赵雅纹 authored Oct 11, 2019
  
  61a8ba93 Browse Files
- bug修复 · c2254069
  赵雅纹 authored Oct 11, 2019
  
  c2254069 Browse Files
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · be8bdd6f
```
Fixbug zyw

See merge request !167
```
  赵雅纹 authored Oct 11, 2019
  be8bdd6f Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 60a3f423
  赵雅纹 authored Oct 11, 2019
  
  60a3f423 Browse Files
- 我的邀请保存海报 · 2d92cdff
  赵雅纹 authored Oct 11, 2019
  
  2d92cdff Browse Files
10 Oct, 2019 2 commits
- Merge branch 'fixbug-ZYW' into 'dev_7.1.0' · a87f27d0
```
Fixbug zyw

See merge request !166
```
  赵雅纹 authored Oct 10, 2019
  a87f27d0 Browse Files
- Merge branch 'dev_7.1.0' into fixbug-ZYW · 14b8dbc7
```
# Conflicts:
#	src/pages/my/my.wxml
```
  赵雅纹 authored Oct 10, 2019
  14b8dbc7 Browse Files