Merge remote-tracking branch 'origin/pre'

# Conflicts: # dist/index.html # dist/static/js/1.34176ac8a792689cd932.js # dist/static/js/43.bf05df515e54c7432a05.js # dist/static/js/5.5306a5ba25986ba0e61b.js # dist/static/js/manifest.311dfe20a7551192c44c.js

Merge remote-tracking branch 'origin/pre'
# Conflicts: # dist/index.html # dist/static/js/1.34176ac8a792689cd932.js # dist/static/js/43.bf05df515e54c7432a05.js # dist/static/js/5.5306a5ba25986ba0e61b.js # dist/static/js/manifest.311dfe20a7551192c44c.js
d2fdfab5 · IvyXia123 · d3905b06 · 24800ee8 · d2fdfab5 · d2fdfab5
Commit d2fdfab5 authored Sep 02, 2019 by IvyXia123
11 changed files
--- 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.86101cb0751238b3653c9c1c347c0a50.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.ff8303eb80abc623e9b9.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.e84e767fc6c67e88fef6.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.9bf17ad280f41dce7c81.js></script></body></html>
\ No newline at end of file
+<!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><script>// setSize();
+    //   addEventListener('resize',setSize);
+    //   function setSize() {
+    //       document.documentElement.style.fontSize = document.documentElement.clientWidth/375*10+'px';
+    //   }</script><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
+        -webkit-overflow-scrolling: touch
+      }
+      .wrapper {
+          height: 100vh;
+          overflow: hidden;
+          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.311dfe20a7551192c44c.js></script><script type=text/javascript src=static/js/vendor.eb2fd737d78619d0ba95.js></script><script type=text/javascript src=static/js/app.84c20d6727d53f64092c.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/1.34176ac8a792689cd932.js
+++ b/dist/static/js/1.34176ac8a792689cd932.js
--- a/dist/static/js/20.57063498d3f5f08ccc6d.js
+++ b/dist/static/js/20.57063498d3f5f08ccc6d.js
--- a/dist/static/js/43.bf05df515e54c7432a05.js
+++ b/dist/static/js/43.bf05df515e54c7432a05.js
--- a/dist/static/js/5.5306a5ba25986ba0e61b.js
+++ b/dist/static/js/5.5306a5ba25986ba0e61b.js
--- a/dist/static/js/manifest.311dfe20a7551192c44c.js
+++ b/dist/static/js/manifest.311dfe20a7551192c44c.js
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={64:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"78d248f24ee84ccfea64",1:"34176ac8a792689cd932",2:"aa6329edd741532bf257",3:"6c3676e8302b74647cbc",4:"12e9fe37eeaae4f8b8cb",5:"5306a5ba25986ba0e61b",6:"c7cc7df111d85cf27b9b",7:"05a32025a8fddbc1baac",8:"f06355b665053b1c66f2",9:"ea46092a1ef75ed2d4be",10:"7dd1192ad4b0c54bef3a",11:"8b4344f93be3dded5361",12:"3b4cd03528e061c10fe8",13:"b6d54705a7b03cc1a838",14:"5fab46d1539e8d8e9959",15:"f83fd7b1ec3a97f7bd66",16:"e3ef0f940227e40197fc",17:"e6e189589a552b9582ca",18:"a336f5a7427aea7acb7c",19:"8aea9d608af5e12b6142",20:"57063498d3f5f08ccc6d",21:"fd833b8ab6cb1e0d074f",22:"701a6ee38479b163f602",23:"c9ca476f161685cfc1db",24:"d28f421254641ee6240c",25:"2aec44292ca8a7f4d773",26:"90f95355f4999c507466",27:"14417f0a63a4de5fdc1b",28:"6f7b7f5155c4787a2851",29:"e166012c7d68e0230f85",30:"9c6bb1825ab060559e3f",31:"1e3c8e63235db66879e5",32:"d494177aad804ca9e139",33:"40a36e635ab23245496b",34:"481cee4e3407f0772555",35:"049b75b06f616c4d7687",36:"33fd9443eca7186bd78a",37:"387a0f6c39e912c0e844",38:"ff10a183065778d51989",39:"4d13253138f0ad098b23",40:"df490584d5524e769a1f",41:"2d0949e14872f28dcdd9",42:"a3c5303233bcbf5f410b",43:"bf05df515e54c7432a05",44:"608c71c8f4606b62f58c",45:"a625e09d364bb0d7bb48",46:"07776e73dd61e71cd1f8",47:"e452231169befbf8cac2",48:"694f9bf593948955ab45",49:"f7d490d29da167056272",50:"e94f0be889244f07f898",51:"732aed7b4e578e2d6db7",52:"d6c0c0d0881755cc8506",53:"b9df3f2ebc42036f2cb0",54:"0df892b5de7b0d2a58af",55:"3c9b49aa5f568bd28272",56:"850a2a72f5cac7b39e5b",57:"2c739f835f434ed8e5fd",58:"1988cd306d0e500569a0",59:"3c45272d31ebf496d04e",60:"97ba1fb09d6b41ec9fd2",61:"626a3506faee124c08d4"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/buy/buySuccess.vue
+++ b/src/components/buy/buySuccess.vue
@@ -124,6 +124,7 @@ export default {
          this.goods_id = res.goods_id;
          this.invite_code = `CC-${res.invite_type}-${res.invite_id}`;
          this.money = res.money;
+          Toast.clear()
        });
      }
    },

--- a/src/components/buy/index.vue
+++ b/src/components/buy/index.vue
@@ -231,6 +231,7 @@ import couponBtn from "../../assets/activity/btn@2x.png";
 import couponBg from "../../assets/activity/popup@2x.png";
 import closeImg from "../../assets/activity/close.png";
 import couponTip from "../../assets/activity/popup_btn.png";
+import common from '../../util/common';
 export default {
  name: "index",
  components: {
@@ -486,6 +487,7 @@ export default {
          res.desc = JSON.parse(res.desc);
          res.goods_desc = JSON.parse(res.goods_desc);
          res.share_desc = JSON.parse(res.share_desc);
+          sessionStorage.setItem("groupDetail", JSON.stringify(common.deepCopy(res)));
          //商品下架跳转绑定商品
          if (res.status === 2 && res.bind_goods_id) {
            this.$router.push({

--- a/src/components/newLesson/audio.vue
+++ b/src/components/newLesson/audio.vue
@@ -398,9 +398,14 @@ export default {
          elementID: this.$route.query.elementId.toString()
        });
      }
-      this.$nextTick(()=>{
+      setTimeout(()=>{
        this.$refs.audio.play();
-      })
+      },100)
+      // this.$refs.audio.play();
+      // this.$nextTick(()=>{
+      //   // console.log(this.$refs.audio)
+      //   this.$refs.audio.play();
+      // })
    },
    // 播放暂停
    onStop(flag) {

--- a/src/components/public/audioPlay.vue
+++ b/src/components/public/audioPlay.vue
--- a/src/components/star/index.vue
+++ b/src/components/star/index.vue
@@ -49,7 +49,6 @@
        </div>
      </div>
    </mt-popup>
-
    <div v-if="share_show" class="share-show-block" @click="share_show=false">
      <div class="share-show-content">
        <img :src="dataURL" class="cvs-img" id="cvs-img"/>