Skip to content

H
h5-base
Commit 591fbfce authored by chenyishuai@singsingenglish.com's avatar chenyishuai@singsingenglish.com
Browse files
Options

Merge remote-tracking branch 'origin' into cys

parents 70b4be97 d3b59fe7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1784 additions and 1222 deletions
dev/index.html
View file @ 591fbfce
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
position: fixed; position: fixed;
background: #f4f4f4; background: #f4f4f4;
} }
/* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.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.334d27a411d3b60b62d5.js></script><script type=text/javascript src=static/js/vendor.79c3f4ae5c5bb7637f02.js></script><script type=text/javascript src=static/js/app.00137bea1c6b4f711984.js></script></body></html> /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.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.12dae166a003fc6c7b28.js></script><script type=text/javascript src=static/js/vendor.86cdf707c760a9063004.js></script><script type=text/javascript src=static/js/app.245df8b324d1a0ebe735.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/1.359c44159c3fa4f9e5ab.js deleted 100644 → 0
View file @ 70b4be97
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/1.94e04aa6238d72fa12af.js 0 → 100644
View file @ 591fbfce
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/5.22593d4841e1dcbfd231.js → dev/static/js/5.2ae19af118e99872d8c7.js
View file @ 591fbfce
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/app.00137bea1c6b4f711984.js → dev/static/js/app.245df8b324d1a0ebe735.js
View file @ 591fbfce
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.334d27a411d3b60b62d5.js → dev/static/js/manifest.12dae166a003fc6c7b28.js
View file @ 591fbfce
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var b,t,o,i=0,u=[];i<c.length;i++)t=c[i],d[t]&&u.push(d[t][0]),d[t]=0;for(b in n)Object.prototype.hasOwnProperty.call(n,b)&&(e[b]=n[b]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=f(f.s=r[i]);return o};var c={},d={52:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,f.nc&&r.setAttribute("nonce",f.nc),r.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"97a62935bf96273f674d",1:"359c44159c3fa4f9e5ab",2:"6a7a5c9644d9e62d7c6a",3:"42dd5125df8b4e1ab158",4:"4f923f4d1ed343ca21d2",5:"22593d4841e1dcbfd231",6:"87758a2455e2e614db38",7:"3415bb9581f597883f1d",8:"c47ed60a95a155b52924",9:"a0ffed9841f8230da3c6",10:"8ea016903e2c67188be6",11:"ec0cd3c0e468bc5aef7c",12:"1a01474c8d22846d815f",13:"d7315f11bdf5c38ea845",14:"8d98d6c4f9546c3e71d4",15:"f467cbd0766276e7ca91",16:"76388e01e74ce7a9c973",17:"c03926a6706106f687bc",18:"f7aebcd26d1359e69d1f",19:"8ba1a9d7c2c892ecdd33",20:"109f646a7537bb65965f",21:"65d9e14392488225b5b6",22:"16a5b7f980750dfc4f9f",23:"c5ff43170e408661632c",24:"9c55ca54630ab63d64a8",25:"065f2f2a6379194b4abf",26:"a1fd8dde8232cac99baa",27:"0634a2e33af51ae44b71",28:"1a66dbd5dab7637da167",29:"8c79842a926bce1d6b5c",30:"11eb2528c67f17a30818",31:"2b5da0bd8a450e556ccc",32:"9b841956d12c3814693d",33:"a1e40d51f0a7bbe0f6bd",34:"66e93ce422847ebef528",35:"a9e8913aa163a0e9a33c",36:"1a53055db508f6e7f695",37:"08d4b1deef3759b4c612",38:"6366efb3e7fa6fbd8e45",39:"3de3bed341623adc0904",40:"895e4da3bab675b0a78e",41:"2a295886cae89b21b058",42:"deb672cc9852b611a242",43:"e2654995557db9d4a9ce",44:"79cfbe6fdaa351b5b9db",45:"0e45eff76c8d5942017a",46:"450fd1d07b1acf24ed4d",47:"478f35a2ebb043bc986a",48:"bdb31144e2254843ea32",49:"6f70a5e57ca051fcb52a"}[e]+".js";var b=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(b);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=t,n.appendChild(r),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="",f.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,n,r){for(var b,t,o,i=0,u=[];i<c.length;i++)t=c[i],d[t]&&u.push(d[t][0]),d[t]=0;for(b in n)Object.prototype.hasOwnProperty.call(n,b)&&(e[b]=n[b]);for(a&&a(c,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)o=f(f.s=r[i]);return o};var c={},d={52:0};function f(a){if(c[a])return c[a].exports;var d=c[a]={i:a,l:!1,exports:{}};return e[a].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var a=d[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=d[e]=[c,f]});a[2]=c;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,f.nc&&r.setAttribute("nonce",f.nc),r.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"97a62935bf96273f674d",1:"94e04aa6238d72fa12af",2:"6a7a5c9644d9e62d7c6a",3:"42dd5125df8b4e1ab158",4:"4f923f4d1ed343ca21d2",5:"2ae19af118e99872d8c7",6:"87758a2455e2e614db38",7:"3415bb9581f597883f1d",8:"c47ed60a95a155b52924",9:"a0ffed9841f8230da3c6",10:"8ea016903e2c67188be6",11:"ec0cd3c0e468bc5aef7c",12:"1a01474c8d22846d815f",13:"d7315f11bdf5c38ea845",14:"8d98d6c4f9546c3e71d4",15:"f467cbd0766276e7ca91",16:"76388e01e74ce7a9c973",17:"c03926a6706106f687bc",18:"f7aebcd26d1359e69d1f",19:"8ba1a9d7c2c892ecdd33",20:"109f646a7537bb65965f",21:"65d9e14392488225b5b6",22:"16a5b7f980750dfc4f9f",23:"c5ff43170e408661632c",24:"9c55ca54630ab63d64a8",25:"065f2f2a6379194b4abf",26:"a1fd8dde8232cac99baa",27:"0634a2e33af51ae44b71",28:"1a66dbd5dab7637da167",29:"8c79842a926bce1d6b5c",30:"11eb2528c67f17a30818",31:"2b5da0bd8a450e556ccc",32:"9b841956d12c3814693d",33:"a1e40d51f0a7bbe0f6bd",34:"66e93ce422847ebef528",35:"a9e8913aa163a0e9a33c",36:"1a53055db508f6e7f695",37:"08d4b1deef3759b4c612",38:"6366efb3e7fa6fbd8e45",39:"3de3bed341623adc0904",40:"895e4da3bab675b0a78e",41:"2a295886cae89b21b058",42:"deb672cc9852b611a242",43:"e2654995557db9d4a9ce",44:"79cfbe6fdaa351b5b9db",45:"0e45eff76c8d5942017a",46:"450fd1d07b1acf24ed4d",47:"478f35a2ebb043bc986a",48:"bdb31144e2254843ea32",49:"6f70a5e57ca051fcb52a"}[e]+".js";var b=setTimeout(t,12e4);function t(){r.onerror=r.onload=null,clearTimeout(b);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=t,n.appendChild(r),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
dist/index.html
View file @ 591fbfce
<!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>*{ <!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; -webkit-overflow-scrolling:touch;
}</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.81e140d5b828125d42643407114d4591.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.717e14d6f6629042382a.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.b6c66b4167d0676277cd.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.4ccf3ac5d625ff41f2e7.js></script></body></html> }</style><link href=https://static-cdn.changchangenglish.com/new-sing/static/css/app.110c57ecdc59ccb19335e3a8f91e18d8.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.6ec2f42412f15068fcf7.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/vendor.b6c66b4167d0676277cd.js></script><script type=text/javascript src=https://static-cdn.changchangenglish.com/new-sing/static/js/app.50b2dfbdc7c21002bf82.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/1.1fc4778572958ab112d5.js deleted 100644 → 0
View file @ 70b4be97
This diff is collapsed.
dist/static/js/1.fb8f9714ba4ad6c870e5.js 0 → 100644
View file @ 591fbfce
This diff is collapsed.
dist/static/js/5.d3597fbc2027be7a93d7.js 0 → 100644
View file @ 591fbfce
This diff is collapsed.
dist/static/js/5.d8553e1c9193a0c95d15.js deleted 100644 → 0
View file @ 70b4be97
This diff is collapsed.
dist/static/js/manifest.717e14d6f6629042382a.js → dist/static/js/manifest.6ec2f42412f15068fcf7.js
View file @ 591fbfce
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,f){for(var t,r,o,i=0,u=[];i<a.length;i++)r=a[i],b[r]&&u.push(b[r][0]),b[r]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)o=d(d.s=f[i]);return o};var a={},b={52:0};function d(c){if(a[c])return a[c].exports;var b=a[c]={i:c,l:!1,exports:{}};return e[c].call(b.exports,b,b.exports,d),b.l=!0,b.exports}d.e=function(e){var c=b[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=b[e]=[a,d]});c[2]=a;var n=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,d.nc&&f.setAttribute("nonce",d.nc),f.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"2fa20798d066b1cea72b",1:"1fc4778572958ab112d5",2:"23b144e032bc5245abd8",3:"5f417e308e76d2fc3911",4:"d1fb50299929b8ee6683",5:"d8553e1c9193a0c95d15",6:"c8504054dbc12e818f5e",7:"5b75027b0b162c7bdc36",8:"5aba514bad251e877f3a",9:"283ec9817571c7b9006c",10:"293ef34965dc44436d9d",11:"5ecb0f06cfc2183ef4bd",12:"e0a6ff722a0e2862acd8",13:"d3f8643c1d8d9b66e28d",14:"143105452b5542558a8e",15:"20a404c7d9337478c025",16:"90418dce2ee1ac892331",17:"df73778d677be9fc393e",18:"3ed84ffb5951e69121b0",19:"46e0b45a01ec32a315ff",20:"22ad040fec0377856bb0",21:"ce31694fbab04df58224",22:"cc40027fd8d21b8d3c26",23:"ef475e7c4cc24628a450",24:"cbe861a4ebe93b22d442",25:"2cf12842fb4f431d1c84",26:"c15ae07cb171e418c2b0",27:"a3b486173053ad4632b0",28:"b7ec1750ddba111580bb",29:"be4e7a02d617d79cbbe5",30:"2a93def33e64bafeab7b",31:"8dd5d42b178d499db06d",32:"08be3382145cdbc14339",33:"7837ee7a13e505893094",34:"e329769368c315cc79bc",35:"da4ac9ae4f865bb68540",36:"1ba08c7371dde2313db5",37:"f52d969b4d2aa340fab4",38:"7e3b11e42fb6196248ad",39:"e947b897d4806c438987",40:"889d602bbf4b9ae8faeb",41:"fdd0f17abc4767b72612",42:"d566b54cb9bfe53fa803",43:"dfbd42ac5242caa493a6",44:"a3824929db3c049293b6",45:"6be877f55b130924d5d9",46:"cde3d62a1e83efb0f6d5",47:"5d10ea440b8ef173b682",48:"9448c421fdfa34f68899",49:"fd63451e9b915f12d63b"}[e]+".js";var t=setTimeout(r,12e4);function r(){f.onerror=f.onload=null,clearTimeout(t);var c=b[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),b[e]=void 0)}return f.onerror=f.onload=r,n.appendChild(f),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="https://static-cdn.changchangenglish.com/new-sing/",d.oe=function(e){throw e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,f,n){for(var t,r,o,i=0,u=[];i<a.length;i++)r=a[i],b[r]&&u.push(b[r][0]),b[r]=0;for(t in f)Object.prototype.hasOwnProperty.call(f,t)&&(e[t]=f[t]);for(c&&c(a,f,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},b={52:0};function d(c){if(a[c])return a[c].exports;var b=a[c]={i:c,l:!1,exports:{}};return e[c].call(b.exports,b,b.exports,d),b.l=!0,b.exports}d.e=function(e){var c=b[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=b[e]=[a,d]});c[2]=a;var f=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:"2fa20798d066b1cea72b",1:"fb8f9714ba4ad6c870e5",2:"23b144e032bc5245abd8",3:"5f417e308e76d2fc3911",4:"d1fb50299929b8ee6683",5:"d3597fbc2027be7a93d7",6:"c8504054dbc12e818f5e",7:"5b75027b0b162c7bdc36",8:"5aba514bad251e877f3a",9:"283ec9817571c7b9006c",10:"293ef34965dc44436d9d",11:"5ecb0f06cfc2183ef4bd",12:"e0a6ff722a0e2862acd8",13:"d3f8643c1d8d9b66e28d",14:"143105452b5542558a8e",15:"20a404c7d9337478c025",16:"90418dce2ee1ac892331",17:"df73778d677be9fc393e",18:"3ed84ffb5951e69121b0",19:"46e0b45a01ec32a315ff",20:"22ad040fec0377856bb0",21:"ce31694fbab04df58224",22:"cc40027fd8d21b8d3c26",23:"ef475e7c4cc24628a450",24:"cbe861a4ebe93b22d442",25:"2cf12842fb4f431d1c84",26:"c15ae07cb171e418c2b0",27:"a3b486173053ad4632b0",28:"b7ec1750ddba111580bb",29:"be4e7a02d617d79cbbe5",30:"2a93def33e64bafeab7b",31:"8dd5d42b178d499db06d",32:"08be3382145cdbc14339",33:"7837ee7a13e505893094",34:"e329769368c315cc79bc",35:"da4ac9ae4f865bb68540",36:"1ba08c7371dde2313db5",37:"f52d969b4d2aa340fab4",38:"7e3b11e42fb6196248ad",39:"e947b897d4806c438987",40:"889d602bbf4b9ae8faeb",41:"fdd0f17abc4767b72612",42:"d566b54cb9bfe53fa803",43:"dfbd42ac5242caa493a6",44:"a3824929db3c049293b6",45:"6be877f55b130924d5d9",46:"cde3d62a1e83efb0f6d5",47:"5d10ea440b8ef173b682",48:"9448c421fdfa34f68899",49:"fd63451e9b915f12d63b"}[e]+".js";var t=setTimeout(r,12e4);function r(){n.onerror=n.onload=null,clearTimeout(t);var c=b[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),b[e]=void 0)}return n.onerror=n.onload=r,f.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="https://static-cdn.changchangenglish.com/new-sing/",d.oe=function(e){throw e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/newLesson/audio.vue
View file @ 591fbfce
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/newLesson/index.vue
View file @ 591fbfce
...@@ -444,7 +444,7 @@ export default { ...@@ -444,7 +444,7 @@ export default {
this.minute = 1; this.minute = 1;
} }
// this.minute<1?1:1 // this.minute<1?1:1
if (this.minute <= 8) { if (this.minute < 8) {
if (this.minute < 5) { if (this.minute < 5) {
this.percent = 75 + Math.floor(49 * Math.random()) / 10; this.percent = 75 + Math.floor(49 * Math.random()) / 10;
} else { } else {
......
src/components/newLesson/share.vue
View file @ 591fbfce
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
<i class="iconfont icon-pengyouquan"></i>&nbsp;&nbsp; <i class="iconfont icon-pengyouquan"></i>&nbsp;&nbsp;
<span>分享到微信</span> <span>分享到微信</span>
</div> </div>
<audio ref="audioDom" id='audioDom' class="audio" :src="audioPoint"></audio>
</div> </div>
</div> </div>
<div class="share_close" @click="$emit('closeShare')">×</div> <div class="share_close" @click="$emit('closeShare')">×</div>
...@@ -85,7 +84,6 @@ import img_link from "../../assets/newLesson/img_link.png"; ...@@ -85,7 +84,6 @@ import img_link from "../../assets/newLesson/img_link.png";
import good from "../../assets/newLesson/good.png"; import good from "../../assets/newLesson/good.png";
import great from "../../assets/newLesson/great.png"; import great from "../../assets/newLesson/great.png";
import perfect from "../../assets/newLesson/perfect.png"; import perfect from "../../assets/newLesson/perfect.png";
import audioGood from "../../assets/udk.mp3";
import QRCode from "qrcodejs2"; import QRCode from "qrcodejs2";
import html2canvas from "html2canvas"; import html2canvas from "html2canvas";
import { import {
...@@ -117,7 +115,6 @@ export default { ...@@ -117,7 +115,6 @@ export default {
lesson: {}, lesson: {},
domTitle: "", domTitle: "",
imgPoint: good, imgPoint: good,
audioPoint: audioGood,
minute: "", minute: "",
percent: 0 percent: 0
}; };
...@@ -179,7 +176,7 @@ export default { ...@@ -179,7 +176,7 @@ export default {
this.minute = 1; this.minute = 1;
} }
// this.minute<1?1:1 // this.minute<1?1:1
if (this.minute <= 8) { if (this.minute < 8) {
this.imgPoint = good; this.imgPoint = good;
this.$store.dispatch('setLookStatus',0) this.$store.dispatch('setLookStatus',0)
if (this.minute < 5) { if (this.minute < 5) {
...@@ -533,7 +530,7 @@ export default { ...@@ -533,7 +530,7 @@ export default {
@tocurrentvh : 1/2 * @toVh; @tocurrentvh : 1/2 * @toVh;
.share-page { .share-page {
position: fixed; position: fixed;
background: url("https://cdn.singsingenglish.com/new-sing/3d68439b63b12ca0a389645a6666f37c8e01c08a.png"); background: url("https://cdn.singsingenglish.com/new-sing/6c6766b21eceef9ddf36597efe3cc152f46ac7f0.png");
background-size: 100%; background-size: 100%;
top: 0; top: 0;
left: 0; left: 0;
......
src/components/newLesson/shareGoods.vue
View file @ 591fbfce
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
.shareGoods { .shareGoods {
.share-page { .share-page {
position: fixed; position: fixed;
background: url("https://cdn.singsingenglish.com/new-sing/3d68439b63b12ca0a389645a6666f37c8e01c08a.png"); background: url("https://cdn.singsingenglish.com/new-sing/6c6766b21eceef9ddf36597efe3cc152f46ac7f0.png");
background-size: 100%; background-size: 100%;
top: 0; top: 0;
left: 0; left: 0;
...@@ -247,7 +247,7 @@ export default { ...@@ -247,7 +247,7 @@ export default {
.content { .content {
width: 100%; width: 100%;
height: (480-53) * @toVw; height: (480-53) * @toVw;
padding-top: 110 * @toVw; padding-top: 104 * @toVw;
// margin-top: 20*@toVw; // margin-top: 20*@toVw;
background-size: 100% 100%; background-size: 100% 100%;
position: relative; position: relative;
...@@ -294,7 +294,7 @@ export default { ...@@ -294,7 +294,7 @@ export default {
} }
} }
.main-text { .main-text {
padding-top: 50 * @toVw; padding-top: 48 * @toVw;
text-align: center; text-align: center;
margin: auto; margin: auto;
margin-bottom: 0; margin-bottom: 0;
...@@ -316,6 +316,7 @@ export default { ...@@ -316,6 +316,7 @@ export default {
span { span {
color: #ec7e1f; color: #ec7e1f;
font-size: 22 * @toVw; font-size: 22 * @toVw;
font-weight: bold;
} }
} }
} }
......
src/components/newLesson/video.vue
View file @ 591fbfce
...@@ -75,7 +75,9 @@ ...@@ -75,7 +75,9 @@
import sharePage from './share' import sharePage from './share'
import starBlock from './star' import starBlock from './star'
import {Popup} from 'mint-ui' import {Popup} from 'mint-ui'
import audioGood from "../../assets/udk.mp3"; import audioGood from "../../assets/good.mp3";
import audioGreat from "../../assets/great.mp3";
import audioPerfect from "../../assets/perfect.mp3";
export default { export default {
name: "play", name: "play",
components:{ components:{
...@@ -209,19 +211,21 @@ ...@@ -209,19 +211,21 @@
} }
}) })
setTimeout(() => { setTimeout(() => {
// console.log(this.$refs.sharePage,557) if (this.$store.state.lookStatus == 0) {
// this.$refs.sharePage.initPage() this.audioPoint = audioGood;
if(this.$store.state.lookStatus==0){ // console.log('good')
} else if (this.$store.state.lookStatus == 1) {
}else if(this.$store.state.lookStatus==1){ this.audioPoint = audioGreat;
// console.log('good2')
}else{ } else {
this.audioPoint = audioPerfect;
} // console.log('good3')
console.log(this.$store.state.lookStatus) }
this.$refs.audioDom.load() this.$refs.audioDom.load()
setTimeout(()=>{
this.$refs.audioDom.play() this.$refs.audioDom.play()
}, 700); },200)
}, 1000);
}, },
videoEnd(event){ videoEnd(event){
event.srcElement.play() event.srcElement.play()
......
src/main.js
View file @ 591fbfce
...@@ -40,9 +40,9 @@ Vue.component('scroll', scroll); ...@@ -40,9 +40,9 @@ Vue.component('scroll', scroll);
// Vue.prototype.$throw = (error)=> errorHandler(error,this); // Vue.prototype.$throw = (error)=> errorHandler(error,this);
/* eslint-disable no-new */ /* eslint-disable no-new */
// if (process.env.NODE_ENV != 'production') { if (process.env.NODE_ENV != 'production') {
// new VConsole(); new VConsole();
// } }
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
next() next()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment