Merge branch 'develop' into 'sit'

Develop

See merge request K17_AITS/tra-app!118

.env.development

@@ -15,21 +15,20 @@ 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
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 # sit
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
 
 # UAT
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
 
 # 任东
-# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
-# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
-
+VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
+VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
 
 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604'
 # 张建成

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;
 	});
 
 	// 答题卡判断每道题的状态
@@ -325,7 +326,7 @@
 		}
 		// 记录起始时间
 		examinationStartTime = new Date().getTime();
-		paperData.crsId = examination.crsId;
+		paperData.crsId = examination.crsId ?? '';
 		paperData.execId = examination.execId;
 		paperData.examId = examination.examId;
 		paperData.papersId = examination.papersId;

src/pages/index/components/history.vue

@@ -28,6 +28,7 @@
 	const historyPopupRef = ref()
 	const historyList =  ref([])
 	const open = () => {
+		historyList.value = []
 		openFeedback(true)
 	}
 	const close = () => {

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);