From 30d147c4c92dbfd5ca1b2f8c24a617dc82d2d25b Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期一, 28 四月 2025 18:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/assets/methods/examination.js | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/assets/methods/examination.js b/src/assets/methods/examination.js
index 0da5175..742e446 100644
--- a/src/assets/methods/examination.js
+++ b/src/assets/methods/examination.js
@@ -1,7 +1,11 @@
import MG from "@/assets/js/middleGround/WebMiddleGroundApi";
+import { tokenKey } from "@/assets/js/config";
import getPublicImage from "@/assets/js/middleGround/tool";
+// 鑾峰彇棰樼洰鍒楄〃
const getQuestionList = async (page, questionList, activeBook) => {
- console.log("page", page);
+ const token = localStorage.getItem(tokenKey);
+ let collectList = [];
+ if (token) collectList = await getCollectList(activeBook);
const oldAnswerData = localStorage.getItem(activeBook.name + "oldAnswerData");
let oldData = null;
let oldList = [];
@@ -97,7 +101,7 @@
isSubmit: false, // 鏌ョ湅瑙ｆ瀽
isRight: null, // 鏄惁姝ｇ‘
isComplete: false,
- isCollect: true,
+ isCollect: collectList.indexOf(qitem) > -1 ? true : false,
isUnfold: "",
};
// 澶氶�夊拰濉┖绛旀鑲负鏁扮粍锛岃杞崲JSON鏍煎紡
@@ -222,7 +226,37 @@
}
return cardList.filter((item) => item.infoList.length > 0);
};
-
+// 鑾峰彇鏀惰棌鍒楄〃
+const getCollectList = async (activeBook) => {
+ const allCollect = [
+ {
+ type: "bits",
+ collectList: [],
+ },
+ {
+ type: "json",
+ collectList: [],
+ },
+ ];
+ const res = await MG.identity.getUserKey({
+ domain: "collectData",
+ keys: [activeBook.bookId],
+ });
+ try {
+ const collect = JSON.parse(res[0].value);
+ if (collect.length) {
+ allCollect[0].collectList = collect.find(
+ (citem) => citem.type == "bits"
+ ).collectList;
+ allCollect[1].collectList = collect.find(
+ (citem) => citem.type == "json"
+ ).collectList;
+ }
+ } catch (error) {
+ console.log("鏆傛棤鏁版嵁");
+ }
+ return allCollect.find((item) => item.type == "bits").collectList;
+};
const getQuestionData = async (chapter, chapterData, activeBook) => {
const data = { ...chapterData };
const oldAnswerData = localStorage.getItem("oldAnswerData");
--
Gitblit v1.9.1