Commits · ea00a31193b668939f53afaeb86d85e06d27de81 · new-sing / h5-base

09 Jan, 2019 1 commit
- 神策地址 · ea00a311
  wangwei authored Jan 09, 2019
  
  ea00a311
08 Jan, 2019 18 commits
- Merge branch 'dev2' · 5a33e34c
  wangwei authored Jan 08, 2019
  
  5a33e34c
- 海报 · 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
- 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
- 海报 · 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 6 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
- Merge branch 'dev2' · 583fbeae
  wangwei authored Jan 07, 2019
  
  583fbeae
- 打包 · e8cae419
  wangwei authored Jan 07, 2019
  
  e8cae419
- 海报修改 · 9542701a
  chenfenglei authored Jan 07, 2019
  
  9542701a
- 神策打包 · b4c393ef
  wangwei authored Jan 07, 2019
  
  b4c393ef
04 Jan, 2019 2 commits
- 神策 · 16079889
  wangwei authored Jan 04, 2019
  
  16079889
- category_id 上传 · 06305622
  wangwei authored Jan 04, 2019
  
  06305622
03 Jan, 2019 4 commits
- 主题切换优化 · 0531bd8b
  wangwei authored Jan 03, 2019
  
  0531bd8b
- 神策数据修改 · 91216198
  wangwei authored Jan 03, 2019
```
master合并测试打包
```
  91216198
- Merge branch 'master' into local · bbd3f003
  wangwei authored Jan 03, 2019
```
# Conflicts:
#	dev/index.html
#	dist/index.html
#	src/components/buy/buy.vue
#	src/components/buy/buySuccess.vue
#	src/components/buy/index.vue
```
  bbd3f003
- 改变跳转链接地址 · 82dec601
  wangwei authored Jan 03, 2019
  
  82dec601
29 Dec, 2018 3 commits
- gdt_vid · c6766f26
  wangwei authored Dec 29, 2018
```
cct_user_id
订单提交时 添加以上两个参数
```
  c6766f26
- gdt_vid · 14053dc8
  wangwei authored Dec 29, 2018
```
cct_user_id
订单提交时 添加以上两个参数
```
  14053dc8
- 神策 · 8f637cfc
  wangwei authored Dec 29, 2018
  
  8f637cfc
28 Dec, 2018 3 commits
- 无客服可购课 · fe724c56
  wangwei authored Dec 28, 2018
```
添加实物类商品购买
```
  fe724c56
- 无客服可购课 · 3875aea2
  wangwei authored Dec 28, 2018
  
  3875aea2
- 订单购买优化 · 1dda47bb
  wangwei authored Dec 28, 2018
  
  1dda47bb
27 Dec, 2018 3 commits
- 神策埋点 · ff56b49a
  wangwei authored Dec 27, 2018
  
  ff56b49a
- Merge branch 'master' into local · d7794fe7
  wangwei authored Dec 27, 2018
```
# Conflicts:
#	src/components/newLesson/index.vue
```
  d7794fe7
- 神策埋点 · 5e0a77ec
  wangwei authored Dec 27, 2018
  
  5e0a77ec