4.17

201b77f8 · chenyishuai@singsingenglish.com · e6dd30da · 201b77f8 · 201b77f8 · 201b77f8
Commit 201b77f8 authored 6 years ago by chenyishuai@singsingenglish.com
17 changed files
--- a/dev/index.html
+++ b/dev/index.html
@@ -9,4 +9,4 @@
          overflow: hidden;
          position: fixed;
          background: #f4f4f4;
-        }</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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 type=text/javascript src=static/js/manifest.df3aa47267e6033f2024.js></script><script type=text/javascript src=static/js/vendor.177fb39100fe68ba14a9.js></script><script type=text/javascript src=static/js/app.8bc7ff9c8593dd5f66c8.js></script></body></html>
+        }</style><link href=static/css/app.f016ba765d8b5ed4f51f80904de686cd.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 type=text/javascript src=static/js/manifest.ca25e6281d8f82f341cb.js></script><script type=text/javascript src=static/js/vendor.177fb39100fe68ba14a9.js></script><script type=text/javascript src=static/js/app.8bc7ff9c8593dd5f66c8.js></script></body></html>
\ No newline at end of file
--- a/dev/static/img/qr3.b803088.png
+++ b/dev/static/img/qr3.b803088.png
--- a/dev/static/js/0.dcb052083f78b5261e5d.js
+++ b/dev/static/js/0.dcb052083f78b5261e5d.js
--- a/dev/static/js/7.2db75dc0d4b3d732468f.js
+++ b/dev/static/js/7.2db75dc0d4b3d732468f.js
--- a/dev/static/js/7.eef54a431ef3be2032aa.js
+++ b/dev/static/js/7.eef54a431ef3be2032aa.js
--- a/dev/static/js/manifest.df3aa47267e6033f2024.js
+++ b/dev/static/js/manifest.df3aa47267e6033f2024.js
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,o){for(var d,f,b,i=0,u=[];i<r.length;i++)f=r[i],c[f]&&u.push(c[f][0]),c[f]=0;for(d in a)Object.prototype.hasOwnProperty.call(a,d)&&(e[d]=a[d]);for(n&&n(r,a,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=t(t.s=o[i]);return b};var r={},c={34:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});n[2]=r;var a=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"static/js/"+e+"."+{0:"dcb052083f78b5261e5d",1:"cf672d22abe13040a43b",2:"b036dd58b5b725f0ac56",3:"0da9573c8217a6e99e22",4:"8d19764b7b091d80c1ec",5:"15e6321f83659388b49c",6:"780c5175e45975601a4a",7:"2db75dc0d4b3d732468f",8:"fb04f76f5dd8f75194dd",9:"b01748431da5fbd4b511",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"4b0a1b84f1b97c993e82",13:"43f421c3eb64a990eab2",14:"0c5e62e6b434c95d03ae",15:"721e5dd812c11289ca18",16:"569b3594fbf5cd7479c9",17:"a3d340dcb18e27484c72",18:"d0615a487639ae8d817c",19:"6788ece3a8027eb36940",20:"28f375e9437863460dc4",21:"e6473da59850e11e24e0",22:"64dc8df32f3b7ba02d49",23:"abd000c2d42590325658",24:"8d6d21dcd4761d5f6f66",25:"b31312e1d7a565236a43",26:"f688ad0a42f7f2456842",27:"a5e5e94083390ee9234f",28:"177b4274d387efdae1ff",29:"f11c8ca06a5b47020cee",30:"20b44b344574b2e0ec1f",31:"8f52eeaf0d104ac49249"}[e]+".js";var d=setTimeout(f,12e4);function f(){o.onerror=o.onload=null,clearTimeout(d);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return o.onerror=o.onload=f,a.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(n,t,o){for(var f,d,b,i=0,u=[];i<n.length;i++)d=n[i],r[d]&&u.push(r[d][0]),r[d]=0;for(f in t)Object.prototype.hasOwnProperty.call(t,f)&&(e[f]=t[f]);for(a&&a(n,t,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=c(c.s=o[i]);return b};var n={},r={34:0};function c(a){if(n[a])return n[a].exports;var r=n[a]={i:a,l:!1,exports:{}};return e[a].call(r.exports,r,r.exports,c),r.l=!0,r.exports}c.e=function(e){var a=r[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var n=new Promise(function(n,c){a=r[e]=[n,c]});a[2]=n;var t=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,c.nc&&o.setAttribute("nonce",c.nc),o.src=c.p+"static/js/"+e+"."+{0:"a2d8c1c2339842b2a6a7",1:"cf672d22abe13040a43b",2:"b036dd58b5b725f0ac56",3:"0da9573c8217a6e99e22",4:"8d19764b7b091d80c1ec",5:"15e6321f83659388b49c",6:"780c5175e45975601a4a",7:"eef54a431ef3be2032aa",8:"fb04f76f5dd8f75194dd",9:"b01748431da5fbd4b511",10:"e4900390e294708e603c",11:"08b648925597ca923e39",12:"4b0a1b84f1b97c993e82",13:"43f421c3eb64a990eab2",14:"0c5e62e6b434c95d03ae",15:"721e5dd812c11289ca18",16:"569b3594fbf5cd7479c9",17:"a3d340dcb18e27484c72",18:"d0615a487639ae8d817c",19:"6788ece3a8027eb36940",20:"28f375e9437863460dc4",21:"e6473da59850e11e24e0",22:"64dc8df32f3b7ba02d49",23:"abd000c2d42590325658",24:"8d6d21dcd4761d5f6f66",25:"b31312e1d7a565236a43",26:"f688ad0a42f7f2456842",27:"a5e5e94083390ee9234f",28:"177b4274d387efdae1ff",29:"f11c8ca06a5b47020cee",30:"20b44b344574b2e0ec1f",31:"8f52eeaf0d104ac49249"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var a=r[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return o.onerror=o.onload=d,t.appendChild(o),n},c.m=e,c.c=n,c.d=function(e,a,n){c.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:n})},c.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(a,"a",a),a},c.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},c.p="",c.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/index.html
+++ b/dist/index.html
@@ -3,4 +3,4 @@
    }
    .mint-toast{
      z-index: 10001 !important;
-    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.c222e5de93a8c42b33849ded6ab471bb.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.998e8af7927d9ea2b985.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.9225e4eb323e54ee2ec0.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.79ba8916bf3d47ae0cc0.js></script></body></html>
+    }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.c56a9c1588c52dfa59f294bee6f2232a.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.f85af9428bb8b1a11945.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.9225e4eb323e54ee2ec0.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.79ba8916bf3d47ae0cc0.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.c222e5de93a8c42b33849ded6ab471bb.css
+++ b/dist/static/css/app.c222e5de93a8c42b33849ded6ab471bb.css
--- a/dist/static/css/app.c56a9c1588c52dfa59f294bee6f2232a.css
+++ b/dist/static/css/app.c56a9c1588c52dfa59f294bee6f2232a.css
--- a/dist/static/img/qr3.b803088.png
+++ b/dist/static/img/qr3.b803088.png
--- a/dist/static/js/0.c56605a3247aade0edaa.js
+++ b/dist/static/js/0.c56605a3247aade0edaa.js
--- a/dist/static/js/7.8efd05e5e30c4e20e2e8.js
+++ b/dist/static/js/7.8efd05e5e30c4e20e2e8.js
--- a/dist/static/js/7.b4f91b255d1d6eedf4bd.js
+++ b/dist/static/js/7.b4f91b255d1d6eedf4bd.js
--- a/dist/static/js/manifest.998e8af7927d9ea2b985.js
+++ b/dist/static/js/manifest.998e8af7927d9ea2b985.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,r,f){for(var o,b,d,i=0,u=[];i<c.length;i++)b=c[i],n[b]&&u.push(n[b][0]),n[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(a&&a(c,r,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=t(t.s=f[i]);return d};var c={},n={34:0};function t(a){if(c[a])return c[a].exports;var n=c[a]={i:a,l:!1,exports:{}};return e[a].call(n.exports,n,n.exports,t),n.l=!0,n.exports}t.e=function(e){var a=n[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,t){a=n[e]=[c,t]});a[2]=c;var r=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"c56605a3247aade0edaa",1:"bfcadb843debb98f879f",2:"b6a9debb09ea4322241f",3:"1bb63230b4dc509cdb9d",4:"6f6e31d370e3d29797e3",5:"63d5aa4043ba5b1b7135",6:"7187a507e9cc893ca8c3",7:"8efd05e5e30c4e20e2e8",8:"8b4c89cc831bba629862",9:"cbc89f8d6c7d830db8ac",10:"dc700c8f0d6a33670d8e",11:"892271f82209639b4ee4",12:"50545fc8db8a460df1a4",13:"81a47382ba26d98f7613",14:"2c26fa40b30eb4f483b8",15:"f9fabe9d7c33c807d49f",16:"5f076be2b70b6005e660",17:"9104d2425308294a6b40",18:"c3607cb808f85736a754",19:"665e6a70fcb995c64139",20:"a2e49a0569502d539707",21:"3f31027b2bc9b31c23ef",22:"4a7559ab5ee24953c024",23:"fcfb09f1ef2071327d6f",24:"e7a209108feb7ac7e4fd",25:"a4171b744364febe6815",26:"c025a3aa800162853c8b",27:"776139f253dd23ce2dad",28:"5a15f27d39a6a897c24a",29:"b592a072a8ae796cf8c2",30:"a397cf568432cb83f2d5",31:"f89defb848384e201e3b"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var a=n[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=b,r.appendChild(f),c},t.m=e,t.c=c,t.d=function(e,a,c){t.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},t.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(a,"a",a),a},t.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},t.p="https://static-cdn.changchangenglish.com/new-sing/",t.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,f){for(var o,b,d,i=0,u=[];i<a.length;i++)b=a[i],n[b]&&u.push(n[b][0]),n[b]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=t(t.s=f[i]);return d};var a={},n={34:0};function t(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,t),n.l=!0,n.exports}t.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,t){c=n[e]=[a,t]});c[2]=a;var r=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"652e6f32353673cba717",1:"bfcadb843debb98f879f",2:"b6a9debb09ea4322241f",3:"1bb63230b4dc509cdb9d",4:"6f6e31d370e3d29797e3",5:"63d5aa4043ba5b1b7135",6:"7187a507e9cc893ca8c3",7:"b4f91b255d1d6eedf4bd",8:"8b4c89cc831bba629862",9:"cbc89f8d6c7d830db8ac",10:"dc700c8f0d6a33670d8e",11:"892271f82209639b4ee4",12:"50545fc8db8a460df1a4",13:"81a47382ba26d98f7613",14:"2c26fa40b30eb4f483b8",15:"f9fabe9d7c33c807d49f",16:"5f076be2b70b6005e660",17:"9104d2425308294a6b40",18:"c3607cb808f85736a754",19:"665e6a70fcb995c64139",20:"a2e49a0569502d539707",21:"3f31027b2bc9b31c23ef",22:"4a7559ab5ee24953c024",23:"fcfb09f1ef2071327d6f",24:"e7a209108feb7ac7e4fd",25:"a4171b744364febe6815",26:"c025a3aa800162853c8b",27:"776139f253dd23ce2dad",28:"5a15f27d39a6a897c24a",29:"b592a072a8ae796cf8c2",30:"a397cf568432cb83f2d5",31:"f89defb848384e201e3b"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=b,r.appendChild(f),a},t.m=e,t.c=a,t.d=function(e,c,a){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="https://static-cdn.changchangenglish.com/new-sing/",t.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/assets/shop/qr3.png
+++ b/src/assets/shop/qr3.png
--- a/src/components/collection/audio.vue
+++ b/src/components/collection/audio.vue
@@ -135,12 +135,14 @@
      },
      // 获取收藏状态
      checkCollect(){
-        let json ={
+        if(!this.sc){
-          url:this.showObj.audio[this.showObj.audioIndex].link
+            let json ={
-        };
+            url:this.showObj.audio[this.showObj.audioIndex].link
-        getUserCollectApi(json).then(res=>{
+          };
-          this.hasCollect = res.list.length<1? false : res.list[0].id
+          getUserCollectApi(json).then(res=>{
-        })
+            this.hasCollect = res.list.length<1? false : res.list[0].id
+          })
+        }
      },
      // 播放音频
      onPlay(){

--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -113,7 +113,7 @@
        </div>
      </div>
    </div>
-    <audio-page ref="audioPage" v-if="showObj.audio.length>0" sc="1" v-show="showObj.show" :showObj="showObj"/>
+    <audio-page ref="audioPage" v-if="showObj.audio.length>0"  sc="1" v-show="showObj.show" :showObj="showObj"/>
  </div>
  <bottom-tab ref="bottomTab"></bottom-tab>
 </scroll>
@@ -491,7 +491,7 @@ export default {
    display: flex;
    text-align: center;
    flex-wrap:wrap;
-    height: 210 * @toVw;
+    height: 212 * @toVw;
    overflow: hidden;
    .contentItem{
    width: 50%;
@@ -608,7 +608,7 @@ export default {
    background:url('../assets/index/index_icon_min.png') 0 -126 * @toVw ;background-size:100%;
  }
  .toTeacher{
-    background:url('../assets/index/index_icon_min.png') 0 -189 * @toVw ;background-size:100%;
+    background:url('../assets/index/index_icon_min.png') 0 -191 * @toVw ;background-size:100%;
  }
 }
 .lesson-block {
@@ -778,7 +778,7 @@ export default {
    display: flex;
    text-align: center;
    flex-wrap:wrap;
-    height: 297 * @toVw;
+    height: 299 * @toVw;
    // overflow: hidden;
    .contentItem{
    width: auto;