Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

.env.development

@@ -15,7 +15,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 # h5专用地址
 
-# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 # dev

src/pages/courseRecord/components/practiceRecordItem.vue

@@ -104,13 +104,13 @@
 
 	// 计算两个标准时间的时间差值
 	const formatDuration = (startTm, endTm) => {
+		if(endTm === null || startTm === null) return "00:00:00";
 		// 解析时间字符串为时间戳（毫秒）
 		const startTime = new Date(startTm).getTime();
 		const endTime = new Date(endTm).getTime();
 
 		// 计算时间差（秒），确保为正数
 		const seconds = Math.abs(Math.floor((endTime - startTime) / 1000));
-
 		// 计算时、分、秒
 		const hours = Math.floor(seconds / 3600);
 		const minutes = Math.floor((seconds % 3600) / 60);

src/pages/courseRecord/components/studyRecordItem.vue

@@ -110,6 +110,7 @@
 
 	// 计算两个标准时间的时间差值
 	const formatDuration = (startTm, endTm) => {
+		if(endTm === null || startTm === null) return "00:00:00";
 		// 解析时间字符串为时间戳（毫秒）
 		const startTime = new Date(startTm).getTime();
 		const endTime = new Date(endTm).getTime();

src/pages/examination/index.vue

@@ -12,7 +12,7 @@
 		<view class="countdown-and-question-number-div">
 			<view class="top">
 				<view class="countdown">
-					<text class="grey">答题进度</text>
+					<text class="grey mr-10">当前题目/总题数</text>
 					<text class="bold">{{ questionNumber + 1 }}</text>
 					<text class="grey">/{{ topicList.length }}</text>
 				</view>
@@ -199,8 +199,9 @@
 		get: () => topicList[questionNumber.value],
 		set: (val) => (topicList[questionNumber.value] = val)
 	});
+	
 	const showTouchBtn = computed(() => {
-		return topicList[questionNumber.value]['qnsTyp'] === 'ES';
+		return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult;
 	});
 
 	// 答题卡判断每道题的状态

src/pages/practice/index.vue

@@ -12,7 +12,7 @@
 		<view class="countdown-and-question-number-div">
 			<view class="top">
 				<view class="countdown">
-					<text class="grey">答题进度</text>
+					<text class="grey mr-10">当前题目/总题数</text>
 					<text class="bold">{{ questionNumber + 1 }}</text>
 					<text class="grey">/{{ storageTopicList.length }}</text>
 				</view>
@@ -121,7 +121,7 @@
 	});
 
 	const showTouchBtn = computed(() => {
-		return topic.value?.qnsTyp === 'ES';
+		return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult;
 	});
 
 	// 下面语音组件的禁用状态判断

src/pages/wrongQuestionRecord/correct.vue

@@ -110,11 +110,11 @@
 		get: () => topicList[questionNumber.value],
 		set: (val) => (topicList[questionNumber.value] = val)
 	});
-
+	
 	const showTouchBtn = computed(() => {
-		return topic.value?.qnsTyp === 'ES';
+		return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult;
 	});
-
+	
 	// 下面语音组件的禁用状态判断
 	const touchIsDisabled = computed(() => topic.value?.es_status !== '' && topic.value?.es_status !== undefined);