From 7975afc065ac6ed335ecaa4ea80729346bf765eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Thu, 21 Aug 2025 15:02:13 +0800
Subject: [PATCH] 1

---
 .env.development                              |   2 +-
 certificate/ios/jiaixuedev.mobileprovision    | Bin 12217 -> 12298 bytes
 src/components/examination/subject.vue        |  54 ++++++++++--------
 src/pages/examination/result.vue              |  23 ++------
 .../learningTasks/components/list-item.vue    |   5 +-
 src/pages/learningTasks/details.vue           |  49 ++++++++++------
 .../components/favorites-course.vue           |   3 +-
 7 files changed, 74 insertions(+), 62 deletions(-)

diff --git a/.env.development b/.env.development
index 015f8308..5c9bc531 100644
--- a/.env.development
+++ b/.env.development
@@ -27,4 +27,4 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 
 #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_TRASTUDY = 'http://25.64.16.138:9602'
diff --git a/certificate/ios/jiaixuedev.mobileprovision b/certificate/ios/jiaixuedev.mobileprovision
index e3cc651ade3e5ccf8c383502fa797db0727ec96d..f72974ab7ac14880b9b9e4fa79cadd68485796cb 100644
GIT binary patch
delta 859
zcmdlP-<4oz&}6{I#;Mij(e|B}k)3Hllm2&uCjHM$jEsid2ApiH+I-ARQmhOHO$x#Y
zWsD1&6j)fA6c{$zMKf|68HN~`Ss9yK85(R}!nlt^Ix;ZQ%R4{HGovio&oMCBIp5RM
zFEq>9*(KCuaxIsfVnx2Yb8w-1uxFC7OQ5TVW1_ROV|lS_db+QNZ=|P-W7Xt6TywcA
zeM20Le5;ZxeBCCeaQkq1R`|L^R{2%AmQUWrecQmuH!IZC*FDrEGSe`_FT^X`CnP94
z$~~|oGQ_vi*V({0vMM9jH_O$?-zBsnD$8~9QJx?s_vFcvywXfgL6gmRJ>*@Svdev4
z9LxP(T+4lf4S;MXH{Yxb7vB(HBj0S-&6T|BJZ$OZ>FFM!o0mzlF(Nx*n^cgFW2JXy
zRAzvOXJD9%xodKHMwW|9fsea!SVg&GL~u??Qk6k*P)??gp;J`WWE1JeL{DGWNN3ML
zmr&oTQWG<uVoTpp!wm0Yvye*jLW__T^Qr=U=j8mXGRxA6q`;`mia?`s&kRR@Pm7R>
z3ddAmU+=I~zp99ew6t8`;L<WP)8e!&cf(MBe?Lddh(K>|Pq)otGG|aCWb#|t-IJ^3
zM7RuGjVzoEjm?Z4C(o37qhe-cYH5&ak))ewYLudDl9H05n`mrgplhCNk!ECQW?^cW
zX1IB!d;p)Gk)eT^vALl^lz}ol0dTSyim`~8e~eq}^n&N=tOoI8cQ;R|6+hkna<aPK
zq<RB|JzR>foFxVFihnmt``Tz~-f^$>xN4_+aqhc%KNqP9Ivg)r4_bd(P`jw`?c7w8
zioB@B#S`8Xm)9<xC9w9M%C!R*`CJ~~Y~1ntf=ycQ58uSz?XO=r3#eN$ypv%M{id$7
z&ERYLnj_hnmhl%?e{}2X-h3iqdF`cqwp)QS7rf-DzoIVKCC?~wccZ5|&%_hASDoEu
z8_(i>`^Lx2`)5y`RLwkY%%~i<^qY*=)_n;azE0QlI9=!MwyD~<AthcaZ}-%_Rykiv
zR95jdt@g0A+Vyp=-`C0IURPt6U7j2eBp1sW`YCvM*U2Bx7HSABYMsp~C~LSmU;k{)
Sg2(G0ty<IK<@22B^bG*DjyoX$

delta 812
zcmeB5*coqU(4@bWjZ>@5qwPB{BRkWACjDhVp+!uLjE39>oNTPxe9TNztPBQC@`n)0
z7#B3jZ)RzdU%$~VnvvVUJjB4#%EZXZ$awP-#(f;pL4lE8-uY3U8D+_Sj)BR}`JSGB
zep$}WE+L+iYq{hU%PicTgA3h*J(G-G0$n{E6P=wM%N$+P(|wA4BR!qXTqf_~n#*18
zSLJBx=i*uEYdATD+lR~1*w-c7z&FdYYVt1b+Xklo?x7}r;a=Ikl?Dd>;l2hwAwd~H
z6(x~bjwVsThB<ylp~g`zk>$SOfhJM8p_7mD1TndmPnP7BW^y!|Y{u)cc@eJ?4_k71
zdb&r*=2MbvjL25pk_yssE=Y9r@YJ^~Nh}S>FG}{&4=&IS$jyr?EGo?`k1Q=M&9Btf
zH}Q{3D>ihQ93kD9=;7-c>g?$n5a?2nS>kV;Z<Ji&W1#O=VP2#knG_V{8IYXeZD#3}
zXOZfY6`mL9Zs3^d>S$0{Z070X7g`=s8jxg>=WgceVw96pQd*o8l<8JcR_T~$lv!Ek
zQXXQOZoAn^<_t=JPZpHhJ^82HT@_1<R14Fj6k}Zz%VZN>lSBhc-6R8xRNYkbRPz)w
z1H%-HwA9VN<OBHh49pEIO^l3;qYRYcG0MqeD8?cZSFCzj{cWd3yyNW}eHF0}SAV|d
znOvbaslM${<?qRR7AAiGS$wVhRE3h4*zZu*H>>|DUU;x4@W@Q=DQ#5~gKw@nyqh7x
zIm4<r$4lXpqLs{SUA;TKXWTUQ9@;<o0B^>vC$R~EmIcLSehV4CWJP*L1eP&=_`G>F
z+s<d6ReMBcOul+@W9h;l^PcuTe|AlkH>6Lu>excJdu!N5>bIMRzCAwaQUBGSmaTH;
zMaSG!-L{-uo7VK-w&&K=o-YTZ8ch}`PrY~ggzNq*46hEp<S~&s{_8}v(vI_iSG{jc
zk(i@<_o-Olte7izPpimYpYtX?U8;NilRMhCXY|ebV!!F?9kKAtM=>cEe*E@)B6#7*
Y-<c~+=P;bvveV(QzKqv`Ql<u50M_m~1^@s6

diff --git a/src/components/examination/subject.vue b/src/components/examination/subject.vue
index 7dc8587f..68ee2a94 100644
--- a/src/components/examination/subject.vue
+++ b/src/components/examination/subject.vue
@@ -2,7 +2,7 @@
 	<view class="item">
 		<view class="top">
 			<view class="type">{{ subject_type_text }}</view>
-			<view class="score" v-if="[''].includes(props.mode)">{{ item.tgtGrade }}分</view>
+			<view class="score" v-if="['settlement', 'examination'].includes(props.mode)">{{ item.tgtGrade }}分</view>
 			<view class="fl1"></view>
 			<view class="right">
 				<!-- 反馈中心 -->
@@ -14,9 +14,9 @@
 					></image>
 					<image :src="feedbackIcon()" class="img" @click="feedback_click()"></image>
 				</view>
-				<template v-if="[''].includes(props.mode)">
+				<template v-if="['mistake'].includes(props.mode)">
 					<view class="right_text">展开</view>
-					<uv-icon class="arrow-icon" name="arrow-right"></uv-icon>
+					<uv-icon class="arrow-icon" name="arrow-right" color="#0066FF"></uv-icon>
 				</template>
 			</view>
 		</view>
@@ -52,17 +52,15 @@
 				确定
 			</uv-button>
 		</view>
-		<view class="analysis_div" v-if="!clearResult && ['study', 'mistake'].includes(props.mode)">
+		<view class="analysis_div" v-if="!clearResult && ['study', 'mistake', 'settlement'].includes(props.mode)">
 			<view class="analysis_title">
 				<view class="success_answer">正确答案：{{ correctResultLabel.join('') }}</view>
 				<view class="your_answer">
 					你的答案：
-					<text class="red_color">{{ myResultLabel.join('') }}</text>
+					<text :class="right_or_wrong_class ? 'success' : 'error'">{{ myResultLabel.join('') }}</text>
 				</view>
 			</view>
-			<view class="analysis_note">
-				题目解析：{{subject_data?.analyContent}}
-			</view>
+			<view class="analysis_note">题目解析：{{ subject_data?.analyContent }}</view>
 		</view>
 	</view>
 </template>
@@ -77,7 +75,7 @@
 		backgroundColor: '#0066FF',
 		border: '1rpx solid rgb(12, 123, 245)'
 	};
-	
+
 	const emit = defineEmits(['subject_click']);
 	const props = defineProps({
 		modelValue: {
@@ -92,8 +90,8 @@
 			type: String,
 			required: true,
 			validator: (value) => {
-				// 考试: examination  练习: practice 错题本: mistake  学习: study
-				return ['examination', 'practice', 'mistake', 'study'].includes(value);
+				// 考试: examination  练习: practice 错题本: mistake  学习: study 考试结算页 settlement
+				return ['examination', 'practice', 'mistake', 'study', 'settlement'].includes(value);
 			}
 		},
 		// 是否预览模式
@@ -105,13 +103,13 @@
 		clearResult: {
 			type: Boolean,
 			default: true
-		},
+		}
 	});
 	const modelValue = computed({
 		get: () => props.modelValue,
 		set: (val) => emit('update:modelValue', val)
 	});
-	let answerText = props.item?.my_answer
+	let answerText = props.item?.my_answer;
 	const item_answer = ref(typeof answerText === 'string' ? answerText.split(',') : []);
 	const feedback_click = () => {
 		emit('subject_click', 'feedback', props.item);
@@ -130,12 +128,18 @@
 		const anserResultArray = props.item.anserResult.split(',');
 		return subject_data.itemVos.filter((res) => anserResultArray.includes(res.itemId)).map((res) => res.itemNo);
 	});
+	// 判断选项是否完全正确
+	const right_or_wrong_class = computed(
+		() =>
+			correctResultLabel.value.length === myResultLabel.value.length &&
+			myResultLabel.value.every((res) => correctResultLabel.value.includes(res))
+	);
 	const subject_data = reactive({
 		qnsId: props.item.qnsId,
 		qnsContent: props.item.qnsContent,
 		qnsTyp: props.item.qnsTyp,
 		analyContent: props.item.analyContent,
-		itemVos: (props.item.itemVos??[]).map((res) => ({
+		itemVos: (props.item.itemVos ?? []).map((res) => ({
 			...res,
 			correctFlag: props.clearResult ? '' : res.correctFlag
 		}))
@@ -212,18 +216,20 @@
 			justify-content: space-between;
 			align-items: center;
 			margin: 32rpx 0 28rpx 0;
-	
+
 			.success_answer {
 			}
-	
+
 			.your_answer {
-			}
-	
-			.red_color {
-				color: #f5212d;
+				.success {
+					color: #15b859;
+				}
+				.error {
+					color: #f5212d;
+				}
 			}
 		}
-	
+
 		.analysis_note {
 			font-family: PingFangSC;
 			font-weight: 500;
@@ -272,11 +278,13 @@
 
 				.right_text {
 					font-family: PingFangSC;
-					font-weight: 600;
+					font-weight: 400;
 					font-size: 28rpx;
-					color: #333;
+					color: #333333;
+					line-height: 40px;
 					text-align: left;
 					font-style: normal;
+					
 				}
 			}
 		}
diff --git a/src/pages/examination/result.vue b/src/pages/examination/result.vue
index 234a4913..0c9a0bf9 100644
--- a/src/pages/examination/result.vue
+++ b/src/pages/examination/result.vue
@@ -3,7 +3,7 @@
 		<nav-bar :is_seat="true"></nav-bar>
 		<view class="nav-div">
 			<view class="title ellipsis-text">考试结算</view>
-			<view class="back_div">
+			<view class="back_div" @click="common.navigateBack()">
 				<view class="back-icon"></view>
 			</view>
 		</view>
@@ -116,25 +116,8 @@
 					<image src="@/static/images/examination/getting_robot.png" mode="widthFix" class="img"></image>
 					<view class="tip">你的等待会有更精确的结果，要耐心哦~</view>
 				</view>
-				<!-- <view class="top">
-					<view class="type">单选题</view>
-					<view class="score">5分</view>
-					<view class="fl1"></view>
-					<view class="right">
-						<view class="right_text">
-							展开
-						</view>
-						<uv-icon class="arrow-icon" name="arrow-right"></uv-icon>
-					</view> 
-				</view>
-				<view class="text">属于商业银行风险管理“三道防线”的哪些风险管理部门，为什么？</view>
-				<view class="additional_div">
-					<RadioSubject></RadioSubject>
-				</view> -->
-				
 				<view class="" :id="'id_' + index" :class="getStatusClass(index)" v-for="(item, index) in topicList">
-					
-					<topic-display :item="item" mode="mistake"></topic-display>
+					<Subject :item="item" mode="settlement" :clearResult="false" :isPreview="true"></Subject>
 				</view>
 			</view>
 		</scroll-view>
@@ -145,6 +128,8 @@
 	import { onLoad } from '@dcloudio/uni-app';
 	import { ref, reactive, computed, onMounted, nextTick, getCurrentInstance } from 'vue';
 	import { queryPaperExamScore } from '@/api/examination.js';
+	import Subject from '@/components/examination/subject.vue';
+	import common from '@/common/common';
 	const pass_status = ref(0);
 	const sheet_swiper_index = ref(0);
 	const result = reactive({
diff --git a/src/pages/learningTasks/components/list-item.vue b/src/pages/learningTasks/components/list-item.vue
index b5b49f9e..f1d07fc0 100644
--- a/src/pages/learningTasks/components/list-item.vue
+++ b/src/pages/learningTasks/components/list-item.vue
@@ -4,7 +4,7 @@
 			<view class="item" :class="getStatusClass(item.isFinish)" v-for="(item, index) in data_list" @click="click_item(item)">
 				<view class="img_div">
 					<image-preview class="img" :src="item.ossAddr" mode="scaleToFill"></image-preview>
-					<view class="subscript" v-if="item.isFinish === '00'">进行中</view>
+					<view class="subscript" v-if="item.isFinish === '00'">未完成</view>
 					<view class="subscript" v-if="item.isFinish === '01'">已完成</view>
 				</view>
 				<view class="right_div">
@@ -147,7 +147,7 @@
 			}
 
 			.blod_color {
-				color: #0066ff;
+				color: #333333;
 			}
 		}
 
@@ -223,6 +223,7 @@
 				flex-wrap: nowrap;
 				height: 23rpx;
 				overflow: hidden;
+				
 			}
 
 			.people_progress_div {
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index 587bab39..0675ef69 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -69,32 +69,38 @@
 					</view>
 					<view class="content_div">
 						<view class="status_div">
-							<text v-if="item.status==='01'">进行中</text>
-							<text v-if="item.status==='02'">已完成</text>
-							<text v-if="item.status==='03'">未解锁</text>
+							<text v-if="item.status === '01'">进行中</text>
+							<text v-if="item.status === '02'">已完成</text>
+							<text v-if="item.status === '03'">未解锁</text>
 						</view>
 						<view class="main_body_div">
 							<view class="title">
-								{{item.crsName}}
+								{{ item.crsName }}
 							</view>
 							<view class="button_div">
-								<template v-if="item.isFinishStudy==='01' && item.isFinishExam==='01'">
+								<template v-if="item.isFinishStudy === '01' && item.isFinishExam === '01'">
 									<image class="img" :src="lockIcon('#999999')"></image>
 									<view class="button_text">暂无通过条件，可自动解锁</view>
 								</template>
-								<template v-if="item.isFinishStudy!=='01'">
+								<template v-if="item.isFinishStudy !== '01'">
 									<image class="img" :src="passTheExamIcon('#0066FF')"></image>
 									<view class="button_text">完成练习</view>
 								</template>
-								<template v-if="item.isFinishExam!=='01'">
-								<image class="img" :src="completeTheExercisesIcon('#0066FF')"></image>
-								<view class="button_text">通过考试</view>
-								
+								<template v-if="item.isFinishExam !== '01'">
+									<image class="img" :src="completeTheExercisesIcon('#0066FF')"></image>
+									<view class="button_text">通过考试</view>
 								</template>
 							</view>
 						</view>
 					</view>
 				</view>
+				<list-no-data v-if="total == 0 && status == 'nomore'"></list-no-data>
+				<uv-load-more
+					v-if="status === 'loading'"
+					:status="status"
+					loadmore-text="轻轻上拉加载"
+					:height="30"
+				></uv-load-more>
 			</scroll-view>
 		</view>
 	</view>
@@ -102,7 +108,7 @@
 
 <script setup>
 	import { onLoad } from '@dcloudio/uni-app';
-	import { reactive, computed, nextTick } from 'vue';
+	import { ref, reactive, computed, nextTick } from 'vue';
 	import { queryAllTraTaskCrsInfo } from '@/api/learningTasks.js';
 	import { passTheExamIcon, completeTheExercisesIcon, lockIcon } from '@/common/imgSvg';
 	import { insertTraPersonalCollectionTask, deleteTraPersonalCollectionById } from '@/api/favorites.js';
@@ -117,8 +123,14 @@
 		finishCrs: '',
 		sumCrs: ''
 	});
+
+	const total = ref(-1);
+	const status = ref('loading'); // loadmore - 加载前，loading - 加载中，nomore - 没有数据
 	const data_list = reactive([]);
+
 	const getData = () => {
+		status.value = 'loading';
+
 		queryAllTraTaskCrsInfo({
 			taskId: detailData.taskId
 			// taskId: 'TASKINFO02506401613920250820161715000008095'
@@ -126,13 +138,18 @@
 			.then((res) => {
 				data_list.push(...res.body);
 			})
-			.finally(() => {});
+			.finally(() => {
+				total.value = data_list.length;
+				if (total.value === 0) {
+					status.value = 'nomore';
+				} else {
+					status.value = 'loadmore';
+				}
+			});
 	};
 	const scrolltolower = () => {};
-	
-	const item_click = (item) => {
-		
-	};
+
+	const item_click = (item) => {};
 	const collect_click = async (collectId) => {
 		console.log('学习', collectId);
 		try {
diff --git a/src/pages/wrongQuestionRecord/components/favorites-course.vue b/src/pages/wrongQuestionRecord/components/favorites-course.vue
index db6f3547..a9626655 100644
--- a/src/pages/wrongQuestionRecord/components/favorites-course.vue
+++ b/src/pages/wrongQuestionRecord/components/favorites-course.vue
@@ -4,7 +4,7 @@
 			<!-- <view class="item" :class="getStatusClass(index)" v-for="(item, index) in data_list">
 				
 			</view> -->
-			<topic-display v-for="(item, index) in data_list" :item="item" mode="mistake"></topic-display>
+			<subject v-for="(item, index) in data_list" :item="item" mode="mistake"></subject>
 			<uv-load-more v-if="total != 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
 		</scroll-view>
 	</view>
@@ -18,6 +18,7 @@
 	import { ref, reactive, onMounted, nextTick } from 'vue';
 	import { queryTraCrsBbsInfoByCrsId } from '@/api/courseDetail.js';
 	import { queryTraMistakesCollectionPaging } from '@/api/wrongQuestionRecord.js';
+	import Subject from '@/components/examination/subject.vue';
 	const getData = (from = '') => {
 		if (from == 'first') {
 			if (total.value !== -1) {