Skip to content

S
self-support
Commit 4be9741b authored by 刘用法's avatar 刘用法
Browse files
Options

Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

parents 61451c73 e51a5738
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 56 deletions
src/pages/index/learn.vue
View file @ 4be9741b
......@@ -446,7 +446,6 @@ export default {
},
onPulling(e) {
return true;
console.log("onpulling", e);
},
onRefresh() {
if (this._freshing) return;
......@@ -458,7 +457,6 @@ export default {
},
onRestore() {
this.triggered = "restore"; // 需要重置
console.log("onRestore");
},
onAbort() {
console.log("onAbort");
......@@ -657,10 +655,6 @@ export default {
this.examList[i].examId = res.data.id;
this.examList[i].examStatus = res.data.examStatus; //i;//
this.examList[i].questionTime = res.data.questionTime;
console.log(
this.examList[i].questionTime,
"每题考试时间"
);
let examResult = res.data.examLevelResult;
this.examList[i].status =
examResult != "" ? examResult : "未通过";
......@@ -675,25 +669,20 @@ export default {
// examStatus 用户考试状态 0考试中 1考试完成 2未参与
that.exam = res.data;
console.log(that.exam);
if (res.data.examStatus == 2) {
console.log("examStatus " + i + " 2");
return;
}
if (res.data.examStatus == 1) {
console.log("examStatus " + i + " 1");
that.examList[i].isComplete =
this.examList[i].status == "通过";
that.examScore = res.data.examScore;
return;
}
if (res.data.examStatus == 0) {
console.log("examStatus " + i + " 0");
that.userExamId = res.data.id;
}
})
.catch((err) => {
console.log("getUserExamInfo err" + err);
uni.hideLoading();
uni.showToast({
icon: "none",
......
src/pages/learn/answer.vue
View file @ 4be9741b
......@@ -217,7 +217,6 @@ export default {
return;
}
if (res.data.data.examStatus == 1) {
console.log("111111111111111111111111111");
that.isComplete = true;
that.examScore = res.data.data.examScore;
return;
......@@ -285,11 +284,6 @@ export default {
// this.endTime = timestamp + time * 1000;
this.currentTime = parseInt(time * 1000); //this.formatTimeToMini(timestamp);//endTime-currentTime再格式化时间显示
that.getNext();
console.log(
this.endTime,
this.currentTime,
"总时间"
);
}
} else {
uni.showToast({
......@@ -361,15 +355,12 @@ export default {
}
if (res.data.code == 200) {
that.currentItem = res.data.data;
console.log(that.currentItem);
that.progress = res.data.data.progress;
if (res.data.data.isQuestion) {
let str = res.data.data.question.content;
var wz = str.indexOf(".");
let str1 = str.substring(wz + 1);
console.log(that.currentItem);
that.currentItem.question.content = str1.replace('*', '');
console.log(str1, "切割的字符串");
}
if (res.data.data.answerList) {
that.handleData();
......@@ -423,12 +414,6 @@ export default {
if (this.everyTime > 0) {
this.timer = setTimeout(this.startCounting, 1000);
console.log(
"endTime:" + this.endTime,
"everyTime:" + this.everyTime,
"currentTime:" + this.currentTime,
"答案:" + this.userAnswerIds
);
} else {
clearTimeout(this.timer);
this.everyTime = 90;
......@@ -438,16 +423,7 @@ export default {
itemClick: function (currentItem, ikey) {
this.isSelect = true;
// console.log('选点点击--处理前--this.currentItem：')
// console.log(this.currentItem)
// console.log('选点点击--处理前--ikey：')
// console.log(ikey)
// console.log('选点点击--处理前--题目类型，1单选，2多选，3简答：')
// console.log(this.currentItem.question.answerType)
//answerType 题目类型，1单选，2多选，3简答，
//answerType 题目类型，1单选，2多选，3简答
for (let i = 0; i < this.currentItem.answerList.length; i++) {
var item = this.currentItem.answerList[i];
......@@ -481,9 +457,6 @@ export default {
//有选答案
this.isSelect = isSelect;
// console.log('选点点击--处理后--this.currentItem.answerList：')
// console.log(this.currentItem.answerList)
},
// 点击下一步
handleClick() {
......@@ -531,7 +504,6 @@ export default {
// if(this.userAnswerIds.length == 1)
this.userAnswerIds =
this.userAnswerIds + "," + item.id;
console.log(this.userAnswerIds, "答案答案");
}
//*/
} else {
......
src/pages/learn/assessment.vue
View file @ 4be9741b
......@@ -127,12 +127,10 @@ export default {
},
success: (res) => {
console.log("标识符1", res.data);
uni.hideLoading();
if (res.data.code == 200) {
if (res.data.data.userExamId) {
this.userExamId = res.data.data.userExamId;
console.log("这个是个标识符", this.userExamId);
}
}
},
......
src/pages/learn/exam-pass.vue
View file @ 4be9741b
......@@ -41,7 +41,6 @@ export default {
onLoad(a) {
this.examId = a.examId;
this.userExamId = a.userExamId;
console.log("userExamId是", this.userExamId);
this.getCourseResult();
},
onUnload() {
......@@ -54,7 +53,6 @@ export default {
.getExamResult(this.examId)
.then((res) => {
if (res.code != 200) {
console.log("getUserExamInfo 200 err");
uni.showToast({
icon: "none",
title: "获取考试结果失败",
......@@ -65,7 +63,6 @@ export default {
this.score = this.result.examScore;
})
.catch((err) => {
console.log("getUserExamInfo err" + err);
uni.hideLoading();
uni.showToast({
icon: "none",
......
src/pages/learn/result.vue
View file @ 4be9741b
......@@ -45,7 +45,6 @@ export default {
onLoad(a) {
this.userExamId = a.userExamId;
this.examId = a.examId;
console.log("userExamId是", this.userExamId);
this.getCourseResult();
},
onUnload() {
......@@ -58,7 +57,6 @@ export default {
.getExamResult(this.examId)
.then((res) => {
if (res.code != 200) {
console.log("getUserExamInfo 200 err");
uni.showToast({
icon: "none",
title: "获取考试结果失败",
......@@ -69,7 +67,6 @@ export default {
this.score = this.result.examScore;
})
.catch((err) => {
console.log("getUserExamInfo err" + err);
uni.hideLoading();
uni.showToast({
icon: "none",
......@@ -81,7 +78,6 @@ export default {
getAgain: function () {
let examId = this.examId;
let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
console.log(routes.length);
uni.navigateTo({
url: "/pages/learn/assessment?examId=" + examId,
});
......
src/pages/learn/section.vue
View file @ 4be9741b
......@@ -121,8 +121,6 @@
},
methods: {
scroll: function(e) {
console.log('--scroll--')
console.log(e)
this.old.scrollTop = e.detail.scrollTop
},
goNext(info) {
......@@ -150,8 +148,6 @@
}else{
this.scrollValue = 0
}
console.log('--移动距离--')
console.log(this.scrollValue)
},
onPlayerTimeupdate(player) {
let intCurrentTime = parseInt(player.detail.currentTime);
......@@ -220,8 +216,6 @@
}
if (res.data) {
this.sectionInfo = res.data
console.log("----节信息----")
console.log(this.sectionInfo)
this.nextSectionId = this.sectionInfo.nextSectionId
let wareVal = this.sectionInfo.ware
this.courseTitle = res.data.name
......@@ -237,7 +231,6 @@
let coureWareList = res.data.courseware
this.courseSrc = coureWareList[0].src
this.videoTotalTime = parseInt(JSON.parse(coureWareList[0].info).time) - 1;
console.log('视频时长信息：' + this.videoTotalTime)
}
}
})
......
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