From 41fdcbc80edc9cc6eac1f46c46806fca519ae4e2 Mon Sep 17 00:00:00 2001
From: xiaoxu <250360192@qq.com>
Date: Tue, 27 Feb 2024 18:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=94=E9=A2=98=E5=AF=B9=E9=94=99=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/s-video/s-video.vue |  36 ++++++++++++++++++++++++++++++---
 components/tabbar/tabbar.vue   |   3 ++-
 static/images/icon-err.png     | Bin 0 -> 1335 bytes
 static/images/icon-ok.png      | Bin 0 -> 1333 bytes
 subpkg/list/list.vue           |  19 ++++++++---------
 subpkg/role/role.vue           |   5 +++--
 6 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 static/images/icon-err.png
 create mode 100644 static/images/icon-ok.png

diff --git a/components/s-video/s-video.vue b/components/s-video/s-video.vue
index d637bac..028d2cf 100644
--- a/components/s-video/s-video.vue
+++ b/components/s-video/s-video.vue
@@ -11,6 +11,8 @@
 					<view class="anitem" @click="nextQuestion(item.outs[0], item)" v-for="(item, index) in answerList">
 						<image class="animg" src="/static/videos/skin_bg_1a.png"></image>
 						<view class="antxt">{{item.channel}}</view>
+						<view class="judd jdok"><image class="judimg" src="/static/images/icon-ok.png"></image></view>
+						<view class="judd jderr"><image class="judimg" src="/static/images/icon-err.png"></image></view>
 					</view>
 				</view>
 			</view>
@@ -205,20 +207,48 @@
 	.popup-layer .anitem {
 		position: relative;
 		margin: 80rpx;
-		width: 300rpx;
+		width: 600rpx;
 		height: 100rpx;
 		text-align: center;
 	}
 	
 	.popup-layer .anitem .animg {
 		width: 100%;
-		height: 100%;
+		height: 160rpx;
 	}
 	
 	.popup-layer .anitem .antxt {
 		position: absolute;
-		top: 30%;
+		top: 60%;
 		width: 100%;
+		font-size: 1.2rem;
+	}
+	
+	.judd {
+		position: absolute;
+		top: -20rpx;
+		right: -50rpx;
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50%;
+	}
+	
+	.jdok {
+		background-color: rgba(3, 173, 55, .35);
+	}
+	
+	.jderr {
+		background-color: rgba(249, 21, 43, .35);
+	}
+	
+	.judd .judimg {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		-webkit-transform: translate(-50%, -50%);
+		transform: translate(-50%, -50%);
+		width: 50%;
+		height: 50%;
 	}
 	
 
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index d904f11..5eed012 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -121,10 +121,11 @@
 		font-size: 24rpx;
 		font-family: Cochin, serif;
 		font-weight: 900;
+		color: #969696;
 	}
 
 	.TextColor {
 		@extend .Text;
-		color: #d81e06;
+		color: #2d78ff;
 	}
 </style>
\ No newline at end of file
diff --git a/static/images/icon-err.png b/static/images/icon-err.png
new file mode 100644
index 0000000000000000000000000000000000000000..00b5014822ebed36ca4bf583a309477ca4de10a5
GIT binary patch
literal 1335
zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^1|+TAxeoy;$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVya+nsb^?r
zY+`AtqhMrUXrXUlp>JrcYiMR=Vqj%tqyPm<K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*8A=6l#_V8sV9F
zDf#8anqWP?zE+-j#U+V($*G<$wn{)#^fEJ3tSn4i4NcuFja*Dk%?%A*T`imp3@nUY
zOq|>t9gQrVjbVCS@{>z*Q}aq-dQ%X3jdAJ)C5PMspv^9+MVV!(DQ-pixe8!!TV>*Q
zivdpapn6kqyTuTvUVWfr^g)q}6xlE#U<v{;;Yk<BfhYddJYb410w(S7m<!zu42;V?
zT^vIyZtc0T*ZZ)8#PN^M0tCg?#T^TRE*?F4v1w7a!ZE(4=EW8kyMM{=*zqb(B!0rK
z5<zjtk~I$=)j!ah#nrWcvbBZN<m!2Mifw;5dGvj8zP!i8vpi?rwdWHTxSI4@y$D<{
zQ=oQc0kcWpy9<V|xRl#2NP5jJU7lfXc>jb*mDA#LEWMHL^P4)dw_Hn(j-A=MSH`J7
zwWQlkN%_l+?GrkiIK7!9<emEaiujy$ncA9mxO^8YYFgJ~DB>dh_5~~VPsiI$5?V>Z
zwL1lD_q7`2xX39ru55Y1%6TxvO~lb+#<YVhivQOCo>$%buR$$q%9)GH>%^KCIINfv
z#j)tkg#!LyNu{rfD<-Ux=suw_Sv2{$3=j9g)*FUCGmKB%HBUEsDpD%17&WJQa#zEO
zmcWSuIXyxSTWswUgxok4f)3q$a#VxS#m#1`x1krq!JX$slBNhKNi1d&bd*r-d61O%
zX1_1DrMOFhfp*4yr&k%y5(f{ii8_&@!Xo-PPx1T<bD=}+KONk~K6UXG&){}!>Aq=H
w|6}&Et;d<FPTFriH;Xs_#lrjf`TtlX80t9ZIRym#(ghV|p00i_>zopr0Di;L2><{9

