Commits · 4f87986f0984f37b75bcbafaea25a9c54f1e2c15 · new-sing / h5-base

18 Sep, 2019 32 commits
- cehi · 4f87986f
  IvyXia123 authored Sep 18, 2019
  
  4f87986f
- Merge branch 'pre' · 86526515
  IvyXia123 authored Sep 18, 2019
```
# Conflicts:
#	dist/index.html
#	src/components/map/index.vue
```
  86526515
- ceshi · 839635af
  IvyXia123 authored Sep 18, 2019
  
  839635af
- 提交 · 51ac31f4
  IvyXia123 authored Sep 18, 2019
  
  51ac31f4
- 测试3 · 1490237a
  IvyXia123 authored Sep 18, 2019
  
  1490237a
- 测试20190918-2 · 833d0573
  IvyXia123 authored Sep 18, 2019
  
  833d0573
- 测试20190918-2 · 4100c8cf
  IvyXia123 authored Sep 18, 2019
  
  4100c8cf
- 推送时间20190918 · 68da65ba
  IvyXia123 authored Sep 18, 2019
  
  68da65ba
- 测试2.2 · 00d30295
  IvyXia123 authored Sep 18, 2019
  
  00d30295
- 2.1 · c88ecd00
  IvyXia123 authored Sep 18, 2019
  
  c88ecd00
- dist · e7ee4862
  IvyXia123 authored Sep 18, 2019
  
  e7ee4862
- dist · 2dd54636
  IvyXia123 authored Sep 18, 2019
  
  2dd54636
- no message · 1481770f
  IvyXia123 authored Sep 18, 2019
  
  1481770f
- a · 2c7438d3
  谭文海 authored Sep 18, 2019
  
  2c7438d3
- 测试1.9 · d58e69f8
  IvyXia123 authored Sep 18, 2019
  
  d58e69f8
- 测试1.8 · 006260a4
  IvyXia123 authored Sep 18, 2019
  
  006260a4
- load http · fc199e1e
  谭文海 authored Sep 18, 2019
  
  fc199e1e
- lock · 32f31018
  谭文海 authored Sep 18, 2019
  
  32f31018
- Merge branch 'pre' · 79df3a51
  谭文海 authored Sep 18, 2019
  
  79df3a51
- 不能点击1.8 · a978a686
  IvyXia123 authored Sep 18, 2019
  
  a978a686
- ccqm · 0bfaa11d
  谭文海 authored Sep 18, 2019
  
  0bfaa11d
- apm-rum · f4b3812c
  谭文海 authored Sep 18, 2019
  
  f4b3812c
- Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat · 161815d3
  IvyXia123 authored Sep 18, 2019
  
  161815d3
- promptTime · e402dbc5
  IvyXia123 authored Sep 18, 2019
  
  e402dbc5
- 1.7 · dca620a0
  IvyXia123 authored Sep 18, 2019
  
  dca620a0
- apm-rum · 5cc44a5e
  谭文海 authored Sep 18, 2019
  
  5cc44a5e
- 冲突解决 · 5016e1a9
  IvyXia123 authored Sep 18, 2019
  
  5016e1a9
- Merge branch 'master' of http://git.singsingenglish.com/new-sing/wechat · 8a143df2
  IvyXia123 authored Sep 18, 2019
  
  8a143df2
- 1.6 · 320c4a4e
  IvyXia123 authored Sep 18, 2019
  
  320c4a4e
- passShop · fba84bc5
  IvyXia123 authored Sep 18, 2019
  
  fba84bc5
- 提交 · 328a5102
  IvyXia123 authored Sep 18, 2019
  
  328a5102
- oi · a2caef34
  IvyXia123 authored Sep 18, 2019
  
  a2caef34
17 Sep, 2019 8 commits
- huodong · 4caffd56
  IvyXia123 authored Sep 17, 2019
  
  4caffd56
- 活动 · 8cdc5c7d
  IvyXia123 authored Sep 17, 2019
  
  8cdc5c7d
- Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat · e097c150
  IvyXia123 authored Sep 17, 2019
  
  e097c150
- 删除 · c2bd5782
  IvyXia123 authored Sep 17, 2019
  
  c2bd5782
- 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