From a33bb9acb7a15b83412664123397669633c2a4fe Mon Sep 17 00:00:00 2001
From: "452061493@qq.com" <452061493@qq.com>
Date: Fri, 1 Mar 2024 14:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BE=8E=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/base_css.css                | 58 +++++++++++-------------
 subpkg/complete/complete.vue       | 19 +++++---
 subpkg/list/list.vue               | 73 +++++++++++++++++++-----------
 subpkg/rechallenge/rechallenge.vue | 46 ++++++++-----------
 subpkg/review/review.vue           | 43 ++++++++----------
 subpkg/role/role.vue               | 21 +++++----
 6 files changed, 135 insertions(+), 125 deletions(-)

diff --git a/static/base_css.css b/static/base_css.css
index 81791fb..e569621 100644
--- a/static/base_css.css
+++ b/static/base_css.css
@@ -60,12 +60,11 @@ img {
 .mainwrap {
 	margin-top: 90rpx;
 	padding-bottom: 5%;
-	height: calc(100% - 100rpx);
+	height: calc(100% - 260rpx);
 	width: 100%;
 	background-image: linear-gradient(to bottom, #bac6fc, transparent 50%);
 	box-sizing: content-box;
 	overflow: hidden;
-	overflow-y: auto;
 }
 
 .topcont {
@@ -216,38 +215,33 @@ h3.contit span {
 
 .secbar {
 	position: relative;
-	top: 35px;
-	height: 60px;
+	z-index: 99;
+	top: 90rpx;
 	width: 100%;
+	height: 90rpx;
 	background-color: #bac6fc;
 }
 
-.secbar span {
-	position: relative;
-	top: 10px;
+.secbar label.back {
 	display: inline-block;
-	width: 30px;
-	height: 30px;
-	line-height: 20em;
-	white-space: nowrap;
-	overflow: hidden;
-	opacity: 0.9;
-}
-
-.secbar .pagetit {
-	margin-top: -18px;
-}
-
-.secbar span.back {
-	padding-left: 1.25rem;
+	position: relative;
+	top: 12rpx;
 	left: 4%;
-	width: auto;
-	font-size: 1.15rem;
-	line-height: 30px;
+	padding-left: 1.25rem;
+	width: 60rpx;
+	height: 60rpx;
 	background: url(/static/images/icon_arb.png) no-repeat left center;
 	background-size: auto 60%;
 }
 
+.title {
+	margin: -54rpx 0 50rpx;
+	color: #333;
+	font-size: 36rpx;
+	font-weight: bold;
+	text-align: center;
+}
+	
 .banbox_sec {
 	position: relative;
 	top: -10px;
@@ -271,24 +265,24 @@ h3.contit span {
 
 .mainwrap2, .mainwrap3, .tabwrap {
 	position: relative;
-	top: 35px;
-	padding: 10px 0;
+	top: 90rpx;
 	width: 100%;
-	height: calc(100% - 100px);
+	height: calc(100% - 200rpx);
 	background-image: linear-gradient(to bottom, #bac6fc, transparent 40%);
 	box-sizing: content-box;
-	overflow-x: hidden;
-	overflow-y: auto;
+	overflow: hidden;
 }
 
-.mainwrap2 {
+.mainwrap3 {
+	top: 0;
+	height: calc(100% - 90rpx);
 	overflow-y: hidden;
 }
 
 .tabwrap {
 	position: fixed;
-	top: 110px;
-	height: calc(100% - 140px);
+	top: 220rpx;
+	height: calc(100% - 300rpx);
 }
 
 .subsearch {
diff --git a/subpkg/complete/complete.vue b/subpkg/complete/complete.vue
index 2482e03..63255aa 100644
--- a/subpkg/complete/complete.vue
+++ b/subpkg/complete/complete.vue
@@ -6,7 +6,7 @@
 			<image class="animg" src="/static/images/joy.png"></image>
 		</view>
 
-		<view class="mainwrap">
+		<view class="mainwrap3">
 		<view class="title">恭喜完成本次演练！</view>
 		<view class="question-wrap">
 		<view class="question-list">
@@ -111,8 +111,8 @@
 			  this.showLayer = false
 			  clearTimeout(this.timer)
 			}, 1000)
-			this.roleId = options.roleId
-			this.questionFreId = options.questionFreId
+			//this.roleId = options.roleId
+			//this.questionFreId = options.questionFreId
 			this.getQuestionList()
 			this.getRecordList()
 		},
@@ -241,6 +241,11 @@
 		}
 	}
 	
+	.mainwrap3 {
+		top: 56rpx;
+		overflow-y: auto;
+	}
+	
 	.title {
 		margin: 50rpx 0;
 		color: #333;
@@ -283,7 +288,7 @@
 	   margin: 2% 3%;
 	   padding: 2%;
 	   width: 90%;
-	   height: 400rpx;
+	   min-height: 400rpx;
 	   background: #fff;
 	   border: 1px solid #18c569;
 	   border-radius: 10px;
@@ -318,14 +323,14 @@
 	   }
 	   view {
 		   color: #666;
-		   line-height: 1.75;
+		   line-height: 1.5;
 	   }
    }
    
    .question-record {
-		margin: 3% 3% 10%;
+		margin: 3% 3% 5%;
 		width: 94%;
-		height: 35%;
+		height: 25%;
 		overflow: hidden;
 		label {
 			font-size: 32rpx; 
diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index 4d9f6e3..402e397 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -1,6 +1,9 @@
 <template>
-	<view class="scene-container">
-		<view class="secbar"> <span class="back" @click="back()"></span></view>
+	<view class="wrap">
+		<view class="stabar"></view>
+		<view class="secbar"> <span class="back" @click="back()"></span>
+		<view class="title">场景演练</view>
+		</view>
 		<view class="mainwrap3">
 		<!-- 轮播图 -->
 		<swiper :indicator-dots="false" :autoplay="true" :interval="3000" :duration="1000" :circular="true">
@@ -24,6 +27,11 @@
 		<!-- 场景区域 -->
 		<view class="nav-list">
 		  <view class="nav-item" v-for="(item, i) in sceneList" :key="i" @click="navClickHandler(item)">
+			<view class="nav-marsk">
+				<view class="scename">消防演练</view>
+				<view class="scecount">演练题目：5</view>
+				<view class="scecount">演练人次：367</view>
+			</view>
 		    <image :src="item.uploadPath" class="nav-img"></image>
 		  </view>
 		</view>
@@ -120,21 +128,9 @@
 
 <style lang="scss">
 	@import url("@/static/base_css.css");
-	.scene-container {
-		width: 100%;
-		height: 100%;	
-	}
-	.secbar {
-	    top: 0;
-	    z-index: 1;
-	}
-	.secbar ._span.back {
-	    top: 50px;
-	}
+	
 	.mainwrap3 {
-		top: 0;
-		height: calc(100% - 200rpx);
-		overflow: hidden;
+		top: 50rpx;
 	}
 	
    swiper {
@@ -159,15 +155,38 @@
 		justify-content: space-around;
 		margin: 4% 3%;
 		width: 94%;
-		height: 65%;
+		height: 62%;
 		overflow-y: auto;
+		.nav-item {
+			position: relative;
+			margin-bottom: 20rpx;
+			width: 100%;
+			height: 280rpx;
+		    border-radius: 20rpx;
+			overflow: hidden;
+		}
+		.nav-marsk {
+				position: absolute;
+				z-index: 10;
+				width: 100%;
+				height: 100%;
+				background-color: rgba(0, 0, 0, .45);
+				color: #fff;
+				line-height: 1.5;
+				.scename {
+					margin: 10% 0 2% 5%;
+					font-size: 42rpx;
+				}
+				.scecount {
+					margin: 1% 0 0 5%;
+					font-size: 28rpx;
+				}
+			}
 	   
-     .nav-img {
-       width: 100%;
-       height: 240rpx;
-	   margin-bottom: 10rpx;
-	   border-radius: 10px;
-     }
+		 .nav-img {
+		   width: 100%;
+		   height: 100%;
+		 }
    }
    
    .search {
@@ -176,10 +195,12 @@
    }
    
    .search-title{
-   		font-family: 'Courier New', Courier, monospace;
    		color: #67676a;
-   		margin-left: 8px;
-   		margin-top: 6px;
+   		margin: 3% 0 0 3%;
     }  
+	
+	.uni-searchbar__box {
+		border: 1px solid #ddd;
+	}
   
 </style>
diff --git a/subpkg/rechallenge/rechallenge.vue b/subpkg/rechallenge/rechallenge.vue
index 5e8ca7c..a38cc6a 100644
--- a/subpkg/rechallenge/rechallenge.vue
+++ b/subpkg/rechallenge/rechallenge.vue
@@ -1,9 +1,10 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="mainwrap">
+		<view class="secbar"> <span class="back" @click="back()"></span>
 		<view class="title">重新挑战</view>
-		
+		</view>
+		<view class="mainwrap2">
 		<view class="background-info">
 		   您上次挑战的场景是“<font style="color:#fd6d1f;">{{sceneName}}</font>”，挑战角色是 “<font style="color:#fd6d1f;">{{roleName}}</font>”，共计{{total}}道题目。您可从第1题开始重新挑战，或者任意选择其中一道题重新挑战。	
 		</view>
@@ -63,6 +64,11 @@
 				}
 		    	//uni.$showMsg('数据请求成功！')
 		    },
+			back(){
+				uni.navigateBack({
+					delta:1,//返回层数，2则上上页
+				})
+			},
 		}
 	}
 </script>
@@ -70,34 +76,22 @@
 <style>
 	@import url("@/static/base_css.css");
 	
-	.mainwrap {
-		overflow: hidden;
-	}
-	
-	.title {
-		margin: 50rpx 0;
-		color: #333;
-		font-size: 40rpx;
-		font-weight: bold;
-		text-align: center;
-	}
-	
    .background-info, .question-info {
-	   margin: 0 3%;
-	   padding: 2%;
-	   width: 90%;
-	   height: 200rpx;
-	   background-color: #fff;
-	   border-radius: 20rpx;
-	   border: 1px solid rgba(151, 1, 188, .45);
-	   box-shadow: 0 0 10rpx rgba(151, 1, 188, .35);
-	   font-size: 32rpx;
-	   line-height: 1.5;
-   }
+		margin: 0 3%;
+		padding: 3%;
+		width: 88%;
+		height: 240rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		border: 1px solid rgba(151, 1, 188, .45);
+		box-shadow: 0 0 10rpx rgba(151, 1, 188, .35);
+		font-size: 32rpx;
+		line-height: 1.5;
+	}
    .question-info{
 	   margin-top: 20rpx;
 	   padding-top: 50rpx;
-   	   height: calc(100% - 520rpx);
+   	   height: calc(100% - 420rpx);
 	   overflow: hidden;
    }
    
diff --git a/subpkg/review/review.vue b/subpkg/review/review.vue
index 9b5c986..f4715d9 100644
--- a/subpkg/review/review.vue
+++ b/subpkg/review/review.vue
@@ -1,8 +1,10 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="mainwrap">
+		<view class="secbar"> <span class="back" @click="back()"></span>
 		<view class="title">演练回顾</view>
+		</view>
+		<view class="mainwrap2">
 		<view class="background-info">
 		   您已完成“<font style="color:#fd6d1f;">{{sceneName}}</font>”场景中 “<font style="color:#fd6d1f;">{{roleName}}</font>”〞角色挑战的共计{{total}}道题目，，每道题目和您选择的答案详情如下：
 		</view>
@@ -59,6 +61,11 @@
 				}
 		    	//uni.$showMsg('数据请求成功！')
 		    },
