diff --git a/build-profile.json5 b/build-profile.json5 index d9604514..d2738f63 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,9 +5,9 @@ "name": "default", "material": { "certpath": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.cer", - "storePassword": "0000001B97BEB2EE7195C23EF422C88D2667F5DA9FBEF061A0B4F4408449BB70E434D55EDC654CEF091D55", + "storePassword": "0000001B2A00299F2F964B3C04F19B0796024C495343D6FF2CE368715D6364C2B6AD2BD37913CAA61F8E45", "keyAlias": "debugKey", - "keyPassword": "0000001BB3DA252CEA81031DF8420F8DD5970B43B58EF60C83BF57122B704A6B6F82CEE4008827EA85CFD0", + "keyPassword": "0000001B8D03DE7F46ED71467CD089AB5A788EEDCDD4781FAF40D175CD76F1ED2508E09C2AEBD90F0E9729", "profile": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p7b", "signAlg": "SHA256withECDSA", "storeFile": "C:\\Users\\93218\\.ohos\\config\\openharmony\\auto_ohos_default_subject-two_com.oh.dts.p12" diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index efb2bc1d..46ee8ab0 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -280,7 +280,6 @@ struct Index { this.carlist = carNo } } - //获取及格分数线 if (no1 == 3 && no3 == 3 && Number(carNo) === no2) { this.passingScore = Number(txt1) || 0; diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index c277d1d8..3dba239a 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -439,7 +439,7 @@ struct UserInfo { async getExamMode(kStringArr: string[]) { // @ts-ignore // 满分学习 - if(this.currentUser.czlx === 1) { + if (this.currentUser.czlx === 1) { this.mode === 5 return } @@ -459,8 +459,9 @@ struct UserInfo { }) let now = new Date(await systemDateTime.getCurrentTime()) let hour = now.getHours() + console.log("lixiao nightTime", nightTime) if (kStringArr.length === 0) { - if (hour < 5 || hour >= Number(nightTime.split(":")[0]) || 24) { + if (hour < 5 || hour >= Number(nightTime.split(":")[0] || 24)) { // 夜考 this.mode = 2 } else { @@ -940,9 +941,11 @@ struct UserInfo { await upDateTableByArray('USER', [this.currentUser]) this.stepFlag = false this.isLoadingPopupVisible = false - let kStringArr = decodeURIComponent(keystr || '').split(",") + let kStringArr = decodeURIComponent(keystr || '').split(",").filter(item => item) + console.log("lixiao kStringArr", JSON.stringify(kStringArr)) await this.getExamMode(kStringArr) - if(this.mode === 2 && !examItems?.getExaminationItemRsp?.body?.jdxx) { + console.log("lixiao model", this.mode) + if (this.mode === 2 && !examItems?.getExaminationItemRsp?.body?.jdxx) { promptAction.showToast({ message: "当前尚未进行白考,无法开始夜考!" })