830

35d634fe · chenyishuai@singsingenglish.com · 7157d48e · 35d634fe · 35d634fe · 35d634fe
Commit 35d634fe authored Aug 30, 2019 by chenyishuai@singsingenglish.com
101 changed files
--- a/dist/index.html
+++ b/dist/index.html
@@ -11,4 +11,4 @@
          position: fixed;
          background: #f4f4f4;
        }
-        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.bfe2ffe5fbfa94d6ac0d.js></script><script type=text/javascript src=static/js/vendor.eb2fd737d78619d0ba95.js></script><script type=text/javascript src=static/js/app.24135af5ae23dc5c7983.js></script></body></html>
+        /* html{font-size: 1px;} */</style><link href=static/css/app.f983055a19b69eb54137ee36031e8a72.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=static/js/manifest.f1edd11da06275f5fa0e.js></script><script type=text/javascript src=static/js/vendor.eb2fd737d78619d0ba95.js></script><script type=text/javascript src=static/js/app.acfbbc353d694ffa5e84.js></script></body></html>
\ No newline at end of file
--- a/dist/static/img/YEY-JXS.249efd8.png
+++ b/dist/static/img/YEY-JXS.249efd8.png
--- a/dist/static/img/iconfont.86f5af5.svg
+++ b/dist/static/img/iconfont.86f5af5.svg
--- a/dist/static/js/1.4c1a8edde132785079fc.js
+++ b/dist/static/js/1.4c1a8edde132785079fc.js
--- a/dist/static/js/1.d55742d251819268ba13.js
+++ b/dist/static/js/1.d55742d251819268ba13.js
--- a/dist/static/js/10.7dd1192ad4b0c54bef3a.js
+++ b/dist/static/js/10.7dd1192ad4b0c54bef3a.js
--- a/dist/static/js/11.0556a5823c14b994fbb1.js
+++ b/dist/static/js/11.0556a5823c14b994fbb1.js
--- a/dist/static/js/10.530d41babc1fd7c1335a.js
+++ b/dist/static/js/10.530d41babc1fd7c1335a.js
--- a/dist/static/js/12.b30358dfddccc1b89be4.js
+++ b/dist/static/js/12.b30358dfddccc1b89be4.js
--- a/dist/static/js/13.55b4b38cb8e119a8e79b.js
+++ b/dist/static/js/13.55b4b38cb8e119a8e79b.js
--- a/dist/static/js/13.801be20eded7f7d38178.js
+++ b/dist/static/js/13.801be20eded7f7d38178.js
--- a/dist/static/js/14.5fab46d1539e8d8e9959.js
+++ b/dist/static/js/14.5fab46d1539e8d8e9959.js
--- a/dist/static/js/14.651ace90f2c66f51b222.js
+++ b/dist/static/js/14.651ace90f2c66f51b222.js
--- a/dist/static/js/15.41137f00af00993decb9.js
+++ b/dist/static/js/15.41137f00af00993decb9.js
--- a/dist/static/js/16.5c2265f887b3c9324138.js
+++ b/dist/static/js/16.5c2265f887b3c9324138.js
--- a/dist/static/js/17.a56d89ca2bd39a482767.js
+++ b/dist/static/js/17.a56d89ca2bd39a482767.js
--- a/dist/static/js/18.cc354ef618b5421cbd5f.js
+++ b/dist/static/js/18.cc354ef618b5421cbd5f.js
--- a/dist/static/js/19.8aea9d608af5e12b6142.js
+++ b/dist/static/js/19.8aea9d608af5e12b6142.js
--- a/dist/static/js/19.8f7ac6f91049b9323083.js
+++ b/dist/static/js/19.8f7ac6f91049b9323083.js
--- a/dist/static/js/2.33fe458e1448acd1fd21.js
+++ b/dist/static/js/2.33fe458e1448acd1fd21.js
--- a/dist/static/js/20.6012d81032b10b43ed8d.js
+++ b/dist/static/js/20.6012d81032b10b43ed8d.js
--- a/dist/static/js/20.af9fff59ad6cc3a05593.js
+++ b/dist/static/js/20.af9fff59ad6cc3a05593.js
--- a/dist/static/js/21.5621092eec7c258defc6.js
+++ b/dist/static/js/21.5621092eec7c258defc6.js
--- a/dist/static/js/22.1ebfa20c526f78942607.js
+++ b/dist/static/js/22.1ebfa20c526f78942607.js
--- a/dist/static/js/23.2c3278e0cfe1f67c29d2.js
+++ b/dist/static/js/23.2c3278e0cfe1f67c29d2.js
--- a/dist/static/js/23.c9ca476f161685cfc1db.js
+++ b/dist/static/js/23.c9ca476f161685cfc1db.js
--- a/dist/static/js/24.a1773708f54cbbf224f1.js
+++ b/dist/static/js/24.a1773708f54cbbf224f1.js
--- a/dist/static/js/24.d28f421254641ee6240c.js
+++ b/dist/static/js/24.d28f421254641ee6240c.js
--- a/dist/static/js/25.2aec44292ca8a7f4d773.js
+++ b/dist/static/js/25.2aec44292ca8a7f4d773.js
--- a/dist/static/js/25.f33a553c7f03fe0e185c.js
+++ b/dist/static/js/25.f33a553c7f03fe0e185c.js
--- a/dist/static/js/26.ac15eb19f8f093191df4.js
+++ b/dist/static/js/26.ac15eb19f8f093191df4.js
--- a/dist/static/js/27.14417f0a63a4de5fdc1b.js
+++ b/dist/static/js/27.14417f0a63a4de5fdc1b.js
--- a/dist/static/js/27.e04c45694f9d21762895.js
+++ b/dist/static/js/27.e04c45694f9d21762895.js
--- a/dist/static/js/28.0b075a7b329adf675abf.js
+++ b/dist/static/js/28.0b075a7b329adf675abf.js
--- a/dist/static/js/28.6f7b7f5155c4787a2851.js
+++ b/dist/static/js/28.6f7b7f5155c4787a2851.js
--- a/dist/static/js/29.ef459a41885541e3dd8e.js
+++ b/dist/static/js/29.ef459a41885541e3dd8e.js
--- a/dist/static/js/3.bbe1f96578af6dd7040a.js
+++ b/dist/static/js/3.bbe1f96578af6dd7040a.js
--- a/dist/static/js/3.f46c13a22a6f8a245ada.js
+++ b/dist/static/js/3.f46c13a22a6f8a245ada.js
--- a/dist/static/js/30.06ff634be66201351594.js
+++ b/dist/static/js/30.06ff634be66201351594.js
--- a/dist/static/js/30.d74adf45dbec10f27eb2.js
+++ b/dist/static/js/30.d74adf45dbec10f27eb2.js
--- a/dist/static/js/31.f4fe8ea55019e6924aff.js
+++ b/dist/static/js/31.f4fe8ea55019e6924aff.js
--- a/dist/static/js/32.fa7b6412ca072e1ebfe0.js
+++ b/dist/static/js/32.fa7b6412ca072e1ebfe0.js
--- a/dist/static/js/33.7b5bfad56b18d8b44451.js
+++ b/dist/static/js/33.7b5bfad56b18d8b44451.js
--- a/dist/static/js/34.341a4b48665ec9b03d22.js
+++ b/dist/static/js/34.341a4b48665ec9b03d22.js
--- a/dist/static/js/35.3966639b92be12b7ea5a.js
+++ b/dist/static/js/35.3966639b92be12b7ea5a.js
--- a/dist/static/js/36.3c3d14d0a76b5162c49e.js
+++ b/dist/static/js/36.3c3d14d0a76b5162c49e.js
--- a/dist/static/js/37.37c42fd4c23237058fb0.js
+++ b/dist/static/js/37.37c42fd4c23237058fb0.js
--- a/dist/static/js/38.f8f7a9ef546f8effe33c.js
+++ b/dist/static/js/38.f8f7a9ef546f8effe33c.js
--- a/dist/static/js/39.848274da129aa46cedbc.js
+++ b/dist/static/js/39.848274da129aa46cedbc.js
--- a/dist/static/js/4.12e9fe37eeaae4f8b8cb.js
+++ b/dist/static/js/4.12e9fe37eeaae4f8b8cb.js
--- a/dist/static/js/4.7abba27d2b45f3d03305.js
+++ b/dist/static/js/4.7abba27d2b45f3d03305.js
--- a/dist/static/js/40.c5cdad7772a1b3ad4230.js
+++ b/dist/static/js/40.c5cdad7772a1b3ad4230.js
--- a/dist/static/js/41.2d0949e14872f28dcdd9.js
+++ b/dist/static/js/41.2d0949e14872f28dcdd9.js
--- a/dist/static/js/41.605eab102fe9c659799a.js
+++ b/dist/static/js/41.605eab102fe9c659799a.js
--- a/dist/static/js/42.941cd368f96cb7111912.js
+++ b/dist/static/js/42.941cd368f96cb7111912.js
--- a/dist/static/js/43.27e30cf99d39fd819675.js
+++ b/dist/static/js/43.27e30cf99d39fd819675.js
--- a/dist/static/js/44.efa1f1b9d8849ee32f50.js
+++ b/dist/static/js/44.efa1f1b9d8849ee32f50.js
--- a/dist/static/js/45.1f4a402b4326f303ec8b.js
+++ b/dist/static/js/45.1f4a402b4326f303ec8b.js
--- a/dist/static/js/45.ae23788a3abfa30255f3.js
+++ b/dist/static/js/45.ae23788a3abfa30255f3.js
--- a/dist/static/js/46.207d374165a872675d3c.js
+++ b/dist/static/js/46.207d374165a872675d3c.js
--- a/dist/static/js/47.b305c7c35355e9b0b765.js
+++ b/dist/static/js/47.b305c7c35355e9b0b765.js
--- a/dist/static/js/48.01e4fa38155cee98daeb.js
+++ b/dist/static/js/48.01e4fa38155cee98daeb.js
--- a/dist/static/js/48.2d4595abbd31a9d0a904.js
+++ b/dist/static/js/48.2d4595abbd31a9d0a904.js
--- a/dist/static/js/49.83d3afab7e4d587b2b18.js
+++ b/dist/static/js/49.83d3afab7e4d587b2b18.js
--- a/dist/static/js/49.b33693ea2bff8379ac0f.js
+++ b/dist/static/js/49.b33693ea2bff8379ac0f.js
--- a/dist/static/js/5.c6215b21b5899888b517.js
+++ b/dist/static/js/5.c6215b21b5899888b517.js
--- a/dist/static/js/5.dc1e143a809fb7bf0e37.js
+++ b/dist/static/js/5.dc1e143a809fb7bf0e37.js
--- a/dist/static/js/50.368f377afb72d20fd1c2.js
+++ b/dist/static/js/50.368f377afb72d20fd1c2.js
--- a/dist/static/js/51.3a5a1228206e82277caf.js
+++ b/dist/static/js/51.3a5a1228206e82277caf.js
-webpackJsonp([51],{RYpB:function(r,n,e){(r.exports=e("FZ+f")(!0)).push([r.i,"\n.error-page[data-v-ea0f4bb0] {\n  text-align: center;\n  padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n  width: 50%;\n  margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n  font-size: 24px;\n  color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n  font-size: 14px;\n  display: inline-block;\n  border: 1px solid #53b4ca;\n  color: #53b4ca;\n  padding: 5px;\n  border-radius: 4px;\n  margin-top: 20px;\n}\n","",{version:3,sources:["/Users/xiaxue/Desktop/wechat/src/components/error.vue"],names:[],mappings:";AACA;EACE,mBAAmB;EACnB,mBAAmB;CACpB;AACD;EACE,WAAW;EACX,oBAAoB;CACrB;AACD;EACE,gBAAgB;EAChB,YAAY;CACb;AACD;EACE,gBAAgB;EAChB,sBAAsB;EACtB,0BAA0B;EAC1B,eAAe;EACf,aAAa;EACb,mBAAmB;EACnB,iBAAiB;CAClB",file:"error.vue",sourcesContent:["\n.error-page[data-v-ea0f4bb0] {\n  text-align: center;\n  padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n  width: 50%;\n  margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n  font-size: 24px;\n  color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n  font-size: 14px;\n  display: inline-block;\n  border: 1px solid #53b4ca;\n  color: #53b4ca;\n  padding: 5px;\n  border-radius: 4px;\n  margin-top: 20px;\n}\n"],sourceRoot:""}])},Zazt:function(r,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var a=e("3xxH"),t=e.n(a),o={name:"error",data:function(){return{errorImageUrl:t.a}}},i=function(){var r=this,n=r.$createElement,e=r._self._c||n;return e("div",{staticClass:"error-page"},[e("img",{attrs:{src:r.errorImageUrl}}),r._v(" "),e("div",{staticClass:"error-text"},[r._v("\n    404! 很抱歉，页面未找到\n    "),e("br"),r._v(" "),e("div",{staticClass:"button",on:{click:function(n){r.$router.push({name:"index"})}}},[r._v("返回首页")])])])};i._withStripped=!0;var p={render:i,staticRenderFns:[]},s=p;var A=!1;var c=e("VU/8")(o,s,!1,function(r){A||e("zqTw")},"data-v-ea0f4bb0",null);c.options.__file="src/components/error.vue";n.default=c.exports},zqTw:function(r,n,e){var a=e("RYpB");"string"==typeof a&&(a=[[r.i,a,""]]),a.locals&&(r.exports=a.locals);e("rjj0")("0cf4c8e0",a,!1,{})}});
\ No newline at end of file
--- a/dist/static/js/51.f7c2e1f7805ae37942ae.js
+++ b/dist/static/js/51.f7c2e1f7805ae37942ae.js
--- a/dist/static/js/52.0fad6f580182e38666e0.js
+++ b/dist/static/js/52.0fad6f580182e38666e0.js
--- a/dist/static/js/53.35109140c011087b7f51.js
+++ b/dist/static/js/53.35109140c011087b7f51.js
--- a/dist/static/js/54.1f1351d3e2eb66870bc5.js
+++ b/dist/static/js/54.1f1351d3e2eb66870bc5.js
--- a/dist/static/js/54.4e3f88c3bb65b476dbda.js
+++ b/dist/static/js/54.4e3f88c3bb65b476dbda.js
--- a/dist/static/js/55.3fa9848bb6268b5c4ff9.js
+++ b/dist/static/js/55.3fa9848bb6268b5c4ff9.js
--- a/dist/static/js/56.850a2a72f5cac7b39e5b.js
+++ b/dist/static/js/56.850a2a72f5cac7b39e5b.js
--- a/dist/static/js/56.f345251f13c727cd616d.js
+++ b/dist/static/js/56.f345251f13c727cd616d.js
--- a/dist/static/js/57.042beeed8512cc841f8a.js
+++ b/dist/static/js/57.042beeed8512cc841f8a.js
--- a/dist/static/js/57.2c739f835f434ed8e5fd.js
+++ b/dist/static/js/57.2c739f835f434ed8e5fd.js
--- a/dist/static/js/58.00620b33295bce71b86b.js
+++ b/dist/static/js/58.00620b33295bce71b86b.js
--- a/dist/static/js/59.c873c2d68c70878cb1b0.js
+++ b/dist/static/js/59.c873c2d68c70878cb1b0.js
--- a/dist/static/js/6.45a7d7e06136213751a6.js
+++ b/dist/static/js/6.45a7d7e06136213751a6.js
--- a/dist/static/js/60.01b2c2f26198a31aacea.js
+++ b/dist/static/js/60.01b2c2f26198a31aacea.js
--- a/dist/static/js/61.bf72d655036a0e353ab4.js
+++ b/dist/static/js/61.bf72d655036a0e353ab4.js
--- a/dist/static/js/7.05a32025a8fddbc1baac.js
+++ b/dist/static/js/7.05a32025a8fddbc1baac.js
--- a/dist/static/js/7.76160a8bd5a73be91912.js
+++ b/dist/static/js/7.76160a8bd5a73be91912.js
--- a/dist/static/js/8.5be23dd820d0d59442b8.js
+++ b/dist/static/js/8.5be23dd820d0d59442b8.js
--- a/dist/static/js/8.dde231476764c6311485.js
+++ b/dist/static/js/8.dde231476764c6311485.js
--- a/dist/static/js/9.ea46092a1ef75ed2d4be.js
+++ b/dist/static/js/9.ea46092a1ef75ed2d4be.js
--- a/dist/static/js/9.ef8cfb54385b5b4a2e98.js
+++ b/dist/static/js/9.ef8cfb54385b5b4a2e98.js
--- a/dist/static/js/app.24135af5ae23dc5c7983.js
+++ b/dist/static/js/app.24135af5ae23dc5c7983.js
--- a/dist/static/js/manifest.bfe2ffe5fbfa94d6ac0d.js
+++ b/dist/static/js/manifest.bfe2ffe5fbfa94d6ac0d.js
--- a/dist/static/js/manifest.f1edd11da06275f5fa0e.js
+++ b/dist/static/js/manifest.f1edd11da06275f5fa0e.js
--- a/dist/static/js/vendor-async.a9c7c2e47356b0a20ea3.js
+++ b/dist/static/js/vendor-async.a9c7c2e47356b0a20ea3.js
--- a/src/assets/YEY-JXS.png
+++ b/src/assets/YEY-JXS.png
--- a/src/components/activity/extensionV1Shop.vue
+++ b/src/components/activity/extensionV1Shop.vue
--- a/src/components/buy/buy.vue
+++ b/src/components/buy/buy.vue
--- a/src/components/buy/saleSuccess.vue
+++ b/src/components/buy/saleSuccess.vue
@@ -36,8 +36,6 @@
        <!--</div>-->
      <!--</div>-->
    </div>
  </div>
 </template>

--- a/src/components/buy/success.vue
+++ b/src/components/buy/success.vue
--- a/src/components/newLesson/video.vue
+++ b/src/components/newLesson/video.vue
@@ -126,9 +126,9 @@
        <no-finish-dia />
      </div>
    </mt-popup>
-    <!--<div v-if="share_show">-->
+    <div v-if="share_show">
-      <!--<share-page @backList="backList()" @closeShare="closeShare()" :contentData="contentData" />-->
+      <share-page @backList="backList()" @closeShare="closeShare()" :contentData="contentData" />
-    <!--</div>-->
+    </div>
    <audio ref="audioDom" id="audioDom" class="audio" :src="audioPoint"></audio>
  </div>
 </template>
@@ -484,7 +484,7 @@ export default {
        : 1280;
      if (this.contentData.content.age && value === 2) {
        let video = [];
-        video = this.$common.deepCopy(this.contentData.content.video);
+        video = this.$common.deepCopy(this.contentData.content.video2);
        video.forEach(el => {
          let str = el.url;
          if (this.contentData.title == 2) {

--- a/src/router/index.js
+++ b/src/router/index.js