From 3d8dda7392775ebfded3a278581465d1f02b18c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Tue, 27 Jan 2026 16:56:58 +0800
Subject: [PATCH] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E=E5=90=89?=
 =?UTF-8?q?=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=5F=E5=BC=80=E5=8F=91=E4=BB=BB=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=A0=B7=E5=BC=8F=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 .../learningTasks/components/details-item.vue |  64 +++++++++++++-----
 src/pages/learningTasks/details.vue           |  31 ++++++++-
 src/static/images/learningTasks/button-1.png  | Bin 823 -> 613 bytes
 src/static/images/learningTasks/button-2.png  | Bin 613 -> 511 bytes
 src/static/images/learningTasks/button-3.png  | Bin 0 -> 823 bytes
 src/static/images/learningTasks/button-4.png  | Bin 0 -> 1020 bytes
 7 files changed, 78 insertions(+), 21 deletions(-)
 create mode 100644 src/static/images/learningTasks/button-3.png
 create mode 100644 src/static/images/learningTasks/button-4.png

diff --git a/.env.development b/.env.development
index 6e7704c3..c52baa16 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ ENV = 'development'
 #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # VITE_APP_BASE_API_Url = 'http://192.168.247.200'
@@ -16,7 +16,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # dev
 
 # DEV
-#VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
 # sit
 #VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
diff --git a/src/pages/learningTasks/components/details-item.vue b/src/pages/learningTasks/components/details-item.vue
index e53d7deb..67fc81a4 100644
--- a/src/pages/learningTasks/components/details-item.vue
+++ b/src/pages/learningTasks/components/details-item.vue
@@ -3,29 +3,30 @@
 		<!-- 箭头指示 -->
 		<view class="arrow-div">
 			<view class="big-arrow">
-				<image class="img" :src="statusOpen?bigArrow2:bigArrow1" mode=""></image>
+				<image class="img" :src="statusOpen ? bigArrow2 : bigArrow1" mode=""></image>
 			</view>
 			<view class="small-arrow">
 				<image class="img" src="@/static/images/learningTasks/small-arrow.png" mode=""></image>
 			</view>
 		</view>
 		<view class="idea-div">
-			<image class="img" src="@/static/images/learningTasks/idea-1.png" mode="aspectFit"></image>
+			<image class="img" :src="statusOpen ? idea2 : idea1" mode="aspectFit"></image>
 		</view>
 		<view class="mid-div">
-			<view class="title-div">{{ props.item.crsName }}xx{{props.item.status}}</view>
+			<view class="title-div">{{ props.item.crsName }}</view>
 			<view class="button-div">
-				<view class="button button-status-1">
+				<view class="button" :class="isFinishStudy.className" @click="item_click(item)">
 					<view class="button-icon">
-						<image class="img" src="@/static/images/learningTasks/button-1.png" mode="aspectFit"></image>
+						<image class="img" :src="isFinishStudy.icon" mode="aspectFit"></image>
 					</view>
-					<view class="button-text">完成学习</view>
+					<view class="button-text">{{ isFinishStudy.text }}</view>
 				</view>
-				<view class="button button-status-2">
+
+				<view class="button" :class="isFinishExam.className" @click="item_click(item)">
 					<view class="button-icon">
-						<image class="img" src="@/static/images/learningTasks/button-2.png" mode="aspectFit"></image>
+						<image class="img" :src="isFinishExam.icon" mode="aspectFit"></image>
 					</view>
-					<view class="button-text">完成学习</view>
+					<view class="button-text">{{ isFinishExam.text }}</view>
 				</view>
 			</view>
 		</view>
@@ -38,8 +39,14 @@
 </template>
 
 <script setup>
-	import bigArrow1 from '@/static/images/learningTasks/big-arrow-1.png'
-	import bigArrow2 from '@/static/images/learningTasks/big-arrow-2.png'
+	import bigArrow1 from '@/static/images/learningTasks/big-arrow-1.png';
+	import bigArrow2 from '@/static/images/learningTasks/big-arrow-2.png';
+	import idea1 from '@/static/images/learningTasks/idea-1.png';
+	import idea2 from '@/static/images/learningTasks/idea-2.png';
+	import button1 from '@/static/images/learningTasks/button-1.png';
+	import button2 from '@/static/images/learningTasks/button-2.png';
+	import button3 from '@/static/images/learningTasks/button-3.png';
+	import button4 from '@/static/images/learningTasks/button-4.png';
 	import { ref, computed } from 'vue';
 	const props = defineProps({
 		item: {
@@ -51,6 +58,24 @@
 			requset: true
 		}
 	});
+	const emits = defineEmits(['item_click'])
+	const item_click = (item) => emits('item_click', item)
+	const buttonStatusDict = {
+		'01': 'button-status-0',
+		'02': 'button-status-1',
+		'03': 'button-status-2'
+	};
+	const isFinishStudy = computed(() => ({
+		className: buttonStatusDict[props.item.isFinishStudy],
+		text: props.item.isFinishStudy === '02' ? '完成学习' : '去学习',
+		icon: props.item.isFinishStudy === '02' ? button2 : button1
+	}));
+	const isFinishExam = computed(() => ({
+		className: buttonStatusDict[props.item.isFinishExam],
+		text: props.item.isFinishStudy === '02' ? '通过考试' : '去考试',
+		icon: props.item.isFinishStudy === '02' ? button4 : button3
+	}));
+
 	const statusOpen = computed(() => ['01', '02'].includes(props.item.status));
 	const direction = computed(() => {
 		const styleArray = [];
@@ -63,14 +88,15 @@
 			styleArray.push('right');
 		}
 		// 00进行中、01已完成、02已超时
-		const isFinish = props.item.isFinish;
-		if (isFinish === '01') {
+		const status = props.item.status;
+		if (status === '01') {
 			styleArray.push('unfinished');
-		} else if (isFinish === '02') {
+		} else if (status === '02') {
 			styleArray.push('completed');
 		} else {
 			styleArray.push('not_unlocked');
 		}
+		console.log('styleArray', styleArray);
 		return styleArray;
 	});
 
@@ -268,9 +294,13 @@
 		}
 	}
 	.button-status-1 {
-		background-color: #63a1ff;
-	}
-	.button-status-2 {
 		background-color: #6baa1b;
 	}
+	.button-status-2 {
+		background-color: #63a1ff;
+	}
+	.button-status-0 {
+		// background-color: #8aa2c6;
+		display: none !important;
+	}
 </style>
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index 9116a818..47303386 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -31,8 +31,22 @@
 								<view class="time-div">
 									起止时间：{{ detailData.startTm?.substr(0, 10) }}至{{ detailData.endTm?.substr(0, 10) }}
 								</view>
+								<view class="fl1"></view>
 								<!-- 收藏盒子 -->
-								<view class="collection-div"></view>
+								<view class="num-item" @click="collect_click(detailData.collectionId)">
+									<image
+										v-if="detailData.collectionId"
+										class="collect-icon"
+										src="@/static/images/courseDetail/out_collect.png"
+										mode="widthFix"
+									></image>
+									<image
+										v-else
+										class="collect-icon"
+										src="@/static/images/courseDetail/in_collect.png"
+										mode="widthFix"
+									></image>
+								</view>
 							</view>
 							<view class="other-div-2">
 								<!-- 完成人数盒子 -->
@@ -58,7 +72,7 @@
 				</view>
 				<!-- 步骤 -->
 				<view class="step-list-div">
-					<detailsItem v-for="(item, index) in data_list" :item="item" :index="index"></detailsItem>
+					<detailsItem v-for="(item, index) in data_list" :item="item" :index="index" @item_click="item_click"></detailsItem>
 				</view>
 			</z-paging>
 		</view>
