From c7b33fe92cf6d4449ca5919353c15611ae9ad410 Mon Sep 17 00:00:00 2001
From: user1 <10901603+no-distractions1@user.noreply.gitee.com>
Date: 星期五, 28 六月 2024 09:40:32 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/assets/methods/examination.js | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/assets/methods/examination.js b/src/assets/methods/examination.js
index 0da5175..e4c2cd1 100644
--- a/src/assets/methods/examination.js
+++ b/src/assets/methods/examination.js
@@ -1,7 +1,9 @@
import MG from "@/assets/js/middleGround/WebMiddleGroundApi";
import getPublicImage from "@/assets/js/middleGround/tool";
+// 鑾峰彇棰樼洰鍒楄〃
const getQuestionList = async (page, questionList, activeBook) => {
- console.log("page", page);
+const collectList = await getCollectList(activeBook)
+console.log('鏀惰棌鍒楄〃',collectList);
const oldAnswerData = localStorage.getItem(activeBook.name + "oldAnswerData");
let oldData = null;
let oldList = [];
@@ -97,7 +99,7 @@
isSubmit: false, // 鏌ョ湅瑙ｆ瀽
isRight: null, // 鏄惁姝ｇ‘
isComplete: false,
- isCollect: true,
+ isCollect: collectList.indexOf(qitem) > -1 ? true : false,
isUnfold: "",
};
// 澶氶�夊拰濉┖绛旀鑲负鏁扮粍锛岃杞崲JSON鏍煎紡
@@ -222,7 +224,43 @@
}
return cardList.filter((item) => item.infoList.length > 0);
};
-
+// 鑾峰彇鏀惰棌鍒楄〃
+const getCollectList = async(activeBook) => {
+ const allCollect = [
+ {
+ type:'bits',
+ collectList:[]
+ },
+ {
+ type:'json',
+ collectList:[]
+ },
+ ]
+ await MG.identity
+ .getUserKey({
+ domain: 'collectData',
+ keys: [activeBook.bookId]
+ })
+ .then((res) => {
+ 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('鏆傛棤鏁版嵁')
+ }
+ })
+ .catch(() => {
+ 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