Commits · 9a31b4ddad5d527b0f58440cff8e34fadcf1e3d7 · 华国豪 / SURPRISED

14 Nov, 2019 29 commits
- 11 · 9a31b4dd
  黄媛媛 authored Nov 14, 2019
  
  9a31b4dd
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · 109da684
  黄媛媛 authored Nov 14, 2019
  
  109da684
- 添加key参数 · 484ecf7d
  黄媛媛 authored Nov 14, 2019
  
  484ecf7d
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · 41ff4587
  Mac authored Nov 14, 2019
  
  41ff4587
- 1 · 33e49d17
  Mac authored Nov 14, 2019
  
  33e49d17
- 支付成功 · 3a758443
  黄媛媛 authored Nov 14, 2019
  
  3a758443
- 1 · 87d68864
  华国豪 authored Nov 14, 2019
  
  87d68864
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · 607e9dcb
  华国豪 authored Nov 14, 2019
  
  607e9dcb
- no message · b93cecbc
  华国豪 authored Nov 14, 2019
  
  b93cecbc
- 1 · 7d63a86d
  Mac authored Nov 14, 2019
  
  7d63a86d
- 1 · c90a5c17
  Mac authored Nov 14, 2019
  
  c90a5c17
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · f30bb351
  Mac authored Nov 14, 2019
  
  f30bb351
- 1 · 96803ed9
  Mac authored Nov 14, 2019
  
  96803ed9
- 更换背景图 · 8e3b0b93
  华国豪 authored Nov 14, 2019
  
  8e3b0b93
- guochang · ca9f7009
  华国豪 authored Nov 14, 2019
  
  ca9f7009
- 没登录的处理 · daa47b95
  Mac authored Nov 14, 2019
  
  daa47b95
- 修改抢购成功之后的样式 · 1cd28c12
  Mac authored Nov 14, 2019
  
  1cd28c12
- 登录的逻辑修改 · 3c089c3f
  Mac authored Nov 14, 2019
  
  3c089c3f
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · 236ef2b0
  Mac authored Nov 14, 2019
  
  236ef2b0
- 修改名称 · 937a6b04
  Mac authored Nov 14, 2019
  
  937a6b04
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · 3f0bd2c8
  zhengke authored Nov 14, 2019
  
  3f0bd2c8
- 修改https · 6a7895ae
  zhengke authored Nov 14, 2019
  
  6a7895ae
- 分享出去的链接加https · 25d0cb89
  Mac authored Nov 14, 2019
  
  25d0cb89
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · 8f9c973f
  Mac authored Nov 14, 2019
  
  8f9c973f
- 活动页面的修改 · 0ecd68fe
  Mac authored Nov 14, 2019
  
  0ecd68fe
- 修改 · e331bca6
  zhengke authored Nov 14, 2019
  
  e331bca6
- 修改 · 2267627d
  zhengke authored Nov 14, 2019
  
  2267627d
- 11 · fc83897c
  黄媛媛 authored Nov 14, 2019
  
  fc83897c
- 修改下载页 · 43fe1e77
  黄媛媛 authored Nov 14, 2019
  
  43fe1e77
13 Nov, 2019 11 commits
- xiugai · 6e3be8db
  zhengke authored Nov 13, 2019
  
  6e3be8db
- 修改 · 464ec7d2
  zhengke authored Nov 13, 2019
  
  464ec7d2
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · f0b0f783
  罗超 authored Nov 13, 2019
```
# Conflicts:
#	html/GT_activities.html
```
  f0b0f783
- no message · a91667e7
  罗超 authored Nov 13, 2019
  
  a91667e7
- 修改 · cd2420ba
  zhengke authored Nov 13, 2019
  
  cd2420ba
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · 3bec96a1
  罗超 authored Nov 13, 2019
  
  3bec96a1
- 修改 · 7309ebc1
  zhengke authored Nov 13, 2019
  
  7309ebc1
- Merge branch 'master' of http://gitlab.oytour.com/huaguohao/surprised · 292418b4
  罗超 authored Nov 13, 2019
```
# Conflicts:
#	html/GT_activities.html
```
  292418b4
- no message · c8f557b1
  罗超 authored Nov 13, 2019
  
  c8f557b1
- 修改 · 5fbccdad
  zhengke authored Nov 13, 2019
  
  5fbccdad
- 增加loading · f3214ad1
  zhengke authored Nov 13, 2019
  
  f3214ad1