Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre

# Conflicts: # dist/index.html

Merge branch 'pre' of http://git.singsingenglish.com/new-sing/wechat into pre
# Conflicts: # dist/index.html
388d4fc5 · IvyXia123 · 99df2754 · 9d25e448 · 388d4fc5 · 99df2754
Commit 388d4fc5 authored Sep 18, 2019 by IvyXia123
368 changed files
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -17,6 +17,7 @@ module.exports = {
  },
  output: {
    path: config.build.assetsRoot,
+    crossOriginLoading: "anonymous",
    filename: '[name].js',
    publicPath: process.env.NODE_ENV === 'production' || process.env.NODE_ENV === 'testing'
      ? config.build.assetsPublicPath

--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
-      -webkit-overflow-scrolling:touch;
-    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.455c71a6f49a434e1b141d65c21ffe78.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/manifest.bd1ac30ea0aafae4a3d3.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.bb26eab6aed04b1826ae.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.bd4dd2ed15eb41f368b7.js></script></body></html>
\ No newline at end of file
--- a/dist/static/cache/demo.appcache
+++ b/dist/static/cache/demo.appcache
-CACHE MANIFEST
-# 2010-06-18:v2
-CACHE:
-NETWORK:
-https://cdn.singsingenglish.com/
-FALLBACK:
--- a/dist/static/ckplayer/ckplayer.js
+++ b/dist/static/ckplayer/ckplayer.js
--- a/dist/static/ckplayer/ckplayer.min.js
+++ b/dist/static/ckplayer/ckplayer.min.js
--- a/dist/static/ckplayer/ckplayer.swf
+++ b/dist/static/ckplayer/ckplayer.swf
--- a/dist/static/ckplayer/ckplayer.xml
+++ b/dist/static/ckplayer/ckplayer.xml
--- a/dist/static/ckplayer/hls/LICENSE
+++ b/dist/static/ckplayer/hls/LICENSE
-Copyright (c) 2017 Dailymotion (http://www.dailymotion.com)
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-src/remux/mp4-generator.js and src/demux/exp-golomb.js implementation in this project
-are derived from the HLS library for video.js (https://github.com/videojs/videojs-contrib-hls)
-That work is also covered by the Apache 2 License, following copyright:
-Copyright (c) 2013-2015 Brightcove
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
--- a/dist/static/ckplayer/hls/hls.js
+++ b/dist/static/ckplayer/hls/hls.js
--- a/dist/static/ckplayer/hls/hls.min.js
+++ b/dist/static/ckplayer/hls/hls.min.js
--- a/dist/static/ckplayer/language.xml
+++ b/dist/static/ckplayer/language.xml
-<?xml version="1.0" encoding="utf-8"?>
-	<language>
-		<adCountdown>[$second]</adCountdown><!--广告播放结束倒计时-->
-		<skipDelay>[$second]</skipDelay>
-		<buttonOver>
-			<play>点击播放</play>
-			<pause>暂停播放</pause>
-			<mute>静音</mute>
-			<escMute>恢复音量</escMute>
-			<full>全屏</full>
-			<escFull>退出全屏</escFull>
-			<previousPage>上一集</previousPage>
-			<nextPage>下一集</nextPage>
-			<definition>点击选择清晰度</definition>
-		</buttonOver>
-		<volumeSliderOver>
-			音量：[$volume]%
-		</volumeSliderOver>
-		<buffer>[$percentage]%</buffer>
-		<timeSliderOver><!--鼠标经过进度条显示的时间格式-->
-			[$timeh]:[$timei]:[$times]
-		</timeSliderOver>
-		<liveAndVod>
-			[$timeh]:[$timei]:[$times]
-		</liveAndVod>
-		<live>
-			直播中 [$liveTimeY]-[$liveTimem]-[$liveTimed] [$liveTimeh]:[$liveTimei]:[$liveTimes]
-		</live>
-		<m3u8Definition>
-			<name>流畅</name>
-			<name>低清</name>
-			<name>标清</name>
-			<name>高清</name>
-			<name>超清</name>
-			<name>蓝光</name>
-			<name>未知</name>
-		</m3u8Definition>
-		<error>
-			<cannotFindUrl>视频地址不存在</cannotFindUrl>
-			<streamNotFound>加载失败</streamNotFound>
-			<formatError>视频格式错误</formatError>
-		</error>
-		<definition>自动</definition>
-	</language>
\ No newline at end of file
--- a/dist/static/ckplayer/style.xml
+++ b/dist/static/ckplayer/style.xml
--- a/dist/static/css/app.455c71a6f49a434e1b141d65c21ffe78.css
+++ b/dist/static/css/app.455c71a6f49a434e1b141d65c21ffe78.css
--- a/dist/static/images/2@3x.png
+++ b/dist/static/images/2@3x.png
--- a/dist/static/images/img@3x.png
+++ b/dist/static/images/img@3x.png
--- a/dist/static/images/index-h.png
+++ b/dist/static/images/index-h.png
--- a/dist/static/images/index_icon_max.png
+++ b/dist/static/images/index_icon_max.png
--- a/dist/static/images/index_icon_min.png
+++ b/dist/static/images/index_icon_min.png
--- a/dist/static/images/lessonHeader2.png
+++ b/dist/static/images/lessonHeader2.png
--- a/dist/static/images/lessonHeader3.png
+++ b/dist/static/images/lessonHeader3.png
--- a/dist/static/images/map.png
+++ b/dist/static/images/map.png
--- a/dist/static/images/playImage.png
+++ b/dist/static/images/playImage.png
--- a/dist/static/images/wechat/1.png
+++ b/dist/static/images/wechat/1.png
--- a/dist/static/images/wechat/10.png
+++ b/dist/static/images/wechat/10.png
--- a/dist/static/images/wechat/100.png
+++ b/dist/static/images/wechat/100.png
--- a/dist/static/images/wechat/101.png
+++ b/dist/static/images/wechat/101.png
--- a/dist/static/images/wechat/102.png
+++ b/dist/static/images/wechat/102.png
--- a/dist/static/images/wechat/103.png
+++ b/dist/static/images/wechat/103.png
--- a/dist/static/images/wechat/104.png
+++ b/dist/static/images/wechat/104.png
--- a/dist/static/images/wechat/105.png
+++ b/dist/static/images/wechat/105.png
--- a/dist/static/images/wechat/106.png
+++ b/dist/static/images/wechat/106.png
--- a/dist/static/images/wechat/107.png
+++ b/dist/static/images/wechat/107.png
--- a/dist/static/images/wechat/108.png
+++ b/dist/static/images/wechat/108.png
--- a/dist/static/images/wechat/109.png
+++ b/dist/static/images/wechat/109.png
--- a/dist/static/images/wechat/11.png
+++ b/dist/static/images/wechat/11.png
--- a/dist/static/images/wechat/110.png
+++ b/dist/static/images/wechat/110.png
--- a/dist/static/images/wechat/111.png
+++ b/dist/static/images/wechat/111.png
--- a/dist/static/images/wechat/112.png
+++ b/dist/static/images/wechat/112.png
--- a/dist/static/images/wechat/113.png
+++ b/dist/static/images/wechat/113.png
--- a/dist/static/images/wechat/114.png
+++ b/dist/static/images/wechat/114.png
--- a/dist/static/images/wechat/12.png
+++ b/dist/static/images/wechat/12.png
--- a/dist/static/images/wechat/13.png
+++ b/dist/static/images/wechat/13.png
--- a/dist/static/images/wechat/14.png
+++ b/dist/static/images/wechat/14.png
--- a/dist/static/images/wechat/15.png
+++ b/dist/static/images/wechat/15.png
--- a/dist/static/images/wechat/16.png
+++ b/dist/static/images/wechat/16.png
--- a/dist/static/images/wechat/17.png
+++ b/dist/static/images/wechat/17.png
--- a/dist/static/images/wechat/18.png
+++ b/dist/static/images/wechat/18.png
--- a/dist/static/images/wechat/19.png
+++ b/dist/static/images/wechat/19.png
--- a/dist/static/images/wechat/2.png
+++ b/dist/static/images/wechat/2.png
--- a/dist/static/images/wechat/20.png
+++ b/dist/static/images/wechat/20.png
--- a/dist/static/images/wechat/21.png
+++ b/dist/static/images/wechat/21.png
--- a/dist/static/images/wechat/22.png
+++ b/dist/static/images/wechat/22.png
--- a/dist/static/images/wechat/23.png
+++ b/dist/static/images/wechat/23.png
--- a/dist/static/images/wechat/24.png
+++ b/dist/static/images/wechat/24.png
--- a/dist/static/images/wechat/25.png
+++ b/dist/static/images/wechat/25.png
--- a/dist/static/images/wechat/26.png
+++ b/dist/static/images/wechat/26.png
--- a/dist/static/images/wechat/27.png
+++ b/dist/static/images/wechat/27.png
--- a/dist/static/images/wechat/28.png
+++ b/dist/static/images/wechat/28.png
--- a/dist/static/images/wechat/29.png
+++ b/dist/static/images/wechat/29.png
--- a/dist/static/images/wechat/3.png
+++ b/dist/static/images/wechat/3.png
--- a/dist/static/images/wechat/30.png
+++ b/dist/static/images/wechat/30.png
--- a/dist/static/images/wechat/31.png
+++ b/dist/static/images/wechat/31.png
--- a/dist/static/images/wechat/32.png
+++ b/dist/static/images/wechat/32.png
--- a/dist/static/images/wechat/33.png
+++ b/dist/static/images/wechat/33.png
--- a/dist/static/images/wechat/34.png
+++ b/dist/static/images/wechat/34.png
--- a/dist/static/images/wechat/35.png
+++ b/dist/static/images/wechat/35.png
--- a/dist/static/images/wechat/36.png
+++ b/dist/static/images/wechat/36.png
--- a/dist/static/images/wechat/37.png
+++ b/dist/static/images/wechat/37.png
--- a/dist/static/images/wechat/38.png
+++ b/dist/static/images/wechat/38.png
--- a/dist/static/images/wechat/39.png
+++ b/dist/static/images/wechat/39.png
--- a/dist/static/images/wechat/4.png
+++ b/dist/static/images/wechat/4.png
--- a/dist/static/images/wechat/40.png
+++ b/dist/static/images/wechat/40.png
--- a/dist/static/images/wechat/41.png
+++ b/dist/static/images/wechat/41.png
--- a/dist/static/images/wechat/42.png
+++ b/dist/static/images/wechat/42.png
--- a/dist/static/images/wechat/43.png
+++ b/dist/static/images/wechat/43.png
--- a/dist/static/images/wechat/44.png
+++ b/dist/static/images/wechat/44.png
--- a/dist/static/images/wechat/45.png
+++ b/dist/static/images/wechat/45.png
--- a/dist/static/images/wechat/46.png
+++ b/dist/static/images/wechat/46.png
--- a/dist/static/images/wechat/47.png
+++ b/dist/static/images/wechat/47.png
--- a/dist/static/images/wechat/48.png
+++ b/dist/static/images/wechat/48.png
--- a/dist/static/images/wechat/49.png
+++ b/dist/static/images/wechat/49.png
--- a/dist/static/images/wechat/5.png
+++ b/dist/static/images/wechat/5.png
--- a/dist/static/images/wechat/50.png
+++ b/dist/static/images/wechat/50.png
--- a/dist/static/images/wechat/51.png
+++ b/dist/static/images/wechat/51.png
--- a/dist/static/images/wechat/52.png
+++ b/dist/static/images/wechat/52.png
--- a/dist/static/images/wechat/53.png
+++ b/dist/static/images/wechat/53.png
--- a/dist/static/images/wechat/54.png
+++ b/dist/static/images/wechat/54.png
--- a/dist/static/images/wechat/55.png
+++ b/dist/static/images/wechat/55.png
--- a/dist/static/images/wechat/56.png
+++ b/dist/static/images/wechat/56.png
--- a/dist/static/images/wechat/57.png
+++ b/dist/static/images/wechat/57.png
--- a/dist/static/images/wechat/58.png
+++ b/dist/static/images/wechat/58.png
--- a/dist/static/images/wechat/59.png
+++ b/dist/static/images/wechat/59.png
--- a/dist/static/images/wechat/6.png
+++ b/dist/static/images/wechat/6.png
--- a/dist/static/images/wechat/60.png
+++ b/dist/static/images/wechat/60.png
--- a/dist/static/images/wechat/61.png
+++ b/dist/static/images/wechat/61.png
--- a/dist/static/images/wechat/62.png
+++ b/dist/static/images/wechat/62.png
--- a/dist/static/images/wechat/63.png
+++ b/dist/static/images/wechat/63.png
--- a/dist/static/images/wechat/64.png
+++ b/dist/static/images/wechat/64.png
--- a/dist/static/images/wechat/65.png
+++ b/dist/static/images/wechat/65.png
--- a/dist/static/images/wechat/66.png
+++ b/dist/static/images/wechat/66.png
--- a/dist/static/images/wechat/67.png
+++ b/dist/static/images/wechat/67.png
--- a/dist/static/images/wechat/68.png
+++ b/dist/static/images/wechat/68.png
--- a/dist/static/images/wechat/69.png
+++ b/dist/static/images/wechat/69.png
--- a/dist/static/images/wechat/7.png
+++ b/dist/static/images/wechat/7.png
--- a/dist/static/images/wechat/70.png
+++ b/dist/static/images/wechat/70.png
--- a/dist/static/images/wechat/71.png
+++ b/dist/static/images/wechat/71.png
--- a/dist/static/images/wechat/72.png
+++ b/dist/static/images/wechat/72.png
--- a/dist/static/images/wechat/73.png
+++ b/dist/static/images/wechat/73.png
--- a/dist/static/images/wechat/74.png
+++ b/dist/static/images/wechat/74.png
--- a/dist/static/images/wechat/75.png
+++ b/dist/static/images/wechat/75.png
--- a/dist/static/images/wechat/76.png
+++ b/dist/static/images/wechat/76.png
--- a/dist/static/images/wechat/77.png
+++ b/dist/static/images/wechat/77.png
--- a/dist/static/images/wechat/78.png
+++ b/dist/static/images/wechat/78.png
--- a/dist/static/images/wechat/79.png
+++ b/dist/static/images/wechat/79.png
--- a/dist/static/images/wechat/8.png
+++ b/dist/static/images/wechat/8.png
--- a/dist/static/images/wechat/80.png
+++ b/dist/static/images/wechat/80.png
--- a/dist/static/images/wechat/81.png
+++ b/dist/static/images/wechat/81.png
--- a/dist/static/images/wechat/82.png
+++ b/dist/static/images/wechat/82.png
--- a/dist/static/images/wechat/83.png
+++ b/dist/static/images/wechat/83.png
--- a/dist/static/images/wechat/84.png
+++ b/dist/static/images/wechat/84.png
--- a/dist/static/images/wechat/85.png
+++ b/dist/static/images/wechat/85.png
--- a/dist/static/images/wechat/86.png
+++ b/dist/static/images/wechat/86.png
--- a/dist/static/images/wechat/87.png
+++ b/dist/static/images/wechat/87.png
--- a/dist/static/images/wechat/88.png
+++ b/dist/static/images/wechat/88.png
--- a/dist/static/images/wechat/89.png
+++ b/dist/static/images/wechat/89.png
--- a/dist/static/images/wechat/9.png
+++ b/dist/static/images/wechat/9.png
--- a/dist/static/images/wechat/90.png
+++ b/dist/static/images/wechat/90.png
--- a/dist/static/images/wechat/91.png
+++ b/dist/static/images/wechat/91.png
--- a/dist/static/images/wechat/92.png
+++ b/dist/static/images/wechat/92.png
--- a/dist/static/images/wechat/93.png
+++ b/dist/static/images/wechat/93.png
--- a/dist/static/images/wechat/94.png
+++ b/dist/static/images/wechat/94.png
--- a/dist/static/images/wechat/95.png
+++ b/dist/static/images/wechat/95.png
--- a/dist/static/images/wechat/96.png
+++ b/dist/static/images/wechat/96.png
--- a/dist/static/images/wechat/97.png
+++ b/dist/static/images/wechat/97.png
--- a/dist/static/images/wechat/98.png
+++ b/dist/static/images/wechat/98.png
--- a/dist/static/images/wechat/99.png
+++ b/dist/static/images/wechat/99.png
--- a/dist/static/img/1.45ed649.png
+++ b/dist/static/img/1.45ed649.png
--- a/dist/static/img/1.7e9d372.png
+++ b/dist/static/img/1.7e9d372.png
--- a/dist/static/img/10.55d6d0d.png
+++ b/dist/static/img/10.55d6d0d.png
--- a/dist/static/img/11.7a88d6d.png
+++ b/dist/static/img/11.7a88d6d.png
--- a/dist/static/img/11@2x.487a6bf.png
+++ b/dist/static/img/11@2x.487a6bf.png
--- a/dist/static/img/12.a6854a0.png
+++ b/dist/static/img/12.a6854a0.png
--- a/dist/static/img/12@2x.c0e275d.png
+++ b/dist/static/img/12@2x.c0e275d.png
--- a/dist/static/img/13@2x.557f316.png
+++ b/dist/static/img/13@2x.557f316.png
--- a/dist/static/img/14@2x.7f5b342.png
+++ b/dist/static/img/14@2x.7f5b342.png
--- a/dist/static/img/2.35e2204.png
+++ b/dist/static/img/2.35e2204.png
--- a/dist/static/img/2.3a3a85e.png
+++ b/dist/static/img/2.3a3a85e.png
--- a/dist/static/img/21.d0421c5.png
+++ b/dist/static/img/21.d0421c5.png
--- a/dist/static/img/21@2x.522f8f2.png
+++ b/dist/static/img/21@2x.522f8f2.png
--- a/dist/static/img/22@2x.05162cf.png
+++ b/dist/static/img/22@2x.05162cf.png
--- a/dist/static/img/23@2x.4b97501.png
+++ b/dist/static/img/23@2x.4b97501.png
--- a/dist/static/img/24@2x.2b56974.png
+++ b/dist/static/img/24@2x.2b56974.png
--- a/dist/static/img/3.2707f7b.png
+++ b/dist/static/img/3.2707f7b.png
--- a/dist/static/img/3.449819e.png
+++ b/dist/static/img/3.449819e.png
--- a/dist/static/img/31.0e83cd6.jpg
+++ b/dist/static/img/31.0e83cd6.jpg
--- a/dist/static/img/4.0597407.png
+++ b/dist/static/img/4.0597407.png
--- a/dist/static/img/4.2ecd94a.png
+++ b/dist/static/img/4.2ecd94a.png
--- a/dist/static/img/4.65b6cb5.png
+++ b/dist/static/img/4.65b6cb5.png
--- a/dist/static/img/5.0e4a0a1.png
+++ b/dist/static/img/5.0e4a0a1.png
--- a/dist/static/img/6.f89794c.png
+++ b/dist/static/img/6.f89794c.png
--- a/dist/static/img/7.9ab9d04.png
+++ b/dist/static/img/7.9ab9d04.png
--- a/dist/static/img/8.bc958b4.gif
+++ b/dist/static/img/8.bc958b4.gif
--- a/dist/static/img/9.e278efa.png
+++ b/dist/static/img/9.e278efa.png
--- a/dist/static/img/Bitmap@2x.9762567.png
+++ b/dist/static/img/Bitmap@2x.9762567.png
--- a/dist/static/img/YEY-JXS.249efd8.png
+++ b/dist/static/img/YEY-JXS.249efd8.png
--- a/dist/static/img/actBg1.f48d135.png
+++ b/dist/static/img/actBg1.f48d135.png
--- a/dist/static/img/actBg2.b47e39b.png
+++ b/dist/static/img/actBg2.b47e39b.png
--- a/dist/static/img/actBg3.53dd5e6.png
+++ b/dist/static/img/actBg3.53dd5e6.png
--- a/dist/static/img/actBg4.74aadcc.png
+++ b/dist/static/img/actBg4.74aadcc.png
--- a/dist/static/img/authorLoading.39aaada.png
+++ b/dist/static/img/authorLoading.39aaada.png
--- a/dist/static/img/back.c3a0824.png
+++ b/dist/static/img/back.c3a0824.png
--- a/dist/static/img/banner1.60b9132.png
+++ b/dist/static/img/banner1.60b9132.png
--- a/dist/static/img/bg_coupon@2x.111f909.png
+++ b/dist/static/img/bg_coupon@2x.111f909.png
--- a/dist/static/img/bottom.b267e97.png
+++ b/dist/static/img/bottom.b267e97.png
--- a/dist/static/img/btn.9815b8e.png
+++ b/dist/static/img/btn.9815b8e.png
--- a/dist/static/img/btn_kechegn.ded8a66.png
+++ b/dist/static/img/btn_kechegn.ded8a66.png
--- a/dist/static/img/btncoin.1a04075.png
+++ b/dist/static/img/btncoin.1a04075.png
--- a/dist/static/img/btnfree.96c2f05.png
+++ b/dist/static/img/btnfree.96c2f05.png
--- a/dist/static/img/buyBg.0cdab59.png
+++ b/dist/static/img/buyBg.0cdab59.png
--- a/dist/static/img/changeOld.aa3007b.png
+++ b/dist/static/img/changeOld.aa3007b.png
--- a/dist/static/img/collectionless.c6a6b9a.png
+++ b/dist/static/img/collectionless.c6a6b9a.png
--- a/dist/static/img/diaBG.5949dd1.png
+++ b/dist/static/img/diaBG.5949dd1.png
--- a/dist/static/img/error.6b7c895.png
+++ b/dist/static/img/error.6b7c895.png
--- a/dist/static/img/finishStudy1.ef01583.png
+++ b/dist/static/img/finishStudy1.ef01583.png
--- a/dist/static/img/good.a5d9cb7.png
+++ b/dist/static/img/good.a5d9cb7.png
--- a/dist/static/img/great.7aedbfb.png
+++ b/dist/static/img/great.7aedbfb.png
--- a/dist/static/img/growth_record.52228d6.png
+++ b/dist/static/img/growth_record.52228d6.png
--- a/dist/static/img/headBg2.525e8cf.png
+++ b/dist/static/img/headBg2.525e8cf.png
--- a/dist/static/img/icon_back@3x.217f079.png
+++ b/dist/static/img/icon_back@3x.217f079.png
--- a/dist/static/img/icon_listen2@3x.5a8d42e.png
+++ b/dist/static/img/icon_listen2@3x.5a8d42e.png
--- a/dist/static/img/icon_look2@3x.5e1c968.png
+++ b/dist/static/img/icon_look2@3x.5e1c968.png
--- a/dist/static/img/icon_play2@3x.3a678f3.png
+++ b/dist/static/img/icon_play2@3x.3a678f3.png
--- a/dist/static/img/iconfont.86f5af5.svg
+++ b/dist/static/img/iconfont.86f5af5.svg
--- a/dist/static/img/img3@2x.a2144e2.png
+++ b/dist/static/img/img3@2x.a2144e2.png
--- a/dist/static/img/img4@2x.4cb6b5e.png
+++ b/dist/static/img/img4@2x.4cb6b5e.png
--- a/dist/static/img/img5@2x.e882530.png
+++ b/dist/static/img/img5@2x.e882530.png
--- a/dist/static/img/img6@2x.eb0d20f.png
+++ b/dist/static/img/img6@2x.eb0d20f.png
--- a/dist/static/img/img_0@2x.ec211b6.png
+++ b/dist/static/img/img_0@2x.ec211b6.png
--- a/dist/static/img/img_1@2x.7d7ffa6.png
+++ b/dist/static/img/img_1@2x.7d7ffa6.png
--- a/dist/static/img/img_2@2x.e58a09b.png
+++ b/dist/static/img/img_2@2x.e58a09b.png
--- a/dist/static/img/img_bg.e1ca973.png
+++ b/dist/static/img/img_bg.e1ca973.png
--- a/dist/static/img/img_bg@2x.59affd7.png
+++ b/dist/static/img/img_bg@2x.59affd7.png
--- a/dist/static/img/img_bgLY.849653e.png
+++ b/dist/static/img/img_bgLY.849653e.png
--- a/dist/static/img/img_bgw.3f13728.png
+++ b/dist/static/img/img_bgw.3f13728.png
--- a/dist/static/img/img_cc@2x.5d81c14.png
+++ b/dist/static/img/img_cc@2x.5d81c14.png
--- a/dist/static/img/img_code@2x.1542ef1.png
+++ b/dist/static/img/img_code@2x.1542ef1.png
--- a/dist/static/img/img_head@2x.40e57ed.png
+++ b/dist/static/img/img_head@2x.40e57ed.png
--- a/dist/static/img/img_lola@3x.6594b90.png
+++ b/dist/static/img/img_lola@3x.6594b90.png
--- a/dist/static/img/img_monkey@2x.854f8a2.png
+++ b/dist/static/img/img_monkey@2x.854f8a2.png
--- a/dist/static/img/img_pass@2x.96468a6.png
+++ b/dist/static/img/img_pass@2x.96468a6.png
--- a/dist/static/img/img_point@2x.4c03e07.png
+++ b/dist/static/img/img_point@2x.4c03e07.png
--- a/dist/static/img/img_title1.e6e13c0.png
+++ b/dist/static/img/img_title1.e6e13c0.png
--- a/dist/static/img/img_title2.9b32656.png
+++ b/dist/static/img/img_title2.9b32656.png
--- a/dist/static/img/img_title3.a5fc320.png
+++ b/dist/static/img/img_title3.a5fc320.png
--- a/dist/static/img/img_title4.20b8135.png
+++ b/dist/static/img/img_title4.20b8135.png
--- a/dist/static/img/img_title5.2b6f130.png
+++ b/dist/static/img/img_title5.2b6f130.png
--- a/dist/static/img/img_title6.e0dd387.png
+++ b/dist/static/img/img_title6.e0dd387.png
--- a/dist/static/img/imgguide2@2x.075052c.png
+++ b/dist/static/img/imgguide2@2x.075052c.png
--- a/dist/static/img/imgguide@2x.13192ef.png
+++ b/dist/static/img/imgguide@2x.13192ef.png
--- a/dist/static/img/imghh@2x.d05217f.png
+++ b/dist/static/img/imghh@2x.d05217f.png
--- a/dist/static/img/invite_list_title.7338e46.png
+++ b/dist/static/img/invite_list_title.7338e46.png
--- a/dist/static/img/light2@2x.7ac415b.png
+++ b/dist/static/img/light2@2x.7ac415b.png
--- a/dist/static/img/light@2x.1faf15e.png
+++ b/dist/static/img/light@2x.1faf15e.png
--- a/dist/static/img/listen.db8d0c9.png
+++ b/dist/static/img/listen.db8d0c9.png
--- a/dist/static/img/log.8c70e94.png
+++ b/dist/static/img/log.8c70e94.png
--- a/dist/static/img/logistics.2fb6e71.png
+++ b/dist/static/img/logistics.2fb6e71.png
--- a/dist/static/img/luoLacoming.565b7f9.png
+++ b/dist/static/img/luoLacoming.565b7f9.png
--- a/dist/static/img/luolalaila.1ba248b.png
+++ b/dist/static/img/luolalaila.1ba248b.png
--- a/dist/static/img/lydialog.c506201.png
+++ b/dist/static/img/lydialog.c506201.png
--- a/dist/static/img/mok4.4ffec77.png
+++ b/dist/static/img/mok4.4ffec77.png
--- a/dist/static/img/money.cfa7209.png
+++ b/dist/static/img/money.cfa7209.png
--- a/dist/static/img/more.72d57b0.png
+++ b/dist/static/img/more.72d57b0.png
--- a/dist/static/img/more.f7effc6.png
+++ b/dist/static/img/more.f7effc6.png
--- a/dist/static/img/nextUnit.f575be1.png
+++ b/dist/static/img/nextUnit.f575be1.png
--- a/dist/static/img/no.415cb0b.png
+++ b/dist/static/img/no.415cb0b.png
--- a/dist/static/img/no.4e27c3e.png
+++ b/dist/static/img/no.4e27c3e.png
--- a/dist/static/img/noFinishBg2.97a8ac8.png
+++ b/dist/static/img/noFinishBg2.97a8ac8.png
--- a/dist/static/img/noMoreLesson.fc3b237.png
+++ b/dist/static/img/noMoreLesson.fc3b237.png
--- a/dist/static/img/no_data.c31e3b2.png
+++ b/dist/static/img/no_data.c31e3b2.png
--- a/dist/static/img/null.b7da550.png
+++ b/dist/static/img/null.b7da550.png
--- a/dist/static/img/orderless.961cec0.png
+++ b/dist/static/img/orderless.961cec0.png
--- a/dist/static/img/perfect.87fdb94.png
+++ b/dist/static/img/perfect.87fdb94.png
--- a/dist/static/img/pic1.d8d6977.png
+++ b/dist/static/img/pic1.d8d6977.png
--- a/dist/static/img/pic10.4dbd2ce.png
+++ b/dist/static/img/pic10.4dbd2ce.png
--- a/dist/static/img/pic2.26689c8.png
+++ b/dist/static/img/pic2.26689c8.png
--- a/dist/static/img/pic3.25dd2f6.png
+++ b/dist/static/img/pic3.25dd2f6.png
--- a/dist/static/img/pic4.4dbd2ce.png
+++ b/dist/static/img/pic4.4dbd2ce.png
--- a/dist/static/img/pic5.25dd2f6.png
+++ b/dist/static/img/pic5.25dd2f6.png
--- a/dist/static/img/pic6.78f1824.png
+++ b/dist/static/img/pic6.78f1824.png
--- a/dist/static/img/pic7.6d0c296.png
+++ b/dist/static/img/pic7.6d0c296.png
--- a/dist/static/img/pic8.84ca8a4.png
+++ b/dist/static/img/pic8.84ca8a4.png
--- a/dist/static/img/pic9.9f907f4.png
+++ b/dist/static/img/pic9.9f907f4.png
--- a/dist/static/img/popup@2x.836999f.png
+++ b/dist/static/img/popup@2x.836999f.png
--- a/dist/static/img/popup_img@2x.afca647.png
+++ b/dist/static/img/popup_img@2x.afca647.png
--- a/dist/static/img/popup_img@2x.bcd9208.png
+++ b/dist/static/img/popup_img@2x.bcd9208.png
--- a/dist/static/img/preBtn.3d65909.png
+++ b/dist/static/img/preBtn.3d65909.png
--- a/dist/static/img/prize1.11e8615.png
+++ b/dist/static/img/prize1.11e8615.png
--- a/dist/static/img/prize2.58f05c6.png
+++ b/dist/static/img/prize2.58f05c6.png
--- a/dist/static/img/qr.f968b9d.png
+++ b/dist/static/img/qr.f968b9d.png
--- a/dist/static/img/qr3.b803088.png
+++ b/dist/static/img/qr3.b803088.png
--- a/dist/static/img/qr4.5eccb23.png
+++ b/dist/static/img/qr4.5eccb23.png
--- a/dist/static/img/radius.044c81a.png
+++ b/dist/static/img/radius.044c81a.png
--- a/dist/static/img/rankBg.4289b8f.png
+++ b/dist/static/img/rankBg.4289b8f.png
--- a/dist/static/img/record.e78cf41.png
+++ b/dist/static/img/record.e78cf41.png
--- a/dist/static/img/refBg.b9fd765.png
+++ b/dist/static/img/refBg.b9fd765.png
--- a/dist/static/img/refIcon.baa8203.png
+++ b/dist/static/img/refIcon.baa8203.png
--- a/dist/static/img/saleSuccess.6355462.png
+++ b/dist/static/img/saleSuccess.6355462.png
--- a/dist/static/img/shareGoodsBg6.2dbff28.png
+++ b/dist/static/img/shareGoodsBg6.2dbff28.png
--- a/dist/static/img/share_bg.03f118a.jpg
+++ b/dist/static/img/share_bg.03f118a.jpg
--- a/dist/static/img/star1.6f6031a.png
+++ b/dist/static/img/star1.6f6031a.png
--- a/dist/static/img/star3.cd9b3e0.png
+++ b/dist/static/img/star3.cd9b3e0.png
--- a/dist/static/img/teacher.bcc7eb8.png
+++ b/dist/static/img/teacher.bcc7eb8.png
--- a/dist/static/img/teacherBG.799eaf7.png
+++ b/dist/static/img/teacherBG.799eaf7.png
--- a/dist/static/img/tishi_timer.e54eea1.png
+++ b/dist/static/img/tishi_timer.e54eea1.png
--- a/dist/static/img/title1.664cce3.png
+++ b/dist/static/img/title1.664cce3.png
--- a/dist/static/img/weChatCode.82633f3.png
+++ b/dist/static/img/weChatCode.82633f3.png
--- a/dist/static/img/yujiBg.cceef25.png
+++ b/dist/static/img/yujiBg.cceef25.png
--- a/dist/static/js/1.f53806f46dd817ceba8f.js
+++ b/dist/static/js/1.f53806f46dd817ceba8f.js
--- a/dist/static/js/10.aa29c76198e3100d21a9.js
+++ b/dist/static/js/10.aa29c76198e3100d21a9.js
--- a/dist/static/js/11.5f40e786cd25222d019d.js
+++ b/dist/static/js/11.5f40e786cd25222d019d.js
--- a/dist/static/js/12.7c56dda7c2e60984ee3f.js
+++ b/dist/static/js/12.7c56dda7c2e60984ee3f.js
--- a/dist/static/js/13.c5d63b930c665db25b2b.js
+++ b/dist/static/js/13.c5d63b930c665db25b2b.js
--- a/dist/static/js/14.232f2676acafd7344f96.js
+++ b/dist/static/js/14.232f2676acafd7344f96.js
--- a/dist/static/js/15.af6196bf765141851a21.js
+++ b/dist/static/js/15.af6196bf765141851a21.js
--- a/dist/static/js/16.892b45ad702389c0fd76.js
+++ b/dist/static/js/16.892b45ad702389c0fd76.js
--- a/dist/static/js/17.2e597d6a3c52bd3e782a.js
+++ b/dist/static/js/17.2e597d6a3c52bd3e782a.js
--- a/dist/static/js/18.df3ad95a0ca2f3a42595.js
+++ b/dist/static/js/18.df3ad95a0ca2f3a42595.js
--- a/dist/static/js/19.5c0928f8df5c93d466d0.js
+++ b/dist/static/js/19.5c0928f8df5c93d466d0.js
--- a/dist/static/js/2.283b0b6aa561db8e3139.js
+++ b/dist/static/js/2.283b0b6aa561db8e3139.js
--- a/dist/static/js/20.3a35cb6a5b2956ae9988.js
+++ b/dist/static/js/20.3a35cb6a5b2956ae9988.js
--- a/dist/static/js/21.43171c466580bde644ac.js
+++ b/dist/static/js/21.43171c466580bde644ac.js
--- a/dist/static/js/22.27d399cfcbd640df9b75.js
+++ b/dist/static/js/22.27d399cfcbd640df9b75.js
--- a/dist/static/js/23.cec5bd18cb691949913e.js
+++ b/dist/static/js/23.cec5bd18cb691949913e.js
--- a/dist/static/js/24.549eeb0a889318a34e89.js
+++ b/dist/static/js/24.549eeb0a889318a34e89.js
--- a/dist/static/js/25.7c99189125c19acc26f4.js
+++ b/dist/static/js/25.7c99189125c19acc26f4.js
--- a/dist/static/js/26.e5dc82bb2fb5d9d80a64.js
+++ b/dist/static/js/26.e5dc82bb2fb5d9d80a64.js
--- a/dist/static/js/27.aa8bcc259c261c42bc64.js
+++ b/dist/static/js/27.aa8bcc259c261c42bc64.js
--- a/dist/static/js/28.b44fb0b66825cb1314c4.js
+++ b/dist/static/js/28.b44fb0b66825cb1314c4.js
--- a/dist/static/js/29.0171cd2ee7cefa6367d0.js
+++ b/dist/static/js/29.0171cd2ee7cefa6367d0.js
--- a/dist/static/js/3.53ccb07dfeebab55d7d6.js
+++ b/dist/static/js/3.53ccb07dfeebab55d7d6.js
--- a/dist/static/js/30.2d76bafc9a8f10d4dcd7.js
+++ b/dist/static/js/30.2d76bafc9a8f10d4dcd7.js
--- a/dist/static/js/31.a16f1b5b0060a17c8d97.js
+++ b/dist/static/js/31.a16f1b5b0060a17c8d97.js
--- a/dist/static/js/32.16d9dba190c3c5086aa0.js
+++ b/dist/static/js/32.16d9dba190c3c5086aa0.js
--- a/dist/static/js/33.b0ce5b3e12dd90e5a3eb.js
+++ b/dist/static/js/33.b0ce5b3e12dd90e5a3eb.js
--- a/dist/static/js/34.16e574bc18020497fc97.js
+++ b/dist/static/js/34.16e574bc18020497fc97.js
--- a/dist/static/js/35.2eb58a52893f5af76c28.js
+++ b/dist/static/js/35.2eb58a52893f5af76c28.js
--- a/dist/static/js/36.7e648057bd82046c2e6a.js
+++ b/dist/static/js/36.7e648057bd82046c2e6a.js
--- a/dist/static/js/37.e95841a62eb80746538d.js
+++ b/dist/static/js/37.e95841a62eb80746538d.js
--- a/dist/static/js/38.da4b5c6da73963c92098.js
+++ b/dist/static/js/38.da4b5c6da73963c92098.js
--- a/dist/static/js/39.886c3383b261524be947.js
+++ b/dist/static/js/39.886c3383b261524be947.js
--- a/dist/static/js/4.808896e3b1220854bb72.js
+++ b/dist/static/js/4.808896e3b1220854bb72.js
--- a/dist/static/js/40.8f00433fad50c14e080d.js
+++ b/dist/static/js/40.8f00433fad50c14e080d.js
--- a/dist/static/js/41.3b59527515857f0c374e.js
+++ b/dist/static/js/41.3b59527515857f0c374e.js
--- a/dist/static/js/42.acd8aa5bba9a0f76e3b8.js
+++ b/dist/static/js/42.acd8aa5bba9a0f76e3b8.js
--- a/dist/static/js/43.b8ec917c4cc6b362570c.js
+++ b/dist/static/js/43.b8ec917c4cc6b362570c.js
--- a/dist/static/js/44.16f49eade581755b4b34.js
+++ b/dist/static/js/44.16f49eade581755b4b34.js
--- a/dist/static/js/45.20d4e3e36a9e1e1c2c3c.js
+++ b/dist/static/js/45.20d4e3e36a9e1e1c2c3c.js
--- a/dist/static/js/46.3b7fd0a1ecb2fc51e486.js
+++ b/dist/static/js/46.3b7fd0a1ecb2fc51e486.js
--- a/dist/static/js/47.2ef3183cc5d1080c174f.js
+++ b/dist/static/js/47.2ef3183cc5d1080c174f.js
--- a/dist/static/js/48.05ed5b2227fd14e2f39e.js
+++ b/dist/static/js/48.05ed5b2227fd14e2f39e.js
--- a/dist/static/js/49.5a24ad6cf551e6322c37.js
+++ b/dist/static/js/49.5a24ad6cf551e6322c37.js
--- a/dist/static/js/5.ab375c2b58d1ab299482.js
+++ b/dist/static/js/5.ab375c2b58d1ab299482.js
--- a/dist/static/js/50.0e9be73ad67b1cc8793e.js
+++ b/dist/static/js/50.0e9be73ad67b1cc8793e.js
--- a/dist/static/js/51.329b1d56550b531d68c1.js
+++ b/dist/static/js/51.329b1d56550b531d68c1.js
--- a/dist/static/js/52.80b344889e2a9af8bb32.js
+++ b/dist/static/js/52.80b344889e2a9af8bb32.js
--- a/dist/static/js/53.b8ab0a3bd1ed80548260.js
+++ b/dist/static/js/53.b8ab0a3bd1ed80548260.js
--- a/dist/static/js/54.3eea4fb24a6735b03897.js
+++ b/dist/static/js/54.3eea4fb24a6735b03897.js
--- a/dist/static/js/55.eee5e26f247074851331.js
+++ b/dist/static/js/55.eee5e26f247074851331.js
--- a/dist/static/js/56.cad579b5e37cd637dd5c.js
+++ b/dist/static/js/56.cad579b5e37cd637dd5c.js
--- a/dist/static/js/57.c9895d4f61a09c5a2000.js
+++ b/dist/static/js/57.c9895d4f61a09c5a2000.js
--- a/dist/static/js/58.7ddf5316429fdc50782b.js
+++ b/dist/static/js/58.7ddf5316429fdc50782b.js
--- a/dist/static/js/59.6ac55acf2d545b7b4833.js
+++ b/dist/static/js/59.6ac55acf2d545b7b4833.js
--- a/dist/static/js/6.0469209cbb27a59e23ce.js
+++ b/dist/static/js/6.0469209cbb27a59e23ce.js
--- a/dist/static/js/60.8e7e8ca356cbce1d8011.js
+++ b/dist/static/js/60.8e7e8ca356cbce1d8011.js
--- a/dist/static/js/61.3e662846e7f6f0d0a4d3.js
+++ b/dist/static/js/61.3e662846e7f6f0d0a4d3.js
--- a/dist/static/js/62.f8ed8742b78575b29897.js
+++ b/dist/static/js/62.f8ed8742b78575b29897.js
--- a/dist/static/js/63.42c3ba75b86a3beb5560.js
+++ b/dist/static/js/63.42c3ba75b86a3beb5560.js
--- a/dist/static/js/64.a0e2b1698c7694702e3a.js
+++ b/dist/static/js/64.a0e2b1698c7694702e3a.js
--- a/dist/static/js/7.795f1cb6b1a2f0919751.js
+++ b/dist/static/js/7.795f1cb6b1a2f0919751.js
--- a/dist/static/js/8.d1cd3a78ff05762f5294.js
+++ b/dist/static/js/8.d1cd3a78ff05762f5294.js
--- a/dist/static/js/9.f3e7bb413aee1349f6c0.js
+++ b/dist/static/js/9.f3e7bb413aee1349f6c0.js
--- a/dist/static/js/app.bd4dd2ed15eb41f368b7.js
+++ b/dist/static/js/app.bd4dd2ed15eb41f368b7.js
--- a/dist/static/js/manifest.bd1ac30ea0aafae4a3d3.js
+++ b/dist/static/js/manifest.bd1ac30ea0aafae4a3d3.js
--- a/dist/static/js/vendor-async.3b3e86ee71e6fba3e458.js
+++ b/dist/static/js/vendor-async.3b3e86ee71e6fba3e458.js
--- a/dist/static/js/vendor.bb26eab6aed04b1826ae.js
+++ b/dist/static/js/vendor.bb26eab6aed04b1826ae.js
--- a/dist/static/media/good.75b1001.mp3
+++ b/dist/static/media/good.75b1001.mp3
--- a/dist/static/media/great.1f34f7f.mp3
+++ b/dist/static/media/great.1f34f7f.mp3
--- a/dist/static/media/perfect.2916884.mp3
+++ b/dist/static/media/perfect.2916884.mp3
--- a/dist/static/vconsole/vconsole.min.js
+++ b/dist/static/vconsole/vconsole.min.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/assets/evaluate/yinyin.png
+++ b/src/assets/evaluate/yinyin.png
--- a/src/components/buy/buy.vue
+++ b/src/components/buy/buy.vue
--- a/src/components/buy/index.vue
+++ b/src/components/buy/index.vue
--- a/src/components/buy/passShop.vue
+++ b/src/components/buy/passShop.vue
--- a/src/components/buy/spcShop.vue
+++ b/src/components/buy/spcShop.vue
--- a/src/components/map/index.vue
+++ b/src/components/map/index.vue
--- a/src/components/map/promptTime.vue
+++ b/src/components/map/promptTime.vue
--- a/src/components/newLesson/audio.vue
+++ b/src/components/newLesson/audio.vue
--- a/src/components/newLesson/evaluate.vue
+++ b/src/components/newLesson/evaluate.vue
--- a/src/components/newLesson/index.vue
+++ b/src/components/newLesson/index.vue
--- a/src/components/newLesson/share.vue
+++ b/src/components/newLesson/share.vue
--- a/src/components/newLesson/video.vue
+++ b/src/components/newLesson/video.vue
--- a/src/components/public/bottomTab.vue
+++ b/src/components/public/bottomTab.vue
--- a/src/main.js
+++ b/src/main.js
--- a/src/router/index.js
+++ b/src/router/index.js
--- a/src/service/api.js
+++ b/src/service/api.js
--- a/src/service/index.js
+++ b/src/service/index.js