Skip to content

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

718

parent 7282a59b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 35 deletions
dev/index.html
View file @ 717e4a83
...@@ -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.0273453bedc40e640040.js></script><script type=text/javascript src=static/js/vendor.86cdf707c760a9063004.js></script><script type=text/javascript src=static/js/app.281d22e10c1119610022.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.41496eda6dd3b582f378.js></script><script type=text/javascript src=static/js/vendor.86cdf707c760a9063004.js></script><script type=text/javascript src=static/js/app.281d22e10c1119610022.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/1.5737087b3ae9c741d3f7.js 0 → 100644
View file @ 717e4a83
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/1.681a1f604457440058e4.js deleted 100644 → 0
View file @ 7282a59b
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/5.33e748e90b0c560003d8.js deleted 100644 → 0
View file @ 7282a59b
This diff is collapsed.
dev/static/js/5.71539ed391c91d07ea27.js 0 → 100644
View file @ 717e4a83
This diff is collapsed.
dev/static/js/manifest.0273453bedc40e640040.js → dev/static/js/manifest.41496eda6dd3b582f378.js
View file @ 717e4a83
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],d[o]&&u.push(d[o][0]),d[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=f(f.s=r[i]);return b};var a={},d={52:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;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:"73c582a895d0a677ee4c",1:"681a1f604457440058e4",2:"60ad16347a55b2828aaf",3:"b01d8303a343a188eef7",4:"dc6c7a5c57a4168ebfcd",5:"33e748e90b0c560003d8",6:"fd2048a132ac01c66f31",7:"660f5bdb4edd1edd55e7",8:"246c15970a33fcd2340a",9:"566fa20841acf546ebc0",10:"adbac4f8ecfca5372f98",11:"5ac6a531d2146fec6b2c",12:"5431d4abdf076fd48dc6",13:"7ed678425e44945ce745",14:"4559bb8bd2da436a3ccc",15:"2fd47e7098746126dd51",16:"e8b8fcc9fc62eae64aa2",17:"5acc332aae4a308d71ca",18:"29f05e573484644e060c",19:"3ed4f1f73cfcf27710c3",20:"de34326007c3cdc57f22",21:"76940178c9e4e01f512e",22:"63e1f714af326c0a9bcc",23:"cec5061721042431a6c0",24:"1cdbc6c7100258c26ff2",25:"d2f8bb35bf5209954d8f",26:"43eed8364ecef04590e9",27:"de979c212136daf772dc",28:"e8fa66475d1e1c1c3171",29:"578f1fef4f9d847ec8b1",30:"0ea1fd78fa42dd3a2c12",31:"c44f74d8095ba9e25e36",32:"694b0e152fb12db8269e",33:"f0856d7cc64d81213172",34:"2fa40589944c44a2eb07",35:"c22d714aed7faf6d9343",36:"f4d72bb60b163e7ef715",37:"5012ca41e831c1c176b0",38:"720de91a7cf10e3e3433",39:"66651d565a5dd3283804",40:"9f8ea2b13920eaeadfdb",41:"2a295886cae89b21b058",42:"b30b6ad88d137abd92e7",43:"e2654995557db9d4a9ce",44:"4123556f50856bd9e118",45:"901787a1116554737bd8",46:"9dcba50e768c736dfbd3",47:"6e40a75e3773b80dadf1",48:"d16d56cb114a7d7b001f",49:"49bc64a0b028e33c7dc0"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="",f.oe=function(e){throw console.error(e),e}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,b,i=0,u=[];i<a.length;i++)o=a[i],d[o]&&u.push(d[o][0]),d[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)b=f(f.s=r[i]);return b};var a={},d={52:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;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:"73c582a895d0a677ee4c",1:"5737087b3ae9c741d3f7",2:"60ad16347a55b2828aaf",3:"b01d8303a343a188eef7",4:"dc6c7a5c57a4168ebfcd",5:"71539ed391c91d07ea27",6:"fd2048a132ac01c66f31",7:"660f5bdb4edd1edd55e7",8:"246c15970a33fcd2340a",9:"566fa20841acf546ebc0",10:"adbac4f8ecfca5372f98",11:"5ac6a531d2146fec6b2c",12:"5431d4abdf076fd48dc6",13:"7ed678425e44945ce745",14:"4559bb8bd2da436a3ccc",15:"2fd47e7098746126dd51",16:"e8b8fcc9fc62eae64aa2",17:"5acc332aae4a308d71ca",18:"29f05e573484644e060c",19:"3ed4f1f73cfcf27710c3",20:"de34326007c3cdc57f22",21:"76940178c9e4e01f512e",22:"63e1f714af326c0a9bcc",23:"cec5061721042431a6c0",24:"1cdbc6c7100258c26ff2",25:"d2f8bb35bf5209954d8f",26:"43eed8364ecef04590e9",27:"de979c212136daf772dc",28:"e8fa66475d1e1c1c3171",29:"578f1fef4f9d847ec8b1",30:"0ea1fd78fa42dd3a2c12",31:"c44f74d8095ba9e25e36",32:"694b0e152fb12db8269e",33:"f0856d7cc64d81213172",34:"2fa40589944c44a2eb07",35:"c22d714aed7faf6d9343",36:"f4d72bb60b163e7ef715",37:"5012ca41e831c1c176b0",38:"720de91a7cf10e3e3433",39:"66651d565a5dd3283804",40:"9f8ea2b13920eaeadfdb",41:"2a295886cae89b21b058",42:"b30b6ad88d137abd92e7",43:"e2654995557db9d4a9ce",44:"4123556f50856bd9e118",45:"901787a1116554737bd8",46:"9dcba50e768c736dfbd3",47:"6e40a75e3773b80dadf1",48:"d16d56cb114a7d7b001f",49:"49bc64a0b028e33c7dc0"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/newLesson/share.vue
View file @ 717e4a83
...@@ -635,7 +635,7 @@ export default { ...@@ -635,7 +635,7 @@ export default {
opacity: 1; opacity: 1;
} }
} }
animation: pointMove 0.375s 1s ease; animation: pointMove 0.375s 0.5s ease;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
.topBox { .topBox {
......
src/components/newLesson/shareGoods.vue
View file @ 717e4a83
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div class="head-block"> <div class="head-block">
<img :src="userDetail.user_info.avatar" /> <img :src="userDetail.user_info.avatar" />
</div> </div>
<div class="content-title">{{userDetail.user_info.nickname}}家宝宝</div> <div class="content-title"><span class="ellipsisCss">{{userDetail.nickname}}</span> <span>家宝宝</span></div>
</div> </div>
<div class="main-text"> <div class="main-text">
<div v-if="objInfo" class="item"> <div v-if="objInfo" class="item">
...@@ -339,7 +339,7 @@ export default { ...@@ -339,7 +339,7 @@ export default {
} }
.content-title { .content-title {
width: 226 * @toVw; width: 226 * @toVw;
height: 54 * @toVw; // height: 54 * @toVw;
line-height: 26 * @toVw; line-height: 26 * @toVw;
margin-top: 40 * @toVw; margin-top: 40 * @toVw;
color: #55343a; color: #55343a;
...@@ -350,8 +350,15 @@ export default { ...@@ -350,8 +350,15 @@ export default {
position: absolute; position: absolute;
top: -14 * @toVw; top: -14 * @toVw;
color: white; color: white;
vertical-align: top;
display:flex;
justify-content: center;
// left: 50%; // left: 50%;
// margin-left: -112.5*@toVw; // margin-left: -112.5*@toVw;
span{margin: 0;}
.ellipsisCss{
max-width: 86 * @toVw;
}
} }
} }
.sing-content { .sing-content {
......
src/components/newLesson/video.vue
View file @ 717e4a83
...@@ -196,36 +196,52 @@ ...@@ -196,36 +196,52 @@
page_id:5, page_id:5,
stay_time:lookTime, stay_time:lookTime,
}; };
getUserWatchApi().then(res=>{ getUserWatchApi({category_id:query.category_id}).then(res => {
this.$store.dispatch('setWatchDetail',res) this.$store.dispatch("setWatchDetail", res);
subUserLessonApi(query.elementId,query.category_id,query.periods_id,json).then(res=>{ subUserLessonApi(
lessonDetail.total_watch_time = res.total_watch_time; query.elementId,
lessonDetail.nowTime = nowTime; query.category_id,
lessonDetail.star_num = res.total_star_num; query.periods_id,
localStorage.setItem('lessonDetail',JSON.stringify(lessonDetail)); json
}); ).then(res => {
if((Number(lookTime) + Number(lessonDetail.total_watch_time))/60 < 7){ lessonDetail.total_watch_time = res.total_watch_time;
this.popupVisible = true lessonDetail.nowTime = nowTime;
}else{ lessonDetail.star_num = res.total_star_num;
this.share_show = true localStorage.setItem("lessonDetail", JSON.stringify(lessonDetail));
} });
}) if (
setTimeout(() => { (Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60 <
if (this.$store.state.lookStatus == 0) { 7
this.audioPoint = audioGood; ) {
// console.log('good') this.popupVisible2 = true;
} else if (this.$store.state.lookStatus == 1) {
this.audioPoint = audioGreat;
// console.log('good2')
} else { } else {
this.audioPoint = audioPerfect; this.share_show = true;
// console.log('good3') }
});
if (
(Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60 <
7
) {
this.popupVisible2 = true;
} else {
this.share_show = true;
setTimeout(() => {
if (this.$store.state.lookStatus == 0) {
this.audioPoint = audioGood;
console.log('good')
} else if (this.$store.state.lookStatus == 1) {
this.audioPoint = audioGreat;
console.log('good2')
} else {
this.audioPoint = audioPerfect;
console.log('good3')
}
this.$refs.audioDom.load()
setTimeout(()=>{
this.$refs.audioDom.play()
},100)
}, 400);
} }
this.$refs.audioDom.load()
setTimeout(()=>{
this.$refs.audioDom.play()
},200)
}, 1000);
}, },
videoEnd(event){ videoEnd(event){
event.srcElement.play() event.srcElement.play()
......
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