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

# Conflicts:
#	dist/index.html
#	dist/static/css/app.f8391ee1c16399fa4b9643e1b4e911d9.css
#	dist/static/js/1.d72fc5f437944f821059.js
#	dist/static/js/10.1c44a36e05524ee6a852.js
#	dist/static/js/11.55fd365c64fe555055eb.js
#	dist/static/js/12.c6e33a5ba0a1520d6758.js
#	dist/static/js/14.7e1f6ecd8342458ab429.js
#	dist/static/js/15.d206c28dee245623f7f7.js
#	dist/static/js/16.fbaedcbb21fbf724edef.js
#	dist/static/js/17.862530af8dbcf0a3c3f1.js
#	dist/static/js/18.68838b129cf486c1e9d9.js
#	dist/static/js/19.2318c04ee682994e7a70.js
#	dist/static/js/2.f4238a43f477c8f997f7.js
#	dist/static/js/20.bd513aa943ad6f278331.js
#	dist/static/js/21.d088d99e235f1837cb28.js
#	dist/static/js/23.3480ef1f360dc2f7941f.js
#	dist/static/js/26.1f744303f79d0549c35b.js
#	dist/static/js/27.a178f9849fed9e7f8e1c.js
#	dist/static/js/28.48b6bc9dba7bb171010d.js
#	dist/static/js/29.ccbcaaec2bf7df332b44.js
#	dist/static/js/3.0bdaaf6adb2b2b47c1a5.js
#	dist/static/js/30.dba3f74aedda2f6dd28c.js
#	dist/static/js/31.3b66afcace21f6c968b8.js
#	dist/static/js/32.16a9567f21831da43115.js
#	dist/static/js/33.3c091921da3d45c6048b.js
#	dist/static/js/34.d33f9404dc20881ef3f2.js
#	dist/static/js/35.f86979710a6f6cb2b435.js
#	dist/static/js/36.258bf2fe98b788b802b1.js
#	dist/static/js/37.72e06b2dd8fd2c92330b.js
#	dist/static/js/4.f03d8fe558c554582ec8.js
#	dist/static/js/40.20de8eeb6f7076866a11.js
#	dist/static/js/42.c07ce352a3e46a2967d2.js
#	dist/static/js/43.ee026bd8a841e657172b.js
#	dist/static/js/44.49625bd6a6ca8ec6e04c.js
#	dist/static/js/45.c4965532ac5d1958db1b.js
#	dist/static/js/46.db67d7da719531b56065.js
#	dist/static/js/47.b59bdec7b2facf009025.js
#	dist/static/js/48.9daa2e65ded04e44cf39.js
#	dist/static/js/49.a35a6c6f03fb3bdcfcca.js
#	dist/static/js/5.e710e8324d5b207be331.js
#	dist/static/js/50.2f86e015554ad09a36f7.js
#	dist/static/js/51.52ed313a1b5728839249.js
#	dist/static/js/53.a16b5479d7d7b90f3ff5.js
#	dist/static/js/54.73e8e061f944e012131d.js
#	dist/static/js/56.6836e2b8d913a5daa32b.js
#	dist/static/js/58.ce918692287232f2e076.js
#	dist/static/js/59.8495f768dcf2bb0a1607.js
#	dist/static/js/6.57410b457fe9f8549be1.js
#	dist/static/js/61.2095d18dc6c1f518a8c3.js
#	dist/static/js/63.369d180f6feb74e46ff6.js
#	dist/static/js/64.642dec71eb8f05963912.js
#	dist/static/js/7.0530d20d7374ed5ef1ef.js
#	dist/static/js/8.d26c40ae848ee02c92ba.js
#	dist/static/js/9.bee96636124c04562c9e.js
#	dist/static/js/vendor-async.c88056a05723e8c3ec8b.js
#	src/components/buy/index.vue
#	src/components/buy/passShop.vue
#	src/router/index.js

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

dist/static/cache/demo.appcache

-CACHE MANIFEST
-# 2010-06-18:v2
-CACHE:
-NETWORK:
-https://cdn.singsingenglish.com/
-FALLBACK:

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.

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