Commits · c198c9a64472bf31b70fd356b9249d9725bda5f4 · new-sing / h5-base

09 Jan, 2019 15 commits
- 星星 · c198c9a6
  wangwei authored Jan 09, 2019
  
  c198c9a6
- 星星 · 4d7e8f1a
  wangwei authored Jan 09, 2019
  
  4d7e8f1a
- Merge branch 'master' into star · c4e9061e
  wangwei authored Jan 09, 2019
```
# Conflicts:
#	dev/index.html
#	dist/index.html
#	src/components/newLesson/share.vue
```
  c4e9061e
- 星星 · cc420105
  wangwei authored Jan 09, 2019
  
  cc420105
- 星星 · fe785039
  wangwei authored Jan 09, 2019
  
  fe785039
- Merge branch 'dev2' into star · b12b7af0
  wangwei authored Jan 09, 2019
```
# Conflicts:
#	src/components/buy/activityInvite.vue
```
  b12b7af0
- 神策登录接口调整 · 4d968412
  wangwei authored Jan 09, 2019
  
  4d968412
- 神策登录接口调整 · 70949e9f
  wangwei authored Jan 09, 2019
  
  70949e9f
- Merge branch 'dev2' · 19ae6c5e
  wangwei authored Jan 09, 2019
  
  19ae6c5e
- 神策登录接口调整 · a5a39a67
  wangwei authored Jan 09, 2019
  
  a5a39a67
- 星星系统修改打包及合并dev2 · 242b83fb
  wangwei authored Jan 09, 2019
  
  242b83fb
- Merge branch 'dev2' into star · 09f791c5
  wangwei authored Jan 09, 2019
  
  09f791c5
- 优化+数据显示 · 2a8a4568
  chenfenglei authored Jan 09, 2019
  
  2a8a4568
- 神策地址 · ea00a311
  wangwei authored Jan 09, 2019
  
  ea00a311
- 优化 · 54ec955a
  chenfenglei authored Jan 09, 2019
  
  54ec955a
08 Jan, 2019 23 commits
- Merge branch 'dev2' · 5a33e34c
  wangwei authored Jan 08, 2019
  
  5a33e34c
- 星星系统合并 · 1a074344
  wangwei authored Jan 08, 2019
  
  1a074344
- Merge branch 'master' into star · 358f196b
  wangwei authored Jan 08, 2019
```
# Conflicts:
#	config/dev.env.js
#	src/components/map/index.vue
#	src/components/newLesson/audio.vue
#	src/components/newLesson/index.vue
```
  358f196b
- 星星系统 · 591e47de
  wangwei authored Jan 08, 2019
  
  591e47de
- 海报 · 7bd38117
  chenfenglei authored Jan 08, 2019
  
  7bd38117
- 合并打包 · c6786b36
  wangwei authored Jan 08, 2019
```
海报修改
神策数据
```
  c6786b36
- Merge branch 'local' · 11eeb67a
  wangwei authored Jan 08, 2019
```
# Conflicts:
#	src/components/map/index.vue
```
  11eeb67a
- Merge branch 'dev2' into local · e32feead
  wangwei authored Jan 08, 2019
  
  e32feead
- 海报 · 8ffc7eda
  chenfenglei authored Jan 08, 2019
  
  8ffc7eda
- 打包 · 5b1eeb14
  wangwei authored Jan 08, 2019
  
  5b1eeb14
- 打包 · 9fea7da3
  wangwei authored Jan 08, 2019
  
  9fea7da3
- Merge branch 'dev2' of http://git.singsingenglish.com/new-sing/wechat · 795a9f11
  chenfenglei authored Jan 08, 2019
  
  795a9f11
- 海报 · 80763259
  chenfenglei authored Jan 08, 2019
  
  80763259
- 打包 · 9451a91d
  wangwei authored Jan 08, 2019
  
  9451a91d
- Merge branch 'dev2' into local · 73a410ca
  wangwei authored Jan 08, 2019
```
# Conflicts:
#	dev/index.html
#	dist/index.html
```
  73a410ca
- Merge branch 'dev2' · e54bd20f
  wangwei authored Jan 08, 2019
  
  e54bd20f
- 打包 · e983cc89
  wangwei authored Jan 08, 2019
  
  e983cc89
- 星星系统 · 2ec5b435
  wangwei authored Jan 08, 2019
  
  2ec5b435
- 海报 · 7fe6e275
  chenfenglei authored Jan 08, 2019
  
  7fe6e275
- 海报 · 774183b6
  chenfenglei authored Jan 08, 2019
  
  774183b6
- Merge branch 'dev2' of http://git.singsingenglish.com/new-sing/wechat · 4de4c29c
  chenfenglei authored Jan 08, 2019
  
  4de4c29c
- 海报 · 0b67f20e
  chenfenglei authored Jan 08, 2019
  
  0b67f20e
- 神策修改打包 · 7690c58b
  wangwei authored Jan 08, 2019
  
  7690c58b
07 Jan, 2019 2 commits
- 打包 · e5c9f661
  wangwei authored Jan 07, 2019
  
  e5c9f661
- Merge branch 'dev2' into local · dbc64aef
  wangwei authored Jan 07, 2019
```
# Conflicts:
#	dev/index.html
#	dist/index.html
#	src/components/map/index.vue
```
  dbc64aef