Skip to content

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

814

parent 685cd369
Show whitespace changes
Inline Side-by-side
Showing with 137 additions and 133 deletions
dev/index.html
View file @ c0c4e13b
...@@ -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.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.21b83da9c5e17f7d4121.js></script><script type=text/javascript src=static/js/vendor.27f02851ee69967777eb.js></script><script type=text/javascript src=static/js/app.8066ab7f2fffe7f421c6.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.6500bf507de919182c0e.js></script><script type=text/javascript src=static/js/vendor.27f02851ee69967777eb.js></script><script type=text/javascript src=static/js/app.8066ab7f2fffe7f421c6.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dev/static/js/1.b2a116780f6ea9a25c95.js deleted 100644 → 0
View file @ 685cd369
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/1.b2d397654c1b920896f7.js 0 → 100644
View file @ c0c4e13b
This source diff could not be displayed because it is too large. You can view the blob instead.
dev/static/js/manifest.21b83da9c5e17f7d4121.js → dev/static/js/manifest.6500bf507de919182c0e.js
View file @ c0c4e13b
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,b,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(c,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},d={59: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 b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"450b115d3c329aa2c0d1",1:"b2a116780f6ea9a25c95",2:"066d6174c3c9a691eaa9",3:"46e4130e2d19316f59fb",4:"e7472ee3fdd30df5c4ab",5:"b6df00df4dcb9e2ec9be",6:"61700a27ce5813cf15df",7:"e693574a01be2e2c06d9",8:"42f80e729b6010e2e9b3",9:"08ee562f51a489d20519",10:"71f6e9a0f2df08b0c272",11:"9aea05a9b3666afbf568",12:"d57e82b1592dec4c9382",13:"34cae2d1adf30c2035de",14:"0dbc59c71380b7cbd527",15:"24137f33ac09917e16b7",16:"fc5a441530f8dbcc2641",17:"240e81ae1a7a304eba76",18:"d4b50a6780356ce0bd5a",19:"d25201144269c66aea78",20:"d03f48a9610b137b4e0f",21:"39e2276099413d90e461",22:"982c17d60fc9e4ef1e06",23:"5b5c94111e2f5948175f",24:"62f0cd5963b95494b554",25:"d39dc4835d15b0cbccbe",26:"8824fe67fb3cfc7ce862",27:"c5de7c036edbe4171e44",28:"7b7736a6c2ac9d5b0532",29:"065ac0eb9f1c5854d593",30:"536e00702218e6b382d4",31:"07f3edec3d8d9b94909b",32:"94ddd814e9b03e928a6d",33:"90d93b69c2146ab91efa",34:"d8b20acde13b9343b4b4",35:"e687ce5aa45e5398b2a2",36:"d50f044e40cd82b84381",37:"b4162ff2e52bf265d69d",38:"5f8113bd2d6a3d98d119",39:"d8a581861c65a73f7806",40:"29e1a633f13f512f41bb",41:"f577377fa26565b6e497",42:"458aea196a564b934cf0",43:"d8594ec21c4db71e2f2d",44:"14f4da810aceafa9112d",45:"88830d27a04d9cbc5a5a",46:"bf13cdf26d1a09c99b8f",47:"2f3f73870935b573d252",48:"d7b5c61b8025fa7b0f32",49:"8b1e708c45fd912337d1",50:"355843aa8c0752f8e8af",51:"72b25239de77d37de87b",52:"40a1f33a814d036e7df7",53:"bfb7dc072560eeb3dda3",54:"d800c5652be3fc4d9bda",55:"ac7b0db38926a5dbe1a4",56:"ca2e696f111a5fec1012"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=d[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),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 c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[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=f(f.s=n[i]);return o};var a={},d={59: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 b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"450b115d3c329aa2c0d1",1:"b2d397654c1b920896f7",2:"066d6174c3c9a691eaa9",3:"46e4130e2d19316f59fb",4:"e7472ee3fdd30df5c4ab",5:"b6df00df4dcb9e2ec9be",6:"61700a27ce5813cf15df",7:"e693574a01be2e2c06d9",8:"42f80e729b6010e2e9b3",9:"08ee562f51a489d20519",10:"71f6e9a0f2df08b0c272",11:"9aea05a9b3666afbf568",12:"d57e82b1592dec4c9382",13:"34cae2d1adf30c2035de",14:"0dbc59c71380b7cbd527",15:"24137f33ac09917e16b7",16:"fc5a441530f8dbcc2641",17:"240e81ae1a7a304eba76",18:"d4b50a6780356ce0bd5a",19:"d25201144269c66aea78",20:"d03f48a9610b137b4e0f",21:"39e2276099413d90e461",22:"982c17d60fc9e4ef1e06",23:"5b5c94111e2f5948175f",24:"62f0cd5963b95494b554",25:"d39dc4835d15b0cbccbe",26:"8824fe67fb3cfc7ce862",27:"c5de7c036edbe4171e44",28:"7b7736a6c2ac9d5b0532",29:"065ac0eb9f1c5854d593",30:"536e00702218e6b382d4",31:"07f3edec3d8d9b94909b",32:"94ddd814e9b03e928a6d",33:"90d93b69c2146ab91efa",34:"d8b20acde13b9343b4b4",35:"e687ce5aa45e5398b2a2",36:"d50f044e40cd82b84381",37:"b4162ff2e52bf265d69d",38:"5f8113bd2d6a3d98d119",39:"d8a581861c65a73f7806",40:"29e1a633f13f512f41bb",41:"f577377fa26565b6e497",42:"458aea196a564b934cf0",43:"d8594ec21c4db71e2f2d",44:"14f4da810aceafa9112d",45:"88830d27a04d9cbc5a5a",46:"bf13cdf26d1a09c99b8f",47:"2f3f73870935b573d252",48:"d7b5c61b8025fa7b0f32",49:"8b1e708c45fd912337d1",50:"355843aa8c0752f8e8af",51:"72b25239de77d37de87b",52:"40a1f33a814d036e7df7",53:"bfb7dc072560eeb3dda3",54:"d800c5652be3fc4d9bda",55:"ac7b0db38926a5dbe1a4",56:"ca2e696f111a5fec1012"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),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/audio.vue
View file @ c0c4e13b
...@@ -79,12 +79,12 @@ ...@@ -79,12 +79,12 @@
</div> </div>
</div> </div>
<i <i
v-if="!hasCollect&&userCourse.periods_list" v-if="!hasCollect"
class="iconfont icon-icon_like collect" class="iconfont icon-icon_like collect"
@click="changeCollect" @click="changeCollect"
></i> ></i>
<i <i
v-if="hasCollect&&userCourse.periods_list" v-if="hasCollect"
class="iconfont icon-icon_like1 collect" class="iconfont icon-icon_like1 collect"
@click="changeCollect" @click="changeCollect"
></i> ></i>
......
src/components/newLesson/share.vue
View file @ c0c4e13b
...@@ -383,7 +383,7 @@ export default { ...@@ -383,7 +383,7 @@ export default {
}); });
} }
}); });
}, 1200); }, 2200);
}, },
enableShare: function(option) { enableShare: function(option) {
let query = JSON.parse(sessionStorage.getItem("classQuery")); let query = JSON.parse(sessionStorage.getItem("classQuery"));
...@@ -409,66 +409,66 @@ export default { ...@@ -409,66 +409,66 @@ export default {
option.shareIcon || option.shareIcon ||
"https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png", // 分享图标 "https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png", // 分享图标
success: function() { success: function() {
setTimeout(() => { // setTimeout(() => {
that.$sa.track("watchClick", { // that.$sa.track("watchClick", {
dayModule: JSON.parse( // dayModule: JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
).domTitle.slice(0, 9), // ).domTitle.slice(0, 9),
weekName: JSON.parse( // weekName: JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
).domTitle.slice( // ).domTitle.slice(
10, // 10,
JSON.parse(localStorage.getItem("lessonDetail")).domTitle // JSON.parse(localStorage.getItem("lessonDetail")).domTitle
.length // .length
), // ),
elementName: // elementName:
JSON.parse( // JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
).domTitle.slice(0, 9) + // ).domTitle.slice(0, 9) +
"-" + // "-" +
JSON.parse( // JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
).domTitle.slice( // ).domTitle.slice(
10, // 10,
JSON.parse(localStorage.getItem("lessonDetail")).domTitle // JSON.parse(localStorage.getItem("lessonDetail")).domTitle
.length // .length
), // ),
themeID: JSON.parse(localStorage.getItem("lessonDetail")) // themeID: JSON.parse(localStorage.getItem("lessonDetail"))
.themeID, // .themeID,
themeName: JSON.parse(localStorage.getItem("lessonDetail")) // themeName: JSON.parse(localStorage.getItem("lessonDetail"))
.themeName, // .themeName,
goodsID: JSON.parse(localStorage.getItem("lessonDetail")) // goodsID: JSON.parse(localStorage.getItem("lessonDetail"))
.goodsID, // .goodsID,
classID: JSON.parse(localStorage.getItem("lessonDetail")) // classID: JSON.parse(localStorage.getItem("lessonDetail"))
.classID, // .classID,
buttonName: "完成分享", // buttonName: "完成分享",
partName: that.contentData.partName, // partName: that.contentData.partName,
elementID: query.elementId.toString() // elementID: query.elementId.toString()
}); // });
let lessonDetail = JSON.parse( // let lessonDetail = JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
); // );
let nowTime = Date.parse(new Date()); // let nowTime = Date.parse(new Date());
let json = { // let json = {
page_type: 0, // page_type: 0,
page_id: 4, // page_id: 4,
stay_time: 0 // stay_time: 0
}; // };
subUserLessonApi( // subUserLessonApi(
query.elementId, // query.elementId,
query.category_id, // query.category_id,
query.periods_id, // query.periods_id,
json // json
).then(res => { // ).then(res => {
lessonDetail.total_watch_time = res; // lessonDetail.total_watch_time = res;
lessonDetail.nowTime = nowTime; // lessonDetail.nowTime = nowTime;
localStorage.setItem( // localStorage.setItem(
"lessonDetail", // "lessonDetail",
JSON.stringify(lessonDetail) // JSON.stringify(lessonDetail)
); // );
}); // });
that.$emit("backList"); // that.$emit("backList");
}, 500); // }, 500);
}, },
cancel: function() { cancel: function() {
that.$sa.track("watchClick", { that.$sa.track("watchClick", {
...@@ -517,64 +517,64 @@ export default { ...@@ -517,64 +517,64 @@ export default {
option.shareIcon || option.shareIcon ||
"https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png", // 分享图标 "https://cdn.singsingenglish.com/singsing/recommend/logo-refer.png", // 分享图标
success: function() { success: function() {
that.$sa.track("watchClick", { // that.$sa.track("watchClick", {
dayModule: JSON.parse( // dayModule: JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
).domTitle.slice(0, 9), // ).domTitle.slice(0, 9),
weekName: JSON.parse( // weekName: JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
).domTitle.slice( // ).domTitle.slice(
10, // 10,
JSON.parse(localStorage.getItem("lessonDetail")).domTitle // JSON.parse(localStorage.getItem("lessonDetail")).domTitle
.length // .length
), // ),
elementName: // elementName:
JSON.parse( // JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
).domTitle.slice(0, 9) + // ).domTitle.slice(0, 9) +
"-" + // "-" +
JSON.parse( // JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
).domTitle.slice( // ).domTitle.slice(
10, // 10,
JSON.parse(localStorage.getItem("lessonDetail")).domTitle // JSON.parse(localStorage.getItem("lessonDetail")).domTitle
.length // .length
), // ),
themeID: JSON.parse(localStorage.getItem("lessonDetail")) // themeID: JSON.parse(localStorage.getItem("lessonDetail"))
.themeID, // .themeID,
themeName: JSON.parse(localStorage.getItem("lessonDetail")) // themeName: JSON.parse(localStorage.getItem("lessonDetail"))
.themeName, // .themeName,
goodsID: JSON.parse(localStorage.getItem("lessonDetail")) // goodsID: JSON.parse(localStorage.getItem("lessonDetail"))
.goodsID, // .goodsID,
classID: JSON.parse(localStorage.getItem("lessonDetail")) // classID: JSON.parse(localStorage.getItem("lessonDetail"))
.classID, // .classID,
buttonName: "完成分享", // buttonName: "完成分享",
partName: that.contentData.partName, // partName: that.contentData.partName,
elementID: query.elementId.toString() // elementID: query.elementId.toString()
}); // });
let lessonDetail = JSON.parse( // let lessonDetail = JSON.parse(
localStorage.getItem("lessonDetail") // localStorage.getItem("lessonDetail")
); // );
let nowTime = Date.parse(new Date()); // let nowTime = Date.parse(new Date());
let json = { // let json = {
page_type: 0, // page_type: 0,
page_id: 4, // page_id: 4,
stay_time: 0 // stay_time: 0
}; // };
subUserLessonApi( // subUserLessonApi(
query.elementId, // query.elementId,
query.category_id, // query.category_id,
query.periods_id, // query.periods_id,
json // json
).then(res => { // ).then(res => {
lessonDetail.total_watch_time = res; // lessonDetail.total_watch_time = res;
lessonDetail.nowTime = nowTime; // lessonDetail.nowTime = nowTime;
localStorage.setItem( // localStorage.setItem(
"lessonDetail", // "lessonDetail",
JSON.stringify(lessonDetail) // JSON.stringify(lessonDetail)
); // );
}); // });
that.$emit("backList"); // that.$emit("backList");
}, },
cancel: function() { cancel: function() {
that.$sa.track("watchClick", { that.$sa.track("watchClick", {
...@@ -702,7 +702,7 @@ export default { ...@@ -702,7 +702,7 @@ export default {
} }
.imgTip { .imgTip {
position: fixed; position: fixed;
top: 515 * @toVw; top: 511 * @toVw;
left: 91 * @toVw; left: 91 * @toVw;
z-index: 1301; z-index: 1301;
width: 190 * @toVw; width: 190 * @toVw;
......
src/components/newLesson/video.vue
View file @ c0c4e13b
...@@ -48,13 +48,9 @@ ...@@ -48,13 +48,9 @@
<video <video
ref="videoDom" ref="videoDom"
:src="showObj.video[videoIndex].url" :src="showObj.video[videoIndex].url"
@click="activity"
@ended="videoEnd" @ended="videoEnd"
@play="videoPlay()" @play="videoPlay()"
x-webkit-airplay="true"
x5-playsinline="true"
x5-video-player-fullscreen="false"
webkit-playsinline="true"
playsinline="true"
controlslist="nodownload" controlslist="nodownload"
controls controls
:poster="showObj.video[videoIndex].url+'?vframe/jpg/offset/3'" :poster="showObj.video[videoIndex].url+'?vframe/jpg/offset/3'"
...@@ -73,7 +69,7 @@ ...@@ -73,7 +69,7 @@
<div @click="changeClarity(540)" :class="{select:clarityType=='540'}">流畅</div> <div @click="changeClarity(540)" :class="{select:clarityType=='540'}">流畅</div>
</div> </div>
<span v-if="!orientationchange&&showObj.video.length>1">选集</span> <span v-if="!orientationchange&&showObj.video.length>1">选集</span>
<span class="fr" v-if="contentData.title==2&&!orientationchange" @click.stop="secClarity=!secClarity"> <span class="fr" v-if="contentData.title==2" @click.stop="secClarity=!secClarity">
<i v-if="clarityType==1280">超清</i> <i v-if="clarityType==1280">超清</i>
<i v-if="clarityType==720">高清</i> <i v-if="clarityType==720">高清</i>
<i v-if="clarityType==540">流畅</i> <i v-if="clarityType==540">流畅</i>
...@@ -207,7 +203,6 @@ export default { ...@@ -207,7 +203,6 @@ export default {
let width = document.documentElement.clientWidth; let width = document.documentElement.clientWidth;
let height = document.documentElement.clientHeight; let height = document.documentElement.clientHeight;
let t = setTimeout(function() { let t = setTimeout(function() {
console.log(this.orientationchange,210);
if (width < height) { if (width < height) {
that.orientationchange = true; that.orientationchange = true;
clearTimeout(t); clearTimeout(t);
...@@ -217,6 +212,7 @@ export default { ...@@ -217,6 +212,7 @@ export default {
clearTimeout(t); clearTimeout(t);
// return // return
} }
console.log(this.orientationchange,210);
}, 100); }, 100);
// debugger // debugger
}, },
...@@ -224,8 +220,10 @@ export default { ...@@ -224,8 +220,10 @@ export default {
); );
}, },
methods: { methods: {
activity(){
},
changeClarity(a) { changeClarity(a) {
this.currentTime = this.$refs.videoDom.currentTime // this.currentTime = this.$refs.videoDom.currentTime
if (a == "1280") { if (a == "1280") {
this.clarityType = 1280; this.clarityType = 1280;
localStorage.setItem("clarityType", this.clarityType); localStorage.setItem("clarityType", this.clarityType);
...@@ -552,6 +550,7 @@ export default { ...@@ -552,6 +550,7 @@ export default {
font-size: 14 * @toVw; font-size: 14 * @toVw;
margin-bottom: 12 * @toVw; margin-bottom: 12 * @toVw;
text-indent: 6 * @toVw; text-indent: 6 * @toVw;
// top:70 * @toVw;
.fr { .fr {
position:relative; position:relative;
top:-8 * @toVw; top:-8 * @toVw;
...@@ -788,6 +787,11 @@ export default { ...@@ -788,6 +787,11 @@ export default {
} }
@media screen and (orientation: landscape) { @media screen and (orientation: landscape) {
@toVw: 100/667vw; @toVw: 100/667vw;
.videoTitle {
.fr {
display:none;
}
}
.video-page { .video-page {
position: absolute; position: absolute;
top: 5 * @toVw; top: 5 * @toVw;
......
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