@@ -274,6 +288,8 @@
 			}
 			.other-div-1 {
 				margin-top: 6rpx;
+				display: flex;
+				align-items: center;
 				.time-div {
 					font-weight: 400;
 					font-size: 22rpx;
@@ -281,6 +297,17 @@
 					line-height: 33rpx;
 					font-family: Arial, Helvetica, sans-serif;
 				}
+				.num-item {
+					display: flex;
+					align-items: center;
+					font-size: 30rpx;
+					color: #666666;
+
+					.collect-icon {
+						width: 36rpx;
+						height: 36rpx;
+					}
+				}
 			}
 			.other-div-2 {
 				width: 100%;
diff --git a/src/static/images/learningTasks/button-1.png b/src/static/images/learningTasks/button-1.png
index 8038e886ae0bafd714bde3606f8948b8c7ef115b..deae00dfd645131c03a1c98b21a62ea8618d1d2d 100644
GIT binary patch
delta 588
zcmV-S0<-<M2IT~hB!4VPL_t(YOWl^ui;iIw#(!4~F&1MXX{=B_va*!?0h(l*HBpih
z3mYX1k;q1h#VmYotW4Ng3;)6RNZ5!dpM`0dT)L+F(d+TN?=w~=r=EJ>`#$Gf=lk3O
zu)PI11*`?;=B!4qft$b)NpFkH65u$n4OrSBGX*>X4oSK#+kZpAEkMAJ;5G=&DQ7Q$
zk-~c&SYFN}SEuO97kxtkdH}48wZLgf-|G^#R{&RlO+a<u2iygAN_yTPGcVo%$AIww
z#l=|MFX?N8Wz$Etqxd9npzxdp4mTNA>9E}od<LchRE4TfQb2o>?L}db6a{U(G45OJ
z{A-{#<(>B>3V;6?$oAeOxKvE1fzN;)Rd{Wu4Xy$!YhET5mn4n$^vHJlWotu-z5s)g
zK9%Aa0A2zM8+dO>8g2tx0IX^7=#`{2?k}>v49NG}G4NQ@#H`8DeqdLFN8^&Vcl1a~
z_ga@6U6gdLEp%hRa6{bRB}`R=+D?u#lBWBrMq`pj+JAuN1FO2^=zT3m8LahznyPy$
zX>xYt=x;i|jrafeC_^u$I#6|eTS#VlUn=uMCU~azePCl*Y-fPU21RcqMc@yzy|~LN
zPxT(md<5<VXhVJg89lw|4zN#BHgXo>df+^;xkYXwn>jl@LaTwJJsu~62`!Mpx~KHm
zXtpx&u|*8mI$oCO!|0XtWE!ZAY-d8p`mB#mx?H^M`UI$$X9QF++uogbLiv9}(uFo7
atNWjOFGSXHIBCED0000<MNUMnLSTY__!r#(

delta 800
zcmV+*1K<4R1h)o|B!B)%L_t(YOQn`s$W37wg`XuvghZwbE)0d@#u#xyriAz@65+~_
zp$t)?xDblClgM~MNr*B=W^T-6Dv}{%iilUMzWuiy=ltj3t=+DDzP;9d*So&;9q}I(
z5dww+=Oulr3Cauqxgw$ia36RCjF9x86xd%AMMOQI56}QO0)NZ~HUJ-hF_O*}BP&ak
zfO`W2)71+wnQJF7-2}jn^lXNtU4>*Ni6UYyFd8sP2K*fG7yB9o3<Hh<<A9#P0iY4E
zQqsyiSy7^h=m(qwo&u*ca7mA|mm{JMupO8PT=k5A*1%DqRqA%Cq@RAL6wzv65zs=?
zyHW#AuG<LA0e@@+J1|n0HcC55&uSvN4t$n0pb|?)#ByK-@G{A1(l(MFX7B&eQAD%^
zUI2?Ft*wN}Ya(JMunD*)sY_WiM8uS&eP>B`6G#(a8{iJz?X*mi+|23%Z-FzCMpi<!
z7w93WeGX(P;JIbBPty22SVRm0jsv#$)*6W-q89KP*ncHyUXEx@GDr64aN$=+#CpJ6
zqO~Mr{8qosC?dRPE&_ukok+5E0uBPcyDVpwq}v4@-LZ6%`WKsPA(5RkA80P=TSN>8
z_5cpdv9_?JkA*-H(GGY5ER?ja5~54MGf7nuu>@F^IvgkIRWX2wXlw#t8PFkb>HPZY
zjv}I2+J6V$e0J9aV2eZ3-R0)h5$KzO)!}L@d$w03IR}eYp2$(M+Z_SkOE!Ze#u;Wn
zgL{VlAlGN$8gMyX$0hk$St6(J<h1Gr@Ezy|)CQba_W(<q0pF7JqZDvS*F}VrxlLMN
zduD*XTb7b1Xp-HVv@P&How)9{y7JO_A1nYa0Dn_T4Yk11mUC7*CY%fo)C|+AERb~4
z?-bg5QaUXiIfs%NPDrwh&a?V}2kw;ivCtK;e20O}j-NEcs^mgDvY{m|7OMWyd&wc$
z9Qcyl=)<o?a+rB<0{c^nRG(8hcQysOOFH#OM+LH2iXq8uCin`x0W8U7NuFuNRrWta
e#TiIt7XAY1ff*>a?bBZX0000<MNUMnLSTYIYHR5L

diff --git a/src/static/images/learningTasks/button-2.png b/src/static/images/learningTasks/button-2.png
index deae00dfd645131c03a1c98b21a62ea8618d1d2d..1d72eaa5d2df598c75455935e2acde53069382fe 100644
GIT binary patch
literal 511
zcmV<b0RaAqP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0005TNkl<ZNK4(8
zze|@<6vjV~1qqViP~zxfv=k~~;$*vn>5x-n&{A{%LbQqE6e>iE)SwP2Vo>Vf)|f&?
zKTP}wBJGLu<tozm#qR6-b@9&UJkPo3Joh<Qwyy)vfnMMu)sBI0z!OQc0VUfTKwmZ7
zy6oRTm!wZYun$}SUI1?^614(P6UMNl*Fg~1it|v?WEBG2SAm}iV^q@IIV7;%47>+=
zGTL<jj7xePu~{v$-41*$A=ynyx3URR;BDYW<_(r4eMxy&fZddLSJJCS4_UxG&<Wg;
zw9`<6q8pzHf$b2;H1MvDAVWo4K)<BDqKXsvGSCL>6%qVTMe*`)O8W3Gf$cENr3C&9
z7%6O#?UPirC21uCJgj2A^bBnG1NVVvl0GJR)>keq9NKj$v$Gx54+1|zia<+UTN3zb
z2}XgJ$>Mi_OUHW-tOJ)NeLfXIYRMQdbIeX^0|njy0UR&7CxlRX28YA7eGiDW7=||@
zX(7w(GW_Q##P&5{U($At**yZL$`BO9#zw0dA8@qMz5^W<fs4`yB(22^9sm<SQv*pB
zfgwqM!d_z&#owsA#F9CwmRMG+0bY}71FJ5C`U~9a7w-E)EY$!2002ovPDHLkV1jFd
B-v0mq

literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R0006kNkl<ZNK4(8
z&5Mp<6vls73^5jCA!)2oKC-fu`~jL|nl(|95(^t83z5i1ip4B^Zmdk$SPTEb_(<4@
zD4&ICm|VK1`_b$1yzetsCa0cy-}^r2T<81T0<gUWI0dW)=H{$MuYsGu5lL^0%o5-@
zunkz+ATtF#0uD*KE!#uDEkMAJ;5G=&DQ7Q$k-~c&SYFN}SEuO97kxtkdH}48wZLgf
z-|G^#R{&RlO+a<u2iygAN_yTPGcVo%$AIww#l=|MFX?N8Wz$Etqxd9npzxdp4mTNA
z>9E}od<LchRE4TfQb2o>?L}db6a{U(G45OJ{A-{#<(>B>3jY|$_TD78R7|IV&ww3O
zcx|T*t^zA-UM3ZnB#rj;$aeZ=YeR^>0E3b~mEsrxUIGgncyCA=ZUb5XtZDG*m83N8
zFS5N1$oJbZ@L1BstjW=SU{`}j<C3;_^hiqgT9+JMlyt5wbYsA9L)_mbOjU#0PL48?
zru(W!W0FSNfaU|My5#76Ek_xw^?{nIdn##icI4=9I=_wg|Mw_EFQqzAb$we%W_n*L
z^Ft<hruThdV_9rxfXN0$ZzM(F53;?u%PLRx9?X0M?geN=egGLgz32|GPf|8=7U6o}
zJg~V%ZX%mGJ3T_HfulVhCxZzskiojA^w?;&GVrks*E(L7=)>rh^kf>SjcjK^$NH>~
zPP$yY?D_<#m}dl3G27mqcS8ApLehmcBdhzLdoM)RaX4wf00000NkvXXu0mjf7C;$!

diff --git a/src/static/images/learningTasks/button-3.png b/src/static/images/learningTasks/button-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..8038e886ae0bafd714bde3606f8948b8c7ef115b
GIT binary patch
literal 823
zcmV-71IYY|P)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00091Nkl<ZNK2)b
zS;$Rc7=@oDM1(}93oZ<W;>H+pL8gTGDH7qzkf97wqPP%>xRc0uK}m=*MrLlzWGa#&
zV~U7ZtG@lW9q0V#;H}-ReZIZce%HIc^&Rma6%hi40_P=tstL*q|G6Tf18^UB1dNdM
zpcL3&6GcQlpbyXhI0DQDHUJ-hF_O*}BP&akfO`W2)71+wnQJF7-2}jn^lXNtU4>*N
zi6UYyFd8sP2K*fG7yB9o3<Hh<<A9#P0iY4EQqsyiSy7^h=m(qwo&u*ca7mA|mm{JM
zupO8PT=k5A*1%DqRqA%Cq@RAL6wzv65zs=?yHW#AuG<LA0c-?2FjAK`N;^r<Y9hK0
ze3mqz5=%zJa$p7UGRbMuHj*A@@Bh(JM6?860E;E9t%S&HB4Q@63AiVzOIb5S#FV6c
zXGwPxNE2Wi;11pGv`muR%<2MffisduRzkEF=pm_n4rD3dxn;Fa()c`BL<|Cs1Ge|p
z8i^vJ7VsL_C23xcXiYLl_ULfoS4YHpz+0lVBxC$mzs)Ejyk{-~gC(6vvULIu0=~N}
zXO*Pe1s&b7bdvfPn`<GFoiiV3F6moD3<vfA4$QH(u%wTLKoQXncmgbxw5}4OOTaTp
zRS~fSSd}^)C+Sr&fQV>p0$>@?A#dsY`s$7%qFLGp-h6h~1YnCp)7|Cf)e-2Mg4N+_
zD|@zABsm9*R-VXFvfCX2-b*%vBgPqKK!baR{vg+9;2Ll_UB@N)Sy>{d@8q=V2Jju|
z2Gj<eSN8x*n*raF^rIATN!LY$letY=V0&hOzFU@(Cuox0o3t(PKApJkwz~4tc^@nQ
zE&x+X4Yk11mUC7*CY%fo)C|+AERb~4?-bg5QaUXiIfs%NPDrwh&a?V}2kw;ivCtK;
ze20O}j-NEcs^mgDvY{m|7OMWyd&wc$9Qcyl=)<o?a+rB<0{c^nRG(8hcQysOOFH#O
zM+LH2iXq8uCin`x0W8U7NuFuNRrWta#Yklq{sQTN87Q{x(_a7p002ovPDHLkV1hcN
BY_k9W

literal 0
HcmV?d00001

diff --git a/src/static/images/learningTasks/button-4.png b/src/static/images/learningTasks/button-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..72ad8334129577b125322bcbfdb80f0ff9758e07
GIT binary patch
literal 1020
zcmV<Y0|WetP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I000BSNkl<ZNK3_+
zTd0*)6otQ$nOcY@NtRMcCRjlf_RxhgjOZc5Zbp(|K|Rz%C{ZCobb}r$qClynD0;9P
zWds#e6lgcQphB8PltmY!w7is5ju?maZ~n9Q+5UU)f)*S&XYaMvm~+fA$6QDJPfK-N
z+hc%Zfy01<28iiz;1@~To6fd?ZJ!G~1xyCU0>gr8x~P1=ANU>E0$e8P>u%?UF1MZR
zz6Fjd2lwUU9>MC{a$ndQ4Xl=QRTJ<GU?Y%-XG!{I0MIId+kkt3?<7ra0zMV^7}zOk
z(jcJK8QZ4;>w#U8CN=?QbAWeLz_t$t#uv&%VW_X_-d=|Nl71^?I|cXz*ez+oAi(d1
z_HwWZcoeWg(yg|q1KWT-g92{=j_*<3Vc=0oOH0=00Y6CEJV?e-=aD_CJEGh!spn3p
z+9@^uXb^GPJ{q_Hm;xLc0|CO;T1kI4W!$%_ZAV0R0Oyz9tz-NJ`~=(!JSHioGHg{D
zcL3Xd9GC+f4!jS{lave7uh#$%7r>a!m%s<WuSFMU0aYul0~Sd7zTIhZQ3utwvoZ8#
z{ShmbwA=R8z!N}}{1&iG(uZxHAIh%>ZZ84EoaRW{QSCcW#wP$LmyMeweNpIr7Z?Y;
z2wYjQFj6gThsiJz3w=(~f=1vj7p(y<2HpfNYyh1JgtghgYvsPVlGf(;t{Jxj+m7#U
zEfk;APH!94*G5#p%aSg!{VZ?=uu{?ub>PN!DuRmOHcL9OTbtOfK$Fysl2+Qj6nMT2
zj%od7ysS)}CnYT|>W-zxIQEpk>!7zty03g52aLed6;mV9o(;tIUBGhSAxSscJ_*=V
ze&&|ihu+-T0xiIC!1#BZZKk9j`>F8~-~r$jN%L%Ha;3jR`&Ym*BY_s+m`z6IUf_s`
zvLE1N^*WI8H%-!B+sP!o9Pnf_EYnH{wlh5LPoR>{=(om)0C__NY^kINYc#F^-iVM!
z=!Td{>YF;>EGYrB+9?r#TB1H(Qfk++Y=`a~j5W@e^iDT**Rp*CxGrNd%t+c<2hIrm
zJc`SNDnh7FmRBX+Z9CD2?z4+IER^(immstE>3Dqkevzcr!<?&7b~&&L80oo^U?yeW
z+D;$FiK6NZh?nxBEOe%=GA5&k7{zfw61Y=R9)PXY{-BRC&#b+*s=>ZqQtC9cZ0A9k
z*0~5s?XxeVFAw^>$>YsgvCJiso@r-gkVkv#j`B~y!qUT`b|^03GvI|VC@FgASpN#R
qep~75fd71;;n7j!CUyST-~R*M;lVCd*cq+>0000<MNUMnLSTYKKjlyW

literal 0
HcmV?d00001