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

---
 main.js                            |  4 ++--
 pages.json                         |  6 ++++--
 pages/index/index.vue              |  2 +-
 pages/knowledge/knowledge.vue      | 13 +++++++++----
 static/base_css.css                |  2 +-
 subpkg/list/list.vue               |  7 +++++--
 subpkg/medal/medal.vue             | 16 ++++++++++++++--
 subpkg/practice/practice.vue       | 30 +++++++-----------------------
 subpkg/rechallenge/rechallenge.vue |  2 +-
 subpkg/review/review.vue           |  2 +-
 subpkg/role/role.vue               | 25 +++++++++++++------------
 utils/config.js                    |  4 ++--
 12 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/main.js b/main.js
index ce5fa7e..bf77b46 100644
--- a/main.js
+++ b/main.js
@@ -13,8 +13,8 @@ import * as filters from '@/utils/formatFilter'
 uni.$http = $http
 Vue.prototype.$api = api
 
-// $http.baseUrl = 'http://146.56.223.227:9527'
-$http.baseUrl = 'http://localhost:9527'
+$http.baseUrl = 'http://146.56.223.227:9527'
+// $http.baseUrl = 'http://localhost:9527'
 
 $http.beforeRequest = function(options) {
 	uni.showLoading({
diff --git a/pages.json b/pages.json
index 3956d8b..875b656 100644
--- a/pages.json
+++ b/pages.json
@@ -26,7 +26,8 @@
 			"path": "pages/knowledge/knowledge",
 			"style": {
 				"navigationBarTitleText": "全民演练",
-				"enablePullDownRefresh": true
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
 			}
 		}
 	],
@@ -71,7 +72,8 @@
 			"style" : 
 			{
 				"navigationBarTitleText" : "",
-				"enablePullDownRefresh" : true
+				"enablePullDownRefresh" : true,
+				"navigationStyle": "custom"
 			}
 		},
 		{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 442ec19..df335a3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -67,7 +67,7 @@
 		},
 		onLoad() {
 			this.getSwiperList();
-			// this.checkLogin()
+			 this.checkLogin()
 		},
 		onShow() {
 			this.page= "home"
diff --git a/pages/knowledge/knowledge.vue b/pages/knowledge/knowledge.vue
index 4add765..3854284 100644
--- a/pages/knowledge/knowledge.vue
+++ b/pages/knowledge/knowledge.vue
@@ -1,9 +1,14 @@
 <template>
-	<view>
-		知识库页面
+	<view class="wrap">
+		<view class="stabar"></view>
+		<view class="secbar"> 
+		<view class="title">知识库</view>
+		</view>
+		<view class="mainwrap2">
 		
 		<tabbar :page="page"></tabbar>
 	</view>
+	</view>
 </template>
 
 <script>
@@ -17,10 +22,10 @@
 		onShow() {
 			this.page= "know"
 		},
-		components: {tabbar}
+		components: {tabbar},
 	}
 </script>
 
 <style lang="scss">
-
+	@import url("@/static/base_css.css");
 </style>
diff --git a/static/base_css.css b/static/base_css.css
index e569621..c5cfc99 100644
--- a/static/base_css.css
+++ b/static/base_css.css
@@ -275,7 +275,7 @@ h3.contit span {
 
 .mainwrap3 {
 	top: 0;
-	height: calc(100% - 90rpx);
+	height: calc(100% - 160rpx);
 	overflow-y: hidden;
 }
 
diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index 402e397..85b7f51 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="secbar"> <span class="back" @click="back()"></span>
+		<view class="secbar"> <label class="back" @click="back()"></label>
 		<view class="title">场景演练</view>
 		</view>
 		<view class="mainwrap3">
@@ -131,6 +131,7 @@
 	
 	.mainwrap3 {
 		top: 50rpx;
+		height: calc(100% - 90rpx)
 	}
 	
    swiper {
@@ -154,9 +155,11 @@
 		top: 50rpx;
 		justify-content: space-around;
 		margin: 4% 3%;
+		padding: 0 0 8%;
 		width: 94%;
-		height: 62%;
+		height: 55%;
 		overflow-y: auto;
+
 		.nav-item {
 			position: relative;
 			margin-bottom: 20rpx;
diff --git a/subpkg/medal/medal.vue b/subpkg/medal/medal.vue
index 9c8c9d6..67952a0 100644
--- a/subpkg/medal/medal.vue
+++ b/subpkg/medal/medal.vue
@@ -1,5 +1,9 @@
 <template>
-	<view>
+	<view class="wrap">
+		<view class="stabar"></view>
+		<view class="secbar"> <label class="back" @click="back()"></label>
+		<view class="title">演练回顾</view>
+		</view>
 		<view class="index-background">
 			<image src="/static/medal_top.jpg"></image>
 			<view class="panel-list">
@@ -28,6 +32,7 @@
 		  </view>
 		</view>
 	</view>
+	</view>
 </template>
 
 <script>
@@ -84,12 +89,19 @@
 				},
 				myMedal(){
 					this.showMedal = false
-				}
+				},
+				back(){
+					uni.navigateBack({
+						delta:1,//返回层数，2则上上页
+					})
+				},
 			}
 		}
 </script>
 
 <style lang="scss">
