Commits · 566b876d7d28f65a69e3ba0c3313d4ddebc72d0e · new-sing / h5-base

17 Sep, 2019 37 commits
- Merge branch 'pre' into 'master' · 566b876d
  谭文海 authored Sep 17, 2019
```
Pre

See merge request !4
```
  566b876d
- 提示 · 86823cb8
  IvyXia123 authored Sep 17, 2019
  
  86823cb8
- da · 606b211f
  IvyXia123 authored Sep 17, 2019
  
  606b211f
- 音频1.6 · 554fc565
  IvyXia123 authored Sep 17, 2019
  
  554fc565
- 1.5 · 8bcf9153
  IvyXia123 authored Sep 17, 2019
  
  8bcf9153
- 推送 · 4a9f8259
  IvyXia123 authored Sep 17, 2019
  
  4a9f8259
- 测试2 · fa37c1b5
  IvyXia123 authored Sep 17, 2019
  
  fa37c1b5
- 测试 · 384020ad
  IvyXia123 authored Sep 17, 2019
  
  384020ad
- alert · f8351c34
  IvyXia123 authored Sep 17, 2019
  
  f8351c34
- alert · 91c2a55b
  IvyXia123 authored Sep 17, 2019
  
  91c2a55b
- Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre · 43a96fb6
  IvyXia123 authored Sep 17, 2019
  
  43a96fb6
- static · c23c72eb
  IvyXia123 authored Sep 17, 2019
  
  c23c72eb
- Merge branch 'master' into pre · 1323c9c8
  谭文海 authored Sep 17, 2019
  
  1323c9c8
- pre · 789d661c
  IvyXia123 authored Sep 17, 2019
  
  789d661c
- 还原 · bfae652b
  IvyXia123 authored Sep 17, 2019
  
  bfae652b
- 回退 · 9c544d4c
  IvyXia123 authored Sep 17, 2019
  
  9c544d4c
- router-link · c9de9933
  IvyXia123 authored Sep 17, 2019
  
  c9de9933
- router-link · 53342356
  IvyXia123 authored Sep 17, 2019
  
  53342356
- popup · 9a10f124
  IvyXia123 authored Sep 17, 2019
  
  9a10f124
- fundebug.notify · 884fb803
  IvyXia123 authored Sep 17, 2019
  
  884fb803
- fundebug.notify · cd9703c1
  IvyXia123 authored Sep 17, 2019
  
  cd9703c1
- localStorage · e36a2ae7
  IvyXia123 authored Sep 17, 2019
  
  e36a2ae7
- setTimeout · 8f0f08ac
  IvyXia123 authored Sep 17, 2019
  
  8f0f08ac
- crossOriginLoading · e23d775f
  IvyXia123 authored Sep 17, 2019
  
  e23d775f
- Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre · 82280403
  IvyXia123 authored Sep 17, 2019
  
  82280403
- 域名提交 · 1ff0560d
  IvyXia123 authored Sep 17, 2019
  
  1ff0560d
- Merge branch 'master' into 'pre' · a344bb23
  谭文海 authored Sep 17, 2019
```
# Conflicts:
#   src/main.js
```
  a344bb23
- Merge branch 'master' into pre · 3dcd4317
  IvyXia123 authored Sep 17, 2019
  
  3dcd4317
- 提交 · f6833ac3
  IvyXia123 authored Sep 17, 2019
  
  f6833ac3
- 样式 · bfc1d5d9
  IvyXia123 authored Sep 17, 2019
  
  bfc1d5d9
- console删除 · 23d1cdef
  IvyXia123 authored Sep 17, 2019
  
  23d1cdef
- bug更新 · 59fe9ef4
  IvyXia123 authored Sep 17, 2019
  
  59fe9ef4
- Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre · 696d7d84
  IvyXia123 authored Sep 17, 2019
  
  696d7d84
- bug修改 · bfc8c62b
  IvyXia123 authored Sep 17, 2019
  
  bfc8c62b
- 更新 main.js · 1f15cda8
  谭文海 authored Sep 16, 2019
  
  1f15cda8
- 更新 main.js · 9643e886
  谭文海 authored Sep 16, 2019
  
  9643e886
- 更新 main.js · 9c1fa6a3
  谭文海 authored Sep 16, 2019
  
  9c1fa6a3
16 Sep, 2019 3 commits
- 更新 main.js · 58541fa1
  谭文海 authored Sep 16, 2019
  
  58541fa1
- 更新 main.js · 950465a5
  谭文海 authored Sep 16, 2019
  
  950465a5
- 线上bug2 · 20ce5301
  IvyXia123 authored Sep 16, 2019
  
  20ce5301