Commits · 6acd061877b8fbcfeb6df7d7a2d05d3878ddf5eb · baiguangyao / mr-julyedu

20 Dec, 2019 5 commits
- Merge branch '00-formal' into dev · 6acd0618
  FE committed Dec 20, 2019
  
  6acd0618 Browse Files
- style modify · 193c1e26
  FE committed Dec 20, 2019
  
  193c1e26 Browse Files
- merge 00-formal and build · 35766e83
  FE committed Dec 20, 2019
  
  35766e83 Browse Files
- del no used file · 5a05c1b6
  FE committed Dec 20, 2019
  
  5a05c1b6 Browse Files
- bargain bind phone modify · 90871162
  FE committed Dec 20, 2019
  
  90871162 Browse Files
19 Dec, 2019 3 commits
- key error · a0ea8a63
  FE committed Dec 19, 2019
  
  a0ea8a63 Browse Files
- bargain status modify · 1bb24abd
  FE committed Dec 19, 2019
  
  1bb24abd Browse Files
- formal activity basic complete · a73c3fea
  FE committed Dec 19, 2019
  
  a73c3fea Browse Files
18 Dec, 2019 32 commits
- 备用方案 · 1ce552b3
  zhanghaozhe committed Dec 18, 2019
  
  1ce552b3 Browse Files
- Merge branch '00' into dev · 823bd928
  zhanghaozhe committed Dec 18, 2019
  
  823bd928 Browse Files
- 备用方案 · a99629b5
  zhanghaozhe committed Dec 18, 2019
  
  a99629b5 Browse Files
- 备用方案 · 853245bc
  zhanghaozhe committed Dec 18, 2019
  
  853245bc Browse Files
- 备用方案 · b615398b
  zhanghaozhe committed Dec 18, 2019
  
  b615398b Browse Files
- Merge branch '00' into dev · 60a08e0e
  zhanghaozhe committed Dec 18, 2019
  
  60a08e0e Browse Files
- 备用方案 · 0d127fe8
  zhanghaozhe committed Dec 18, 2019
  
  0d127fe8 Browse Files
- ai course · 44da469c
  FE committed Dec 18, 2019
  
  44da469c Browse Files
- 备用方案 · 1141d8ad
  zhanghaozhe committed Dec 18, 2019
  
  1141d8ad Browse Files
- 活动结束 · 60cca55d
  zhanghaozhe committed Dec 18, 2019
  
  60cca55d Browse Files
- Merge branch 'syangby' into dev · 68c4725c
  zhanghaozhe committed Dec 18, 2019
  
  68c4725c Browse Files
- 活动结束 · bed0b0bf
  zhanghaozhe committed Dec 18, 2019
  
  bed0b0bf Browse Files
- 活动结束 · 5d054ef8
  zhanghaozhe committed Dec 18, 2019
  
  5d054ef8 Browse Files
- Merge branch 'syangby' into dev · 545f92e0
  zhanghaozhe committed Dec 18, 2019
  
  545f92e0 Browse Files
- 活动结束 · d3ada8c5
  zhanghaozhe committed Dec 18, 2019
  
  d3ada8c5 Browse Files
- 活动结束状态 · 200e0af5
  zhanghaozhe committed Dec 18, 2019
  
  200e0af5 Browse Files
- Merge branch 'syangby' into dev · 13072c26
```
# Conflicts:
#	build/mrstatic/js/newyear-yearIndex.fee41c6c.chunk.js
#	build/mrstatic/js/runtime~main.bf845680.js
#	build/mrstatic/js/runtime~main.bf845680.js.map
```
  zhanghaozhe committed Dec 18, 2019
  13072c26 Browse Files
- Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00 · 34883f86
  zhanghaozhe committed Dec 18, 2019
  
  34883f86 Browse Files
- 活动结束状态 · d86b6025
  zhanghaozhe committed Dec 18, 2019
  
  d86b6025 Browse Files
- 宝箱必中文案修改 · 2fa0d28c
  wangshuo committed Dec 18, 2019
  
  2fa0d28c Browse Files
- 文案修改 · bbb205c1
  wangshuo committed Dec 18, 2019
  
  bbb205c1 Browse Files
- 宝箱必中文案 · 2654da96
  wangshuo committed Dec 18, 2019
  
  2654da96 Browse Files
- 更换标题 · a35c8ab8
  zhanghaozhe committed Dec 18, 2019
  
  a35c8ab8 Browse Files
- 更换跳转域名 · c0ba710e
  zhanghaozhe committed Dec 18, 2019
  
  c0ba710e Browse Files
- 更换跳转域名 · 97ca7595
  zhanghaozhe committed Dec 18, 2019
  
  97ca7595 Browse Files
- 更换跳转域名 · 8dda649f
  zhanghaozhe committed Dec 18, 2019
  
  8dda649f Browse Files
- pull · e7c69717
  FE committed Dec 18, 2019
  
  e7c69717 Browse Files
- del build · 4a31bb97
  FE committed Dec 18, 2019
  
  4a31bb97 Browse Files
- checkout · ac64c1aa
  FE committed Dec 18, 2019
  
  ac64c1aa Browse Files
- 微信分享文案 · 5d85c60e
  zhanghaozhe committed Dec 18, 2019
  
  5d85c60e Browse Files
- Merge branch '00' · 8f5d846e
```
# Conflicts:
#	build/mrstatic/js/newyear-yearIndex.67a3f02e.chunk.js
#	build/mrstatic/js/newyear-yearIndex.a5223d56.chunk.js
#	build/mrstatic/js/newyear-yearIndex.baf6e910.chunk.js
#	build/mrstatic/js/runtime~main.4f499422.js.map
#	build/mrstatic/js/runtime~main.d2059c82.js
#	build/mrstatic/js/runtime~main.d2059c82.js.map
#	build/mrstatic/js/runtime~main.ea29db39.js.map
```
  zhanghaozhe committed Dec 18, 2019
  8f5d846e Browse Files
- Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00 · f2cd0d84
  zhanghaozhe committed Dec 18, 2019
  
  f2cd0d84 Browse Files