821

0dc2a6f5 · chenyishuai@singsingenglish.com · 9fb65460 · 0dc2a6f5 · 0dc2a6f5 · 9fb65460
Commit 0dc2a6f5 authored Aug 21, 2019 by chenyishuai@singsingenglish.com
53 changed files
--- a/dev/index.html
+++ b/dev/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.a850d2ea40e867de0dab.js></script><script type=text/javascript src=static/js/vendor.663f75af2b00b67ec3df.js></script><script type=text/javascript src=static/js/app.8f6560625186e520f106.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.5196e7fc5ec4d0c012c9.js></script><script type=text/javascript src=static/js/vendor.1c91ad85f3414fba0b70.js></script><script type=text/javascript src=static/js/app.f7a49cdfe616cc6b32e5.js></script></body></html>
\ No newline at end of file
--- a/dev/static/img/logistics.2fb6e71.png
+++ b/dev/static/img/logistics.2fb6e71.png
--- a/dev/static/js/1.7200342ead45acf70b10.js
+++ b/dev/static/js/1.7200342ead45acf70b10.js
--- a/dev/static/js/1.d045705520fa741dfd8e.js
+++ b/dev/static/js/1.d045705520fa741dfd8e.js
--- a/dev/static/js/10.7fd5c57dd574c8f736c8.js
+++ b/dev/static/js/10.7fd5c57dd574c8f736c8.js
--- a/dev/static/js/12.29d4e254331b68a40b6e.js
+++ b/dev/static/js/12.29d4e254331b68a40b6e.js
--- a/dev/static/js/11.de0e66901f19e1147d1f.js
+++ b/dev/static/js/11.de0e66901f19e1147d1f.js
--- a/dev/static/js/13.b4fe7f99d2c2ed6a372e.js
+++ b/dev/static/js/13.b4fe7f99d2c2ed6a372e.js
--- a/dev/static/js/14.36115e920818c86f1f21.js
+++ b/dev/static/js/14.36115e920818c86f1f21.js
--- a/dev/static/js/15.03f4aba03ed8fc6cb881.js
+++ b/dev/static/js/15.03f4aba03ed8fc6cb881.js
--- a/dev/static/js/16.28ce44bb5996a6283eb1.js
+++ b/dev/static/js/16.28ce44bb5996a6283eb1.js
--- a/dev/static/js/15.5999c669c7683322b645.js
+++ b/dev/static/js/15.5999c669c7683322b645.js
--- a/dev/static/js/16.b62ad2697f3f08923a44.js
+++ b/dev/static/js/16.b62ad2697f3f08923a44.js
--- a/dev/static/js/18.78d8cd25830c6e391e27.js
+++ b/dev/static/js/18.78d8cd25830c6e391e27.js
--- a/dev/static/js/17.2cb36daa06d87cdaeaa6.js
+++ b/dev/static/js/17.2cb36daa06d87cdaeaa6.js
--- a/dev/static/js/19.d4cd5cc9481615a7deb7.js
+++ b/dev/static/js/19.d4cd5cc9481615a7deb7.js
--- a/dev/static/js/20.f10edb28d5d5149b6606.js
+++ b/dev/static/js/20.f10edb28d5d5149b6606.js
--- a/dev/static/js/3.9f02fc1faf0a1fbf95af.js
+++ b/dev/static/js/3.9f02fc1faf0a1fbf95af.js
--- a/dev/static/js/2.9859eaa581afb98936e4.js
+++ b/dev/static/js/2.9859eaa581afb98936e4.js
--- a/dev/static/js/21.fd833b8ab6cb1e0d074f.js
+++ b/dev/static/js/21.fd833b8ab6cb1e0d074f.js
--- a/dev/static/js/22.3bbd94d9569706546e39.js
+++ b/dev/static/js/22.3bbd94d9569706546e39.js
--- a/dev/static/js/23.d74b186d816de689cb6b.js
+++ b/dev/static/js/23.d74b186d816de689cb6b.js
--- a/dev/static/js/24.d6614767b1493b95d094.js
+++ b/dev/static/js/24.d6614767b1493b95d094.js
--- a/dev/static/js/25.ceadc65421bc71eec057.js
+++ b/dev/static/js/25.ceadc65421bc71eec057.js
--- a/dev/static/js/26.1e8c70cb8b1bc09ed077.js
+++ b/dev/static/js/26.1e8c70cb8b1bc09ed077.js
--- a/dev/static/js/27.41fd66120a1f44be6279.js
+++ b/dev/static/js/27.41fd66120a1f44be6279.js
--- a/dev/static/js/28.b300398f39cd3b6efc82.js
+++ b/dev/static/js/28.b300398f39cd3b6efc82.js
--- a/dev/static/js/28.5cfea4429424809132ab.js
+++ b/dev/static/js/28.5cfea4429424809132ab.js
--- a/dev/static/js/5.9c282fc7510b39d27016.js
+++ b/dev/static/js/5.9c282fc7510b39d27016.js
--- a/dev/static/js/37.44b16184b92dd6988c17.js
+++ b/dev/static/js/37.44b16184b92dd6988c17.js
--- a/dev/static/js/37.39ab4bb9b0425dbbe349.js
+++ b/dev/static/js/37.39ab4bb9b0425dbbe349.js
--- a/dev/static/js/38.b5e81f01bd1453d77842.js
+++ b/dev/static/js/38.b5e81f01bd1453d77842.js
--- a/dev/static/js/6.0783a600305203da8d1b.js
+++ b/dev/static/js/6.0783a600305203da8d1b.js
--- a/dev/static/js/4.cab924a809fda91479c3.js
+++ b/dev/static/js/4.cab924a809fda91479c3.js
--- a/dev/static/js/7.faa4c6076af35d87cf33.js
+++ b/dev/static/js/7.faa4c6076af35d87cf33.js
--- a/dev/static/js/8.10026a3a42f21209e723.js
+++ b/dev/static/js/8.10026a3a42f21209e723.js
--- a/dev/static/js/7.0ec2c7111259c029e334.js
+++ b/dev/static/js/7.0ec2c7111259c029e334.js
--- a/dev/static/js/8.6a45e9b15d9d2e7b24f4.js
+++ b/dev/static/js/8.6a45e9b15d9d2e7b24f4.js
--- a/dev/static/js/9.3281fa22baf0d67ef788.js
+++ b/dev/static/js/9.3281fa22baf0d67ef788.js
--- a/dev/static/js/9.c6fd2f0aa09bfa7e2342.js
+++ b/dev/static/js/9.c6fd2f0aa09bfa7e2342.js
--- a/dev/static/js/app.8f6560625186e520f106.js
+++ b/dev/static/js/app.8f6560625186e520f106.js
--- a/dev/static/js/app.b29259f53f232f5e1a8f.js
+++ b/dev/static/js/app.b29259f53f232f5e1a8f.js
--- a/dev/static/js/app.f7a49cdfe616cc6b32e5.js
+++ b/dev/static/js/app.f7a49cdfe616cc6b32e5.js
--- a/dev/static/js/manifest.a850d2ea40e867de0dab.js
+++ b/dev/static/js/manifest.a850d2ea40e867de0dab.js
--- a/dev/static/js/vendor-async.f15287bdc3553004b56c.js
+++ b/dev/static/js/vendor-async.f15287bdc3553004b56c.js
--- a/dev/static/js/vendor.0ef71eb4855840152163.js
+++ b/dev/static/js/vendor.0ef71eb4855840152163.js
--- a/dev/static/js/vendor.663f75af2b00b67ec3df.js
+++ b/dev/static/js/vendor.663f75af2b00b67ec3df.js
--- a/src/components/buy/index.vue
+++ b/src/components/buy/index.vue
@@ -312,8 +312,6 @@ export default {
    closeCouponPop() {
      this.couponPopup = false;
      this.closeStatus = true;
-      // this.refIcon =
-      // this.
    },
    goToBuyPage(type) {
      this.buyType = type

--- a/src/components/buy/success.vue
+++ b/src/components/buy/success.vue
@@ -126,7 +126,7 @@ import {
 import shareUrl from "../../assets/Bitmap@2x.png";
 import icon_change from "../../assets/newLesson/icon_change@2x.png";
 import { Popup } from "mint-ui";
-import {addEmoji} from "@/util/wechatEmoji";
+// import {addEmoji} from "@/util/wechatEmoji";
 export default {
  name: "success",
@@ -210,7 +210,7 @@ export default {
 [机智]快来和我一起拼团上课吧`;
        this.textIndex = 1;
      }
-      this.htmlContent = addEmoji(this.textContent);
+      // this.htmlContent = addEmoji(this.textContent);
      // this.$copyText(this.textContent).then(e => {
      //   Toast("复制成功");
      // });
@@ -370,7 +370,7 @@ export default {
 [爱心]${this.groupDetail.desc.group_number}人即可成团获得课程
 [强]哈佛名师亲授，比动画片更有趣哦
 [机智]快来和我一起拼团上课吧`;
-        this.htmlContent = addEmoji(this.textContent);
+        // this.htmlContent = addEmoji(this.textContent);
        this.onShare();
      });
    },

--- a/src/components/index.vue
+++ b/src/components/index.vue
--- a/src/components/newLesson/video.vue
+++ b/src/components/newLesson/video.vue
@@ -476,9 +476,7 @@ export default {
        : 1280;
      if (this.contentData.content.age && value === 2) {
        let video = [];
-        this.contentData.content.video2.forEach((el, index) => {
+        video = this.$common.deepCopy(this.contentData.content.video)
-          video[index] = JSON.parse(JSON.stringify(el));
-        });
        video.forEach(el => {
          let str = el.url;
          if (this.contentData.title == 2) {
@@ -491,9 +489,7 @@ export default {
        };
      } else {
        let video = [];
-        this.contentData.content.video.forEach((el, index) => {
+        video = this.$common.deepCopy(this.contentData.content.video)
-          video[index] = JSON.parse(JSON.stringify(el));
-        });
        video.forEach(el => {
          let str = el.url;
          if (this.contentData.title == 2) {

--- a/src/main.js
+++ b/src/main.js
@@ -4,6 +4,7 @@ import Vue from 'vue'
 import App from './App'
 import router from './router'
 import store from './store'
+import common from './util/common'
 // import MintUI from 'mint-ui'
 import VueClipboard from 'vue-clipboard2'
 import sa from 'sa-sdk-javascript';
@@ -37,6 +38,7 @@ const errorHandler = (error, vm)=>{
 }
 Vue.config.errorHandler = errorHandler;
 Vue.prototype.$throw = (error)=> errorHandler(error,this);
+Vue.prototype.$common = common
 // if (process.env.NODE_ENV != 'production') {
 //   new VConsole();
 // }

--- a/src/util/common.js
+++ b/src/util/common.js