Skip to content

H
h5-base
Commit 8d15fc14 authored by IvyXia123's avatar IvyXia123
Browse files
Options

测试

parent 335db505
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 8 deletions
dist/index.html
View file @ 8d15fc14
......@@ -11,4 +11,4 @@
position: fixed;
background: #f4f4f4;
}
/* html{font-size: 1px;} */</style><link href=static/css/app.419a340d5d99fa41c7715c7b65489c6f.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.ef90a8ceef6fbfe01936.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.2e3a184670180684fd07.js></script></body></html>
\ No newline at end of file
/* html{font-size: 1px;} */</style><link href=static/css/app.419a340d5d99fa41c7715c7b65489c6f.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.55421d77475d8314db1b.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.2e3a184670180684fd07.js></script></body></html>
\ No newline at end of file
dist/static/js/28.00b746e9a29c931ca07a.js deleted 100644 → 0
View file @ 335db505
This diff is collapsed.
dist/static/js/28.0e9976f82abaf8723072.js 0 → 100644
View file @ 8d15fc14
This diff is collapsed.
dist/static/js/manifest.ef90a8ceef6fbfe01936.js → dist/static/js/manifest.55421d77475d8314db1b.js
View file @ 8d15fc14
!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],f[t]&&u.push(f[t][0]),f[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=d(d.s=n[i]);return o};var c={},f={69:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});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,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"9baf7c00d262ea271601",1:"cd702ed7c711ea5ecfdb",2:"16e13d1a6c737c94cb9f",3:"0b90104ffc802fd66c3b",4:"ae2f2ad72b7647778888",5:"4d3a3a20bce996099c8c",6:"f33528d2879474d9b497",7:"013c69180ef15396ca9b",8:"3a12c8d7575a76f18500",9:"5428e5efda8c69b091a8",10:"18feb799f9b98c2237ff",11:"918861cd78184d817c80",12:"cb924d2c61a81e172ad0",13:"49e2fab89863e5a59349",14:"97a1294dd4dfb6301ebe",15:"23378403a5bada9571df",16:"af157bb03acb4b7f37b8",17:"6cf9e1b9fa0428cf5d63",18:"2340341552200a69e80d",19:"aa6e3d65aa96e428d7a5",20:"91202ae1839a0b6719cc",21:"dc056bdfdea3f6d29865",22:"b0fd96ad8f27124b5d6f",23:"dd87c78f2150cc550f10",24:"8df8758a582bb9d031cb",25:"efe64efe3630a4877751",26:"a15960691f85280f0314",27:"7b4bd6e36741f7bf46b4",28:"00b746e9a29c931ca07a",29:"52b720592707e63c2d4e",30:"dbf29282817872a8c5ce",31:"7873c4c22c96bbafe2af",32:"c27850f6211fa385b971",33:"4f4179fc1318f9e7142e",34:"303ef6f9471ee0fa4d71",35:"3bd13c8ea4263104a528",36:"8d68a6fdbee6ee8a9409",37:"df2033bdd5e192b42717",38:"30809f53757bc74a040c",39:"6f388a3e8e4bf93ba520",40:"0fbe69301fe779f4b9e1",41:"ca9b5451ab8772225eaa",42:"7023464731d1a0cd37ff",43:"43779b0239aa146283d0",44:"ed578babd4ce2567ceed",45:"0b782c3dea606ac8a53d",46:"41afd83289888baa28f3",47:"6614379db2a7200615db",48:"8b1de363e50a20574180",49:"6a4cd5657a94075f1bc7",50:"c1cfda636c0eccc2e1f6",51:"868e6e7f5a7d64ee287e",52:"8510973a8e8e6c464086",53:"a59c89c16a2ac8f87891",54:"aa33075401a787f3074c",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"57a1a4f4a139eb66ef6d",59:"7414e328ba8ed1a9d252",60:"8ef62856e5832a7d611b",61:"ed331ea12784c73c30b3",62:"95f5e4748e04cee8ac1e",63:"93655abfb6665a9aaf5a",64:"41c23561f78d47604f7b",65:"bdf70254fb0baae6b437",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
!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],f[t]&&u.push(f[t][0]),f[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=d(d.s=n[i]);return o};var c={},f={69:0};function d(a){if(c[a])return c[a].exports;var f=c[a]={i:a,l:!1,exports:{}};return e[a].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var a=f[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,d){a=f[e]=[c,d]});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,n.crossOrigin="anonymous",d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+({0:"vendor-async"}[e]||e)+"."+{0:"9baf7c00d262ea271601",1:"cd702ed7c711ea5ecfdb",2:"16e13d1a6c737c94cb9f",3:"0b90104ffc802fd66c3b",4:"ae2f2ad72b7647778888",5:"4d3a3a20bce996099c8c",6:"f33528d2879474d9b497",7:"013c69180ef15396ca9b",8:"3a12c8d7575a76f18500",9:"5428e5efda8c69b091a8",10:"18feb799f9b98c2237ff",11:"918861cd78184d817c80",12:"cb924d2c61a81e172ad0",13:"49e2fab89863e5a59349",14:"97a1294dd4dfb6301ebe",15:"23378403a5bada9571df",16:"af157bb03acb4b7f37b8",17:"6cf9e1b9fa0428cf5d63",18:"2340341552200a69e80d",19:"aa6e3d65aa96e428d7a5",20:"91202ae1839a0b6719cc",21:"dc056bdfdea3f6d29865",22:"b0fd96ad8f27124b5d6f",23:"dd87c78f2150cc550f10",24:"8df8758a582bb9d031cb",25:"efe64efe3630a4877751",26:"a15960691f85280f0314",27:"7b4bd6e36741f7bf46b4",28:"0e9976f82abaf8723072",29:"52b720592707e63c2d4e",30:"dbf29282817872a8c5ce",31:"7873c4c22c96bbafe2af",32:"c27850f6211fa385b971",33:"4f4179fc1318f9e7142e",34:"303ef6f9471ee0fa4d71",35:"3bd13c8ea4263104a528",36:"8d68a6fdbee6ee8a9409",37:"df2033bdd5e192b42717",38:"30809f53757bc74a040c",39:"6f388a3e8e4bf93ba520",40:"0fbe69301fe779f4b9e1",41:"ca9b5451ab8772225eaa",42:"7023464731d1a0cd37ff",43:"43779b0239aa146283d0",44:"ed578babd4ce2567ceed",45:"0b782c3dea606ac8a53d",46:"41afd83289888baa28f3",47:"6614379db2a7200615db",48:"8b1de363e50a20574180",49:"6a4cd5657a94075f1bc7",50:"c1cfda636c0eccc2e1f6",51:"868e6e7f5a7d64ee287e",52:"8510973a8e8e6c464086",53:"a59c89c16a2ac8f87891",54:"aa33075401a787f3074c",55:"6c8d1ac585f3c5feaf1d",56:"7c31d35771a1304c0694",57:"3f35c830362905640c11",58:"57a1a4f4a139eb66ef6d",59:"7414e328ba8ed1a9d252",60:"8ef62856e5832a7d611b",61:"ed331ea12784c73c30b3",62:"95f5e4748e04cee8ac1e",63:"93655abfb6665a9aaf5a",64:"41c23561f78d47604f7b",65:"bdf70254fb0baae6b437",66:"d29a08ade6bda9eed6a6"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=f[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),c},d.m=e,d.c=c,d.d=function(e,a,c){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/punchTheClock/index.vue
View file @ 8d15fc14
......@@ -344,6 +344,7 @@
// 判断去学习还是去提交
getCardGoApi(this.modelData.ele_id, this.modelData.id, this.modelData.periods_id, getCardGoData).then(res => {
this.goWhere = res.go_where;
console.log(this.goWhere)
let currentTime = this.timerAddLing(new Date().getFullYear()) + '-' + this.timerAddLing(new Date().getMonth() + 1) + '-' + this.timerAddLing(new Date().getDate())
let da = new Date(currentTime).getTime()
let dangqianTimer = new Date(this.modelData.push_time).getTime();
......@@ -376,20 +377,21 @@
* @param dataObj
*/
modelDataClick(dataObj, type) {
console.log(this.status)
let getCardGoData = { start_at: this.$route.query.start_at, over_at: this.$route.query.over_at, push_time: dataObj.push_time, type: type };
if(this.status === 2) {
// 点击去学习和去提交
if(this.goWhere === 1) {
/* if(this.goWhere === 1) {
// 进入课程
this.getLessonDetailFn(dataObj)
}else {
}else*/
if(this.goWhere !== 1){
// 用户看课统计
getUserWatchApi({ category_id: dataObj.id }).then(res => {
let data = Object.assign({}, res, { periods_id: this.modelData.periods_id, category_id: this.modelData.id, element_id: this.modelData.ele_id })
this.$router.push({path: '/evaluate', query: data})
});
}
this.getLessonDetailFn(dataObj)
}else if(this.status === 3) {
// 待不卡--补卡
if(this.lastValue >= 10) {
......@@ -413,7 +415,6 @@
getLessonDetailApi(dataObj.periods_id, dataObj.id, dataObj.ele_id).then(res=>{
res.content = JSON.parse(res.content);
this.thisLesson = res;
localStorage.setItem('lessonDetail',JSON.stringify(res));
this.thisLesson.id = dataObj.ele_id.toString();
this.thisLesson.categoryId = dataObj.id;
this.thisLesson.domTitle = dataObj.name;
......@@ -436,7 +437,9 @@
lessonData.nowTime = Date.parse(new Date());
lessonData.course_title = this.$route.query.course_title
localStorage.setItem('lessonDetail', JSON.stringify(lessonData));
this.$router.push({name:'newLesson', query: query})
if(this.goWhere === 1) {
this.$router.push({name:'newLesson', query: query})
}
})
},
/**
......
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