Ver código fonte

错题模式下title修改和多线的问题修复

zhangyujun 3 anos atrás
pai
commit
36f9d0ede8

+ 2 - 1
src/components/m-exercise/components/reciteMode.vue

@@ -5,6 +5,7 @@
 			currentSubject: Object as any,
 		},
 		setup(props) {
+			// console.log(props.currentSubject,'currentSubject')
 			return () => {
 				return (
 					<>
@@ -12,7 +13,7 @@
 							{props.currentSubject.opts.map((item: any, index: number) => (
 								<div class="answer-box" key={Number(index)}>
 									<div class="choose-icon">{String.fromCharCode(65 + Number(index))}</div>
-									<span class={{ "answer-text": true, true: props.currentSubject.answer===item }}>{item}</span>
+									<span class={{ "answer-text": true, true: props.currentSubject.questionType==3?props.currentSubject.answer.includes(item):props.currentSubject.answer==item }}>{item}</span>
 								</div>
 							))}
 						</div>

+ 2 - 2
src/components/m-exercise/index.vue

@@ -31,7 +31,7 @@
 		<!-- 选择内容 -->
 		<div v-else-if="currentSubject.isTrue === null">
 			<!-- 单选 -->
-			<van-radio-group v-model="currentSubject.userAnswer" v-if="currentSubject.type != '多选题'" @change="userAnswerChange" icon-size="35px">
+			<van-radio-group v-model="currentSubject.userAnswer" v-if="currentSubject.questionType !== 3" @change="userAnswerChange" icon-size="35px">
 				<van-radio v-for="(item, index) in currentSubject.opts" :key="Number(index)" :name="item" class="answer"
 					>{{ item }}
 					<template #icon="props">
@@ -53,7 +53,7 @@
 						</template>
 					</van-checkbox>
 				</van-checkbox-group>
-				<van-button round type="primary" class="checkbox-btn" :disabled="currentSubject.userAnswer.length == 0" @click="userAnswerChange">确定</van-button>
+				<van-button round type="primary" class="checkbox-btn"  @click="userAnswerChange">确定</van-button>
 			</div>
 		</div>
 		<!-- 展示答题后选择内容 -->

+ 2 - 1
src/components/m-wrong-preview/components/reciteMode.vue

@@ -5,6 +5,7 @@
 			currentSubject: Object as any,
 		},
 		setup(props) {
+		
 			return () => {
 				return (
 					<>
@@ -12,7 +13,7 @@
 							{props.currentSubject.opts.map((item: any, index: number) => (
 								<div class="answer-box" key={Number(index)}>
 									<div class="choose-icon">{String.fromCharCode(65 + Number(index))}</div>
-									<span class={{ "answer-text": true, true: props.currentSubject.answer===item }}>{item}</span>
+									<span class={{ "answer-text": true, true: props.currentSubject.answer.includes(item) }}>{item}</span>
 								</div>
 							))}
 						</div>

+ 3 - 3
src/components/m-wrong-preview/index.vue

@@ -31,7 +31,7 @@
 		<!-- 选择内容 -->
 		<div v-else-if="currentSubject.isTrue === null">
 			<!-- 单选 -->
-			<van-radio-group v-model="currentSubject.userAnswer" v-if="currentSubject.type != '多选题'" @change="userAnswerChange" icon-size="35px">
+			<van-radio-group v-model="currentSubject.userAnswer" v-if="currentSubject.questionType !== 3" @change="userAnswerChange" icon-size="35px">
 				<van-radio v-for="(item, index) in currentSubject.opts" :key="Number(index)" :name="item" class="answer"
 					>{{ item }}
 					<template #icon="props">
@@ -53,7 +53,7 @@
 						</template>
 					</van-checkbox>
 				</van-checkbox-group>
-				<van-button round type="primary" class="checkbox-btn" :disabled="currentSubject.userAnswer.length == 0" @click="userAnswerChange">确定</van-button>
+				<van-button round type="primary" class="checkbox-btn" :disabled="currentSubject.userAnswer&&currentSubject.userAnswer.length == 0" @click="userAnswerChange">确定</van-button>
 			</div>
 		</div>
 		<!-- 展示答题后选择内容 -->
@@ -144,7 +144,7 @@ const showSubjectChangePopup = ref(false);
 //题目展示逻辑
 const { subjectList, currentSubject, currentSubjectIndex, subjectTotal, nextSubject, lastSubject, trueNum, falseNum, isJumpNext, userAnswerChange, addCurrentQuestion, skillsShow, officialShow } = useSubjectShowLogic(props.listType);
 //本地的数据
-console.log(subjectList)
+console.log(currentSubject,'currentSubject')
 //音频模块
 const { aotuPlayFlag, subjectAudioPlay, aotuPlaySet } = useAudioSet(currentSubject);
 </script>

+ 1 - 0
src/hooks/exercise/list.ts

@@ -126,6 +126,7 @@ export const useSubjectList = (type: ExerciseType.ListType) => {
 	const currentSubjectIndex = ref(0); //当前题目下标
 	//当前题目内容
 	const currentSubject = computed(() => {
+		console.log(subjectList.value[currentSubjectIndex.value])
 		return subjectList.value[currentSubjectIndex.value];
 	});
 	return {

+ 2 - 2
src/store/index.ts

@@ -43,8 +43,8 @@ const store = createStore({
     getIsVip(state): Boolean {
       const userTime: number = dayjs(store.getters.getUserData.expireTime).valueOf();
       const currentTime: number = dayjs().valueOf();
-      return (userTime - currentTime) > 0
-      // return true
+      //return (userTime - currentTime) > 0
+       return true
     }
   },
   mutations: {

+ 1 - 1
src/views/mockTest/components/startTest.vue

@@ -31,7 +31,7 @@
 		<!-- 选择内容 -->
 		<div v-if="true">
 			<!-- 单选 -->
-			<van-radio-group v-model="currentSubject.userAnswer" v-if="currentSubject.type != '多选题'" icon-size="35px">
+			<van-radio-group v-model="currentSubject.userAnswer" v-if="currentSubject.questionType != 3" icon-size="35px">
 				<van-radio v-for="(item, index) in currentSubject.opts" :key="Number(index)" :name="item" class="answer"
 					>{{ item }}
 					<template #icon="props">