Commit 90ae19e1 authored by IvyXia123's avatar IvyXia123

完成今日学习加星判断

parent fcbbd680
...@@ -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.1c1990a9032bfa6fdf76.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.56329e85e3bf914c5d40.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.6b19723df830cc63e2ea.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.56329e85e3bf914c5d40.js></script></body></html>
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},a={69:0};function d(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,d){c=a[e]=[f,d]});c[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"b3bc8f9f5447ad6c3f53",1:"66c286b2d9516703cff0",2:"2c97ac6de4b2c197a788",3:"4d1ac9be4d97ffcdcd27",4:"e036a40ec5493a2f1fe2",5:"d067c99fb3341c9f8fbf",6:"0701198dcf8803ab3ecc",7:"5ea7c7fa901065ad18d3",8:"ee96fc24a4c22c866ef0",9:"f1f2f981808dac360043",10:"1e7620dd9d82ff53a48b",11:"ef24e0abaab858c7068c",12:"c32793ec9c026ec4952c",13:"70e18470ba94e66ea636",14:"6f775b0f71ab907bf6c9",15:"aac97eac9185f386543e",16:"f41b28ff6bf3de8fc15a",17:"202ef012d70503034c38",18:"17bf5166834bef806a2a",19:"d817a9478a0f0f630c7c",20:"6b595c29e6aaaa7f14c1",21:"0c5886bf7427b7b183e7",22:"f68ea2c665fa37420ccb",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"386d0c50933db7378564",26:"926af732471739d5ee45",27:"8ee0be7fbb0fb087db54",28:"57ab508e80608a7ae6bf",29:"cb0ee5d9d72b28fe276f",30:"653c91ab86838e75b5e6",31:"496a4f1feee35020b28e",32:"d416f9c3eb225c407945",33:"ac86ed186ec22ef8a2f0",34:"f9100b504f7ad9f03fb7",35:"4c83dac57ccdccaca4a1",36:"d1457d79c6cca0e5dea3",37:"5f1924cd6103ee117c61",38:"e023144fad02fb9afd5b",39:"78faf4e875e58ebc2e45",40:"ff3778361e9c6e46fe3d",41:"5460cec8b4bef019ce1b",42:"98f43f4674c3dbc018a6",43:"141f3e876e053113ae40",44:"912133dc7b31ecc11d27",45:"ba6206c8ebb8afc0ddf2",46:"f34412903dee9d902d97",47:"7e2de6f7607c9787f0ba",48:"a0f24071ee52a1d66406",49:"27d4731c146b0a03ef7c",50:"6e6cb7cc07cab9d9a18f",51:"9f76654b0cf55d63f8f1",52:"8cb8dad12210101cff85",53:"61c7cab49a9aadefac52",54:"6b792ec4a32901312c88",55:"c9a9e874de578f6a5aea",56:"8845249be04a11188470",57:"b67ef26e643ad0236ccf",58:"28b8eef9ef51c988ac99",59:"61145b22e68bf2bc7c3a",60:"2ff38cdcb0c8d13b51a0",61:"4bbe8d73fb4886ec560b",62:"05895947738105c18151",63:"ff2ed96474562cd5e44b",64:"caf94f2c30470c5b5010",65:"2e668d5dbdd605394d27",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,c,f){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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}}([]); !function(e){var c=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],a[t]&&u.push(a[t][0]),a[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},a={69:0};function d(c){if(f[c])return f[c].exports;var a=f[c]={i:c,l:!1,exports:{}};return e[c].call(a.exports,a,a.exports,d),a.l=!0,a.exports}d.e=function(e){var c=a[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var f=new Promise(function(f,d){c=a[e]=[f,d]});c[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"b3bc8f9f5447ad6c3f53",1:"0f41e1a40286fcf71f42",2:"2c97ac6de4b2c197a788",3:"4d1ac9be4d97ffcdcd27",4:"e036a40ec5493a2f1fe2",5:"d067c99fb3341c9f8fbf",6:"0701198dcf8803ab3ecc",7:"5ea7c7fa901065ad18d3",8:"ee96fc24a4c22c866ef0",9:"f1f2f981808dac360043",10:"1e7620dd9d82ff53a48b",11:"ef24e0abaab858c7068c",12:"c32793ec9c026ec4952c",13:"70e18470ba94e66ea636",14:"6f775b0f71ab907bf6c9",15:"aac97eac9185f386543e",16:"f41b28ff6bf3de8fc15a",17:"202ef012d70503034c38",18:"17bf5166834bef806a2a",19:"d817a9478a0f0f630c7c",20:"6b595c29e6aaaa7f14c1",21:"0c5886bf7427b7b183e7",22:"f68ea2c665fa37420ccb",23:"6027e15d466465201cf5",24:"66115b335ef36e664560",25:"386d0c50933db7378564",26:"926af732471739d5ee45",27:"8ee0be7fbb0fb087db54",28:"57ab508e80608a7ae6bf",29:"cb0ee5d9d72b28fe276f",30:"653c91ab86838e75b5e6",31:"496a4f1feee35020b28e",32:"d416f9c3eb225c407945",33:"ac86ed186ec22ef8a2f0",34:"f9100b504f7ad9f03fb7",35:"4c83dac57ccdccaca4a1",36:"d1457d79c6cca0e5dea3",37:"5f1924cd6103ee117c61",38:"e023144fad02fb9afd5b",39:"78faf4e875e58ebc2e45",40:"ff3778361e9c6e46fe3d",41:"5460cec8b4bef019ce1b",42:"98f43f4674c3dbc018a6",43:"141f3e876e053113ae40",44:"912133dc7b31ecc11d27",45:"ba6206c8ebb8afc0ddf2",46:"f34412903dee9d902d97",47:"7e2de6f7607c9787f0ba",48:"a0f24071ee52a1d66406",49:"27d4731c146b0a03ef7c",50:"6e6cb7cc07cab9d9a18f",51:"9f76654b0cf55d63f8f1",52:"8cb8dad12210101cff85",53:"61c7cab49a9aadefac52",54:"6b792ec4a32901312c88",55:"c9a9e874de578f6a5aea",56:"8845249be04a11188470",57:"b67ef26e643ad0236ccf",58:"28b8eef9ef51c988ac99",59:"61145b22e68bf2bc7c3a",60:"2ff38cdcb0c8d13b51a0",61:"4bbe8d73fb4886ec560b",62:"05895947738105c18151",63:"ff2ed96474562cd5e44b",64:"caf94f2c30470c5b5010",65:"2e668d5dbdd605394d27",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=a[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,c,f){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:f})},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 \ No newline at end of file
...@@ -303,6 +303,7 @@ ...@@ -303,6 +303,7 @@
buttonName: "取消收藏", buttonName: "取消收藏",
partName: this.contentData.partName, partName: this.contentData.partName,
elementID: this.$route.query.elementId.toString() elementID: this.$route.query.elementId.toString()
}); });
delUserCollectApi(this.hasCollect).then(res => { delUserCollectApi(this.hasCollect).then(res => {
this.hasCollect = false; this.hasCollect = false;
...@@ -757,7 +758,6 @@ ...@@ -757,7 +758,6 @@
this.overTime = "00:00"; this.overTime = "00:00";
}, },
finishStudy() { finishStudy() {
this.sendConsole("完成今日学习");
let lessonDetail = JSON.parse(localStorage.getItem("lessonDetail")); let lessonDetail = JSON.parse(localStorage.getItem("lessonDetail"));
let query = JSON.parse(sessionStorage.getItem("classQuery")); let query = JSON.parse(sessionStorage.getItem("classQuery"));
let nowTime = Date.parse(new Date()); let nowTime = Date.parse(new Date());
...@@ -778,22 +778,20 @@ ...@@ -778,22 +778,20 @@
lessonDetail.nowTime = nowTime; lessonDetail.nowTime = nowTime;
lessonDetail.star_num = res.total_star_num; lessonDetail.star_num = res.total_star_num;
localStorage.setItem("lessonDetail", JSON.stringify(lessonDetail)); localStorage.setItem("lessonDetail", JSON.stringify(lessonDetail));
// if ( let response = res
// (Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60 < if (res.total_star_num < 2) {
// 7
// )
console.log((Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60, 8787)
if (res.total_star_num < 2 && (Number(lookTime) + Number(lessonDetail.total_watch_time)) / 60 < 7) {
this.popupVisible2 = true; this.popupVisible2 = true;
return false; return false;
// debugger
} else { } else {
getUserWatchApi({ category_id: query.category_id }).then(res => { getUserWatchApi({ category_id: query.category_id }).then(res => {
this.$store.dispatch("setWatchDetail", res); this.$store.dispatch("setWatchDetail", res);
// 从评价页面返回过来 // 从评价页面返回过来
sessionStorage.setItem('query',JSON.stringify(res)) sessionStorage.setItem('query',JSON.stringify(res))
this.$router.push({path: '/evaluate', query: res}) // 此判断由于点的太快会跳转
// debugger if(response.total_star_num) {
this.sendConsole("完成今日学习");
this.$router.push({path: '/evaluate', query: res})
}
}); });
// setTimeout(() => { // setTimeout(() => {
// if (this.$store.state.lookStatus == 0) { // if (this.$store.state.lookStatus == 0) {
......
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