literal 0
HcmV?d00001

diff --git a/static/images/icon-ok.png b/static/images/icon-ok.png
new file mode 100644
index 0000000000000000000000000000000000000000..50ea98bfd63970dee59b6ab9d289d5fee69833d6
GIT binary patch
literal 1333
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%xak-5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;TrkiYNVya+nsb^?r
zY+`AtqhMrUXrXUlp>JrcYiMR=Vqj%tqyPm<K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*8A=6l#_V8sV9F
zDf#8anqWP?zE+-j#U+V($*G<$wn{)#^fEJ3tc)!!T+N-#3|&l3Ees7^T`ioP9Gwgt
zoy?7l41ogXFugAM$)&lec_lEtDG0qrIQ4>(Lv8`kW|!2W%(B!Jx1#)91+cfRGI6@a
z)D5S3P`xR*-C}@KuRhQ*`k=@~ifot=Fa?2_@T3dmz!QIJ9x%lh0h4y}iUZpi7#Np&
zx;TbZ+<G%}w-<|{NL%?~EsdrGb+f$3PZ?QQy}3noYgpu+Hg5X<iOH_<Mup~)Q<08e
z1aow+WC<Q|5<K#e--YAwJD*7>J1r+12tVWVxpu?ulQVOlRo;8B$EEqF7o(;Et3mwQ
zYcFlyGo-EaPGCxTFfsUm#SVtzSHFaFnuHI!*j;||REo(xA;Mtd{FfhdLhgzCJbn6$
z$-imko|xSWv}c@>Z~7}?ZWR1;twecJ_RkqibDkt~7EIG;JJY27f$QDDq&J_c4sh&X
zIi0|x(~!MEX!9Pq4Scs+)0-d6(KzJtZ-G}Fzr>5rbCeE+)ZI>7Fme9h?F@o(Pro+k
z-C&Rx6<lq2QoO!3?@IYXokwR3n_Tu?x0@j7GU4R++b3$=CY+l7_K2O*lA89QeXleE
z)gSrS%?i5rMCXZ+pwGQ82I<0rA@`n{WJwi@2i^N-kt=kOPxHMIe~2r~)N<L39OV;F
zUi+jh6I}AC)ZI&RW0=rJcis2NYVTHPzH^QJ-;i9IuYSbg?c=v!bZ4*xKakwhUZecr
v_19nK6+imJrOtkFFX!?Ah2E9O{Y*Rz<qyhl6|vde02O4Ou6{1-oD!M<m_*)l

literal 0
HcmV?d00001

diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index 30a4fa5..4a82d53 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -126,7 +126,7 @@
 	}
 	.mainwrap3 {
 		top: 0;
-		height: calc(100% - 70px);
+		height: calc(100% - 200rpx);
 		overflow: hidden;
 	}
 	
@@ -147,16 +147,17 @@
    	}
    }
    .nav-list {
-	   position: relative;
-	   top: 50rpx;
-       justify-content: space-around;
-       margin: 2% 3%;
-	   width: 94%;
-	   height: 70%;
-   
+		position: relative;
+		top: 50rpx;
+		justify-content: space-around;
+		margin: 4% 3%;
+		width: 94%;
+		height: 65%;
+		overflow-y: auto;
+	   
      .nav-img {
        width: 100%;
-       height: 200rpx;
+       height: 240rpx;
 	   margin-bottom: 10rpx;
 	   border-radius: 10px;
      }
diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index 024565f..fcc5c40 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -5,7 +5,7 @@
 	    <view class="mainwrap3"> 
 	      <img src="/static/images/bg_role.jpg" alt="" />
 	      <view class="role_wrap">
-	        <view class="<strong>contit</strong>">请选择您在“<block style="color:#fd6d1f;">{{sceneName}}</block>”演练中的角色：</view>
+	        <view class="<strong>contit</strong>">请选择您在“<font style="color:#fd6d1f;">{{sceneName}}</font>”演练中的角色：</view>
 	        <view class="role_box"> 
 			   <block class="role-item" v-for="(item,i) in roleList" :key="i">
 				<span @click="startPractice(item)">{{item.name}}</span>
@@ -131,7 +131,8 @@
 .role_wrap {
 	position: absolute;
 	top: 47.5%;
-	width: 100%;
+	margin: 0 3%;
+	width: 94%;
 }
 
 .role_box {