This commit is contained in:
@fawn-nine
2024-10-16 11:10:03 +08:00
parent bc7656e5ed
commit 2b43488ee9
3 changed files with 15 additions and 8 deletions

View File

@@ -12,8 +12,8 @@
"src" : "图片路径" "src" : "图片路径"
} }
], ],
"versionName" : "1.0.27", "versionName" : "1.0.28",
"versionCode" : 1027, "versionCode" : 1028,
"app-plus" : { "app-plus" : {
"nvueCompiler" : "weex", "nvueCompiler" : "weex",
"compatible" : { "compatible" : {

View File

@@ -69,7 +69,7 @@
<!-- {{selfStudyCertificate.length}}-{{classInfo.id}}-{{classInfo.state}}- --> <!-- {{selfStudyCertificate.length}}-{{classInfo.id}}-{{classInfo.state}}- -->
<!-- 自考入口 没有加入班级的时候暴漏入口--> <!-- 自考入口 没有加入班级的时候暴漏入口-->
<view class="selfStudyBox" <view class="selfStudyBox"
v-if="librayList[curIndex] && (!classInfo.id || classInfo.state == '2' || selfStudyCertificate.length >= 0)"> v-if="course.canzk == '1' && librayList[curIndex] && (!classInfo.id || classInfo.state == '2' || selfStudyCertificate.length >= 0)">
<view style="padding: 20rpx;" <view style="padding: 20rpx;"
v-if="(selfStudyCertificate.length == 0 || selfStudyPaperList.length > 0 && !testingPaper.id) && (!classInfo.id || classInfo.state == '2')"> v-if="(selfStudyCertificate.length == 0 || selfStudyPaperList.length > 0 && !testingPaper.id) && (!classInfo.id || classInfo.state == '2')">
<view class=""> <view class="">
@@ -672,8 +672,7 @@
// #ifdef APP-PLUS // #ifdef APP-PLUS
plus.screen.unlockOrientation(); plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary"); plus.screen.lockOrientation("portrait-primary");
// #endif // #endif
this.getLinkClassList()
await this.request() await this.request()
}, },
@@ -724,6 +723,9 @@
} }
}) })
} }
if(this.classCertificate.length <= 0){ // 已经在班级内获得证书就不再检查班级的情况了
this.getLinkClassList()
}
var historyPaper = await this.getingPaper() var historyPaper = await this.getingPaper()
console.log('historyPaper正在考试的信息', historyPaper); console.log('historyPaper正在考试的信息', historyPaper);
if (historyPaper && historyPaper.id && historyPaper.type == '2' && historyPaper.relationId == this if (historyPaper && historyPaper.id && historyPaper.type == '2' && historyPaper.relationId == this
@@ -746,6 +748,10 @@
this.testingPaper = {} this.testingPaper = {}
this.showCountDown = false this.showCountDown = false
} }
if(this.course.canzk == '0'){ // 如果没有开启自考,就不走自考相关的逻辑
console.log('没有打开自考开关');
return
}
var selfStudyPaperList = await this.getSelfStudyPaperList() var selfStudyPaperList = await this.getSelfStudyPaperList()
this.selfStudyPaperList = selfStudyPaperList this.selfStudyPaperList = selfStudyPaperList
console.log('selfStudyPaperList', selfStudyPaperList); console.log('selfStudyPaperList', selfStudyPaperList);

View File

@@ -536,7 +536,8 @@
}, },
}) })
.then(async res => { .then(async res => {
if (res.code == 0) { console.log(res);
if (res && res.code == 0) {
if (res.result.length > 0) { if (res.result.length > 0) {
_list = res.result _list = res.result
} }
@@ -580,8 +581,8 @@
this.$http this.$http
.post('medical/home/getCourseMedicalTree') .post('medical/home/getCourseMedicalTree')
.then(res => { .then(res => {
// console.log(res) console.log(res)
if (res.code == 0) { if (res && res.code == 0) {
if (res.labels.length > 0) { if (res.labels.length > 0) {
this.curseTagList = res.labels this.curseTagList = res.labels
this.tabsid = res.labels[0].id this.tabsid = res.labels[0].id