+	@import url("@/static/base_css.css");
+	
 	.nav-list {
 		display: flex;
 		justify-content: left;
diff --git a/subpkg/practice/practice.vue b/subpkg/practice/practice.vue
index 42b7681..ddd8187 100644
--- a/subpkg/practice/practice.vue
+++ b/subpkg/practice/practice.vue
@@ -1,13 +1,12 @@
 <template>
-	<view class="role-container">
 		<view class="wrap">
 			<!-- <view class="video-wrapper" id="video-container"></view> -->
-			<view class="secbar"> <span class="back" @click="back()"></span></view>
+			<view class="stabar"></view>
+			<view class="secbar"> <label class="back" @click="back()"></label></view>
 			<view class="mainwrap3">
 				<view class="role_wrap"><sVideo :jsonId="jsonId"></sVideo></view>
 			</view>
 		</view>
-	</view>
 </template>
 
 <script>
@@ -54,30 +53,15 @@
 <style lang="scss">
 
 @import url("@/static/base_css.css");	
-.role-container {
-	width: 100%;
-	height: 100%;	
-}
-
-.secbar {
-    top: 0;
-    z-index: 1;
-}
-
-.secbar ._span.back {
-    top: 50px;
-}
-
 .mainwrap3 {
-	top: 0;
-	height: calc(100% - 70px);
-	overflow: hidden;
+	top: 90rpx;
+	background-color: #000;
 }
-
 .role_wrap {
-	position: absolute;
-	top: 5%;
+	position: relative;
+	top: -62rpx;
 	margin: 0;
 	width: 100%;
+	height: 100%;
 }
 </style>
\ No newline at end of file
diff --git a/subpkg/rechallenge/rechallenge.vue b/subpkg/rechallenge/rechallenge.vue
index a38cc6a..be04a54 100644
--- a/subpkg/rechallenge/rechallenge.vue
+++ b/subpkg/rechallenge/rechallenge.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="secbar"> <span class="back" @click="back()"></span>
+		<view class="secbar"> <label class="back" @click="back()"></label>
 		<view class="title">重新挑战</view>
 		</view>
 		<view class="mainwrap2">
diff --git a/subpkg/review/review.vue b/subpkg/review/review.vue
index f4715d9..d440fed 100644
--- a/subpkg/review/review.vue
+++ b/subpkg/review/review.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="secbar"> <span class="back" @click="back()"></span>
+		<view class="secbar"> <label class="back" @click="back()"></label>
 		<view class="title">演练回顾</view>
 		</view>
 		<view class="mainwrap2">
diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index 8fddc96..cc30b37 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -1,18 +1,19 @@
 <template>
 <view class="role-container">
 	<view class="wrap">
-	    <view class="secbar"> <span class="back" @click="back()"></span></view>
+		<view class="stabar"></view>
+	    <view class="secbar"> <label class="back" @click="back()"></label></view>
 	    <view class="mainwrap3"> 
 	      <img src="/static/images/bg_role.jpg" alt=""/>
 	      <view class="role_wrap">
-	        <view class="<strong>contit</strong>">请选择您在“<font style="color:#fd6d1f;">{{sceneName}}</font>”演练中的角色：</view>
+	        <view class="contit">请选择您在“<font style="color:#fd6d1f;">{{sceneName}}</font>”演练中的角色：</view>
 	        <view class="role_box"> 
 			   <block class="role-item" v-for="(item,i) in roleList" :key="i">
 				<span  :class="item.choose === 'true' ? 'change_color':''"  @click="chooseRole(item)">{{item.name}}</span>
 			   <!-- <span class="spanitem"  @click="chooseRole(item)">{{item.name}}</span> -->
 			   </block>
 			</view>
-	        <view class="more_role" @click="showMoreRole()"><a>更多角色</a></view>
+	        <!-- <view class="more_role" @click="showMoreRole()"><a>更多角色</a></view> -->
 	      </view>
 	    
 	       <view :class="practice"><image src="/static/images/btn_start.png" @click="startPractice()"></image><a>开始演练</a></view>
@@ -112,8 +113,8 @@
 				  return uni.$showMsg('请先选择一个角色')
 			  }
 			  uni.navigateTo({
-			    // url: '/subpkg/practice/practice?roleId='+this.roleId
-			    url: '/subpkg/practice/respractice?roleId='+this.roleId
+			     url: '/subpkg/practice/practice?roleId='+this.roleId
+			    //url: '/subpkg/practice/respractice?roleId='+this.roleId
 			  })
 			},
 			back(){
@@ -131,14 +132,10 @@
 	width: 100%;
 	height: 100%;	
 }
-.secbar {
-    top: 0;
-    z-index: 1;
-}
-.secbar ._span.back {
-    top: 100rpx;
-}
 
+.mainwrap3 {
+    top: 90rpx;
+}
 
 .mainwrap3 > img {
 	width: 100%;
@@ -153,6 +150,10 @@
 	width: 94%;
 }
 
+.contit {
+	margin: 3% 0;
+}
+
 .role_box {
 	margin: 1% 0 2% 4%;
 	width: 96%;
diff --git a/utils/config.js b/utils/config.js
index cca2440..584146f 100755
--- a/utils/config.js
+++ b/utils/config.js
@@ -1,3 +1,3 @@
-// let url_config = 'http://146.56.223.227:9527/'
-let url_config = 'http://localhost:9527/'
+let url_config = 'http://146.56.223.227:9527/'
+// let url_config = 'http://localhost:9527/'
 export default url_config
\ No newline at end of file