From f165c79ce81b7f96cf5a0881671a8e0f36ce1f59 Mon Sep 17 00:00:00 2001
From: litian <2804272236@qq.com>
Date: 星期五, 24 一月 2025 10:51:33 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/assets/methods/examination.js | 60 ++++++++++++++++++++++++++++--------------------------------
1 files changed, 28 insertions(+), 32 deletions(-)
diff --git a/src/assets/methods/examination.js b/src/assets/methods/examination.js
index e4c2cd1..742e446 100644
--- a/src/assets/methods/examination.js
+++ b/src/assets/methods/examination.js
@@ -1,9 +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) => {
-const collectList = await getCollectList(activeBook)
-console.log('鏀惰棌鍒楄〃',collectList);
+ 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 = [];
@@ -225,42 +227,36 @@
return cardList.filter((item) => item.infoList.length > 0);
};
// 鑾峰彇鏀惰棌鍒楄〃
-const getCollectList = async(activeBook) => {
+const getCollectList = async (activeBook) => {
const allCollect = [
{
- type:'bits',
- collectList:[]
+ type: "bits",
+ collectList: [],
},
{
- type:'json',
- 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('鏆傛棤鏁版嵁')
+ ];
+ 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(() => {
- console.log('鑾峰彇鏀惰棌鎶ラ敊');
- })
- return allCollect.find(item => item.type == 'bits').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