+			back(){
+				uni.navigateBack({
+					delta:1,//返回层数，2则上上页
+				})
+			},
 		}
 	}
 </script>
@@ -66,34 +73,22 @@
 <style>
 	@import url("@/static/base_css.css");
 	
-	.mainwrap {
-			overflow: hidden;
-		}
-		
-		.title {
-			margin: 50rpx 0;
-			color: #333;
-			font-size: 40rpx;
-			font-weight: bold;
-			text-align: center;
-		}
-		
 	.background-info, .question-info {
-		   margin: 0 3%;
-		   padding: 2%;
-		   width: 90%;
-		   height: 200rpx;
-		   background-color: #fff;
-		   border-radius: 20rpx;
-		   border: 1px solid rgba(151, 1, 188, .45);
-		   box-shadow: 0 0 10rpx rgba(151, 1, 188, .35);
-		   font-size: 32rpx;
-		   line-height: 1.5;
+		margin: 0 3%;
+		padding: 3%;
+		width: 88%;
+		height: 240rpx;
+		background-color: #fff;
+		border-radius: 20rpx;
+		border: 1px solid rgba(151, 1, 188, .45);
+		box-shadow: 0 0 10rpx rgba(151, 1, 188, .35);
+		font-size: 32rpx;
+		line-height: 1.5;
 	}
 	.question-info{
 		   margin-top: 20rpx;
 		   padding-top: 50rpx;
-		   height: calc(100% - 520rpx);
+		   height: calc(100% - 420rpx);
 		   overflow: hidden;
 	}
 	
diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index 6afc6ce..f7d8e1f 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -15,7 +15,7 @@
 	        <view class="more_role" @click="showMoreRole()"><a>更多角色</a></view>
 	      </view>
 	    
-	       <view class="startbtn"><image src="/static/images/btn_start.png" @click="startPractice()"></image><a>开始演练</a></view>
+	       <view :class="practice"><image src="/static/images/btn_start.png" @click="startPractice()"></image><a>开始演练</a></view>
 	    </view>
 	  
 	      <view class="cnote">题目来源：深圳市******有限公司</view>  
@@ -68,7 +68,9 @@
 			   sceneId:"",
 			   sceneName:"",
 			   roleId:"",
-			   roleList:[]
+			   roleList:[],
+			   practice:"startbtn"
+			   
 			};
 		},
 		onLoad(options) {
@@ -97,10 +99,12 @@
 				if (item.choose === "true") {
 					this.$set(item, 'choose', 'false')
 					this.roleId = ''
+					this.practice = 'startbtn'
 				} else if(item.choose === "false"){
 					this.roleList.forEach(item=>{this.$set(item, 'choose', 'false')})
 					this.$set(item, 'choose', 'true')
 					this.roleId = item.guid
+					this.practice = 'startbtn.active'
 				}
 			},
 			startPractice(item) {
@@ -131,14 +135,10 @@
     z-index: 1;
 }
 .secbar ._span.back {
-    top: 50px;
-}
-.mainwrap3 {
-	top: 0;
-	height: calc(100% - 70px);
-	overflow: hidden;
+    top: 100rpx;
 }
 
+
 .mainwrap3 > img {
 	width: 100%;
 	height: 100%;
@@ -305,8 +305,9 @@
 	line-height: 3.0;
 	letter-spacing: 2px;
 }
-.change_color{
-     background:rgba(138, 162, 254, 1.0);
+.change_color {
+     background: #1367fe;
+	 color: #fff !important;
  }