Commits · b9d103c72ff6f07f909f67b3adf666cc5cf7a88f · new-sing / h5-base

14 Jan, 2019 1 commit
- 修改课包展示 · b9d103c7
  wangwei authored Jan 14, 2019
```
购买优惠券金额埋点修改
```
  b9d103c7
11 Jan, 2019 6 commits
- 修改分享文字 · 46715ba6
  wangwei authored Jan 11, 2019
  
  46715ba6
- 0元购星星系统 · 70137cc8
  wangwei authored Jan 11, 2019
  
  70137cc8
- 星星系统调整 · 156f4933
  wangwei authored Jan 11, 2019
  
  156f4933
- 星星系统调整 · 18ef2bf2
  wangwei authored Jan 11, 2019
  
  18ef2bf2
- 星星系统调整 · 2440855f
  wangwei authored Jan 11, 2019
  
  2440855f
- 星星系统调整 · e450b6c5
  wangwei authored Jan 11, 2019
  
  e450b6c5
10 Jan, 2019 2 commits
- 优化+数据显示 · f5013d7b
  chenfenglei authored Jan 10, 2019
  
  f5013d7b
- Merge branch 'master' of http://git.singsingenglish.com/new-sing/wechat · 8f8c8ef2
  chenfenglei authored Jan 10, 2019
  
  8f8c8ef2
09 Jan, 2019 25 commits
- 星星系统 · c3e51fc8
  wangwei authored Jan 09, 2019
  
  c3e51fc8
- Merge branch 'star' · cc0436ab
  wangwei authored Jan 09, 2019
```
# Conflicts:
#	dev/index.html
#	dist/index.html
```
  cc0436ab
- 去除pay重复点击 · 95e5aaa7
  wangwei authored Jan 09, 2019
  
  95e5aaa7
- 优化+数据显示 · b908f179
  chenfenglei authored Jan 09, 2019
  
  b908f179
- Merge branch 'master' of http://git.singsingenglish.com/new-sing/wechat · 6d7158d3
  chenfenglei authored Jan 09, 2019
  
  6d7158d3
- 星星修改打包 · e4d8dbed
  wangwei authored Jan 09, 2019
  
  e4d8dbed
- Merge branch 'dev2' into star · 2af02135
  wangwei authored Jan 09, 2019
  
  2af02135
- 星星修改 · ac87ee1e
  wangwei authored Jan 09, 2019
  
  ac87ee1e
- 星星 · 9bb730ac
  wangwei authored Jan 09, 2019
  
  9bb730ac
- 星星 · c198c9a6
  wangwei authored Jan 09, 2019
  
  c198c9a6
- 优化+数据显示 · 7bb4ae5d
  chenfenglei authored Jan 09, 2019
  
  7bb4ae5d
- 星星 · 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 6 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