From c6c73b7d709322052b9cd6777b3d6657e0d43d30 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期六, 07 九月 2024 14:37:32 +0800 Subject: [PATCH] bug --- packageBookService/pages/bookServices/examination/examination.js | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 51 insertions(+), 2 deletions(-) diff --git a/packageBookService/pages/bookServices/examination/examination.js b/packageBookService/pages/bookServices/examination/examination.js index 19c8ee5..2c9ab29 100644 --- a/packageBookService/pages/bookServices/examination/examination.js +++ b/packageBookService/pages/bookServices/examination/examination.js @@ -1,6 +1,9 @@ import { getPublicImage } from "../../../../assets/js/middleGround/tool"; +import { + loginInfo +} from '../../../../assets/js/login'; const app = getApp(); Page({ /** @@ -14,6 +17,8 @@ countdownInterval: null, // 璁℃椂鍣� isCountdownRunning: true, // 鏄惁鍊掕鏃� countdownTime: 0, // 鍊掕鏃舵椂闂� + storeInfo: '', + jslx: '', bookId: "", productLinkPath: "", rootCmsItemId: "", @@ -68,6 +73,8 @@ rootCmsItemId: options.rootCmsItemId, idPathList: options.idPathList ? JSON.parse(options.idPathList) : [], answerType: options.answerType, + storeInfo: options.storeInfo, + jslx: options.jslx, }); wx.setNavigationBarTitle({ title: options.answerTitle, @@ -78,7 +85,21 @@ mockid: options.mockid, }); } - this.init(); + + const token = wx.getStorageSync(app.config.tokenKey) + + if (!token) { + loginInfo(app, (data) => { + if (data) { + this.init(); + } else { + this.init(); + } + }) + } else { + this.init() + } + }, /** @@ -462,7 +483,6 @@ const inputData = e.detail.value.detail.value; const id = e.detail.value.currentTarget.dataset.id; const index = Number(e.detail.value.currentTarget.dataset.index); - console.log(index); const questionList = this.data.questionDataList; questionList.forEach((item) => { if (item.id == id) { @@ -818,6 +838,7 @@ let query = { path: "*", queryType: "*", + productId: this.data.bookId, cmsPath: pathitem.productLinkPath, itemFields: { @@ -837,6 +858,9 @@ size: 999, }, }; + if (this.data.storeInfo) { + query.storeInfo = this.data.storeInfo + } await app.MG.store.getProductDetail(query).then((res) => { this.setData({ total: res.datas.cmsDatas[0].datas.length, @@ -853,6 +877,19 @@ }); } res.datas.cmsDatas[0].datas.forEach((item, index) => { + if (this.data.storeInfo || this.data.jslx) { + if (item.Embedded_QuestionBank_QuestionType == 'singleChoice') { + pathitem.name = "鍗曢�夐" + } else if (item.Embedded_QuestionBank_QuestionType == 'shortAnswer') { + pathitem.name = "绠�绛旈" + } else if (item.Embedded_QuestionBank_QuestionType == "completion") { + pathitem.name = "濉┖棰�"; + } else if (item.Embedded_QuestionBank_QuestionType == "multipleChoice") { + pathitem.name = "澶氶�夐"; + } else if (item.Embedded_QuestionBank_QuestionType == "judge") { + pathitem.name = "鍒ゆ柇棰�"; + } + } let oldObj = ""; if (oldList) oldObj = oldList.find((oldItem) => oldItem.id == item.id); @@ -1024,6 +1061,9 @@ questionDataList: questionList, cardList: cardUpdatedList, }); + console.log( + '棰樼洰', this.data.questionDataList + ); }); }); } @@ -1357,6 +1397,9 @@ Embedded_QuestionBank_Difficulty: [], }, }; + if (this.data.storeInfo) { + query.storeInfo = this.data.storeInfo + } await app.MG.store.getProductDetail(query).then((res) => { let questionArr = []; res.datas.cmsDatas[0].datas.forEach((item, index) => { @@ -1604,6 +1647,9 @@ Embedded_QuestionBank_Difficulty: [], }, }; + if (this.data.storeInfo) { + query.storeInfo = this.data.storeInfo + } await app.MG.store.getProductDetail(query).then((res) => { let questionArr = []; res.datas.cmsDatas[0].datas.forEach((item, index) => { @@ -1889,6 +1935,9 @@ Embedded_QuestionBank_Difficulty: [], }, }; + if (this.data.storeInfo) { + query.storeInfo = this.data.storeInfo + } await app.MG.store.getProductDetail(query).then((res) => { res.datas.cmsDatas[0].datas.forEach((item, index) => { // 寰幆questionList,缁欐瘡棰樿祴鍊煎垎鏁� -- Gitblit v1.9.1