From c15d4d4d1ff3854cdb24d66e1c686f9eed860bad Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Mon, 25 Mar 2024 17:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/navigation/navigation.vue   | 18 +++++++++++++++++-
 pages/knowledge/knowledge.vue          | 16 ++++++++++------
 subpkg/about/about.vue                 |  9 ++++++---
 subpkg/address/address.vue             |  9 ++++++---
 subpkg/agreement/agreement.vue         |  9 ++++++---
 subpkg/feedback/feedback.vue           |  9 ++++++---
 subpkg/knowledgeInfo/knowledgeInfo.vue |  8 +++++---
 subpkg/medal/medal.vue                 |  9 ++++++---
 subpkg/message/message.vue             |  9 ++++++---
 subpkg/messageInfo/messageInfo.vue     |  7 +++++--
 subpkg/privacy/privacy.vue             |  9 ++++++---
 subpkg/rechallenge/rechallenge.vue     |  9 ++++++---
 subpkg/review/review.vue               |  9 ++++++---
 subpkg/role/role.vue                   |  7 +++++--
 14 files changed, 96 insertions(+), 41 deletions(-)

diff --git a/components/navigation/navigation.vue b/components/navigation/navigation.vue
index 0640c9e..3b4905e 100644
--- a/components/navigation/navigation.vue
+++ b/components/navigation/navigation.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="header" :style="{top: height}">
-		<label class="back" @click="back()"></label>
+		<label v-if="isBack" class="back" @click="back()"></label>
+		<label v-else class="noback"></label>
 		<view class="title">{{title}}</view>
 	</view>
 </template>
@@ -17,6 +18,10 @@
 			title: {
 				type: String,
 				default: ''
+			},
+			isBack: {
+				type: Boolean,
+				default: true
 			}
 		},
 		created() {
@@ -67,6 +72,17 @@ label.back {
 	background-size: auto 60%;
 }
 
+label.noback {
+	display: inline-block;
+	position: relative;
+	top: 16rpx;
+	left: 4%;
+	padding-left: 1.25rem;
+	width: 60rpx;
+	height: 60rpx;
+	background-size: auto 60%;
+}
+
 .title {
 	margin: -54rpx 0 50rpx;
 	color: #333;
diff --git a/pages/knowledge/knowledge.vue b/pages/knowledge/knowledge.vue
index 28923c7..ba90656 100644
--- a/pages/knowledge/knowledge.vue
+++ b/pages/knowledge/knowledge.vue
@@ -1,9 +1,10 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="secbar">
+		<!-- <view class="secbar">
 			<view class="title">知识库</view>
-		</view>
+		</view> -->
+		<navigation :is-back="false" title="知识库"></navigation>
 		<view class="mainwrap">
 			<view class="subwrap">
 				<view class="message-list">
@@ -20,7 +21,9 @@
 
 <script>
 	import tabbar from "@/components/tabbar/tabbar.vue";
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				page: "",
@@ -77,12 +80,13 @@
 	
 	.mainwrap {
 		height: calc(100% - 330rpx);
+		top: 73rpx;
 	}
 
-	.title {
-		margin-top: 0;
-		padding-top: 16rpx;
-	}
+	// .title {
+	// 	margin-top: 0;
+	// 	padding-top: 16rpx;
+	// }
 
 	.artlist {
 		margin: 2% 0 3.5%;
diff --git a/subpkg/about/about.vue b/subpkg/about/about.vue
index b1f00ce..cacb0b8 100644
--- a/subpkg/about/about.vue
+++ b/subpkg/about/about.vue
@@ -1,10 +1,11 @@
 <template>
 <view class="wrap">
 	<view class="stabar"></view>
-	<view class="secbar"><label class="back" @click="back()"></label>
+	<!-- <view class="secbar"><label class="back" @click="back()"></label>
 	<view class="title">关于我们</view>
-	</view>
-	<view class="mainwrap2">
+	</view> -->
+	<navigation title="关于我们"></navigation>
+	<view class="mainwrap2" style="top: 73rpx;">
 		<view class="subwrap">
 		<view v-html="content"></view>
 		</view>
@@ -13,7 +14,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				content:""
diff --git a/subpkg/address/address.vue b/subpkg/address/address.vue
index 5484757..6dd48c1 100644
--- a/subpkg/address/address.vue
+++ b/subpkg/address/address.vue
@@ -1,10 +1,11 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="secbar"><label class="back" @click="back()"></label>
+		<!-- <view class="secbar"><label class="back" @click="back()"></label>
 			<view class="title">联系地址</view>
-		</view>
-		<view class="mainwrap2">
+		</view> -->
+		<navigation title="联系地址"></navigation>
+		<view class="mainwrap2" style="top: 73rpx;">
 			<view class="subwrap">
 
 				<!-- 循环渲染地址信息 -->
@@ -49,8 +50,10 @@
 		mapGetters
 	} from 'vuex'
 	import addressVue from './address.vue';
+	import navigation from "@/components/navigation/navigation.vue";
 
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				options: [{
diff --git a/subpkg/agreement/agreement.vue b/subpkg/agreement/agreement.vue
index 0e035c3..4b24926 100644
--- a/subpkg/agreement/agreement.vue
+++ b/subpkg/agreement/agreement.vue
@@ -1,10 +1,11 @@
 <template>
 <view class="wrap">
 	<view class="stabar"></view>
-	<view class="secbar"><label class="back" @click="back()"></label>
+	<!-- <view class="secbar"><label class="back" @click="back()"></label>
 	<view class="title">用户协议</view>
-	</view>
-	<view class="mainwrap2">
+	</view> -->
+	<navigation title="用户协议"></navigation>
+	<view class="mainwrap2" style="top: 73rpx;">
 		<view class="subwrap">
 		<view v-html="content"></view>
 		</view>
@@ -13,7 +14,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				content:""
diff --git a/subpkg/feedback/feedback.vue b/subpkg/feedback/feedback.vue
index c8850cf..b0916df 100644
--- a/subpkg/feedback/feedback.vue
+++ b/subpkg/feedback/feedback.vue
@@ -1,10 +1,11 @@
 <template>
 <view class="wrap">
 	<view class="stabar"></view>
-	<view class="secbar"><label class="back" @click="back()"></label>
+	<!-- <view class="secbar"><label class="back" @click="back()"></label>
 	<view class="title">建议与意见反馈</view>
-	</view>
-<view class="mainwrap2">
+	</view> -->
+	<navigation title="建议与意见反馈"></navigation>
+<view class="mainwrap2" style="top: 73rpx;">
 
 	<view class="table_index">
 		<!-- <uni-section title="建议与反馈" type="line"></uni-section> -->
@@ -23,8 +24,10 @@
 </view>
 </template>
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	import { mapMutations, mapState } from 'vuex'
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				formData: {
diff --git a/subpkg/knowledgeInfo/knowledgeInfo.vue b/subpkg/knowledgeInfo/knowledgeInfo.vue
index a80dbbf..efe4d70 100644
--- a/subpkg/knowledgeInfo/knowledgeInfo.vue
+++ b/subpkg/knowledgeInfo/knowledgeInfo.vue
@@ -1,9 +1,9 @@
 <template>
 <view class="wrap">
 	<view class="stabar"></view>
-	<view class="secbar"><label class="back" @click="back()"></label>
-	</view>
-	<view class="mainwrap2">
+	<!-- <view class="secbar"><label class="back" @click="back()"></label></view> -->
+		<navigation></navigation>
+	<view class="mainwrap2" style="top: 73rpx;">
 		<view class="title">{{title}}</view>
 		<view class="timetop">{{createTime}}</view>
 		<view class="subwrap">
@@ -14,7 +14,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				content:"",
diff --git a/subpkg/medal/medal.vue b/subpkg/medal/medal.vue
index a022e62..2c107d8 100644
--- a/subpkg/medal/medal.vue
+++ b/subpkg/medal/medal.vue
@@ -1,10 +1,11 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="secbar"> <label class="back" @click="back()"></label>
+		<!-- <view class="secbar"> <label class="back" @click="back()"></label>
 			<view class="title">我的勋章</view>
-		</view>
-		<view class="mainwrap2">
+		</view> -->
+		<navigation title="我的勋章"></navigation>
+		<view class="mainwrap2" style="top: 73rpx;">
 			<view class="perinfo"> <span class="type-name"><img :src="avatarUrl"></img></span>
 				<view class="dycd"> <span class="myname">{{name}}</span>
 					的勋章墙
@@ -92,7 +93,9 @@
 		mapMutations,
 		mapGetters
 	} from 'vuex'
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				prefix:"",
diff --git a/subpkg/message/message.vue b/subpkg/message/message.vue
index ca004cb..298425f 100644
--- a/subpkg/message/message.vue
+++ b/subpkg/message/message.vue
@@ -1,10 +1,11 @@
 <template>
 <view class="wrap">
 	<view class="stabar"></view>
-	<view class="secbar"><label class="back" @click="back()"></label>
+	<!-- <view class="secbar"><label class="back" @click="back()"></label>
 	<view class="title">消息</view>
-	</view>
-	<view class="mainwrap2">
+	</view> -->
+	<navigation title="消息"></navigation>
+	<view class="mainwrap2" style="top: 73rpx;">
 		<view class="subwrap">
 		 <view class="message-list">
 			<view class="artlist" v-for="(item, i) in messageList" :key="i" @click="navClickHandler(item)">
@@ -17,7 +18,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 	           messageList:[],
diff --git a/subpkg/messageInfo/messageInfo.vue b/subpkg/messageInfo/messageInfo.vue
index 6453b27..53a3fb7 100644
--- a/subpkg/messageInfo/messageInfo.vue
+++ b/subpkg/messageInfo/messageInfo.vue
@@ -1,8 +1,9 @@
 <template>
 <view class="wrap">
 	<view class="stabar"></view>
-	<view class="secbar"><label class="back" @click="back()"></label></view>
-	<view class="mainwrap2">
+	<!-- <view class="secbar"><label class="back" @click="back()"></label></view> -->
+	<navigation></navigation>
+	<view class="mainwrap2" style="top: 73rpx;">
 		<view class="subwrap">
 		<view v-html="content"></view>
 		</view>
@@ -11,7 +12,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				content:"",
diff --git a/subpkg/privacy/privacy.vue b/subpkg/privacy/privacy.vue
index 81896ba..561f204 100644
--- a/subpkg/privacy/privacy.vue
+++ b/subpkg/privacy/privacy.vue
@@ -1,10 +1,11 @@
 <template>
 <view class="wrap">
 	<view class="stabar"></view>
-	<view class="secbar"><label class="back" @click="back()"></label>
+	<!-- <view class="secbar"><label class="back" @click="back()"></label>
 	<view class="title">隐私政策</view>
-	</view>
-	<view class="mainwrap2">
+	</view> -->
+	<navigation title="隐私政策"></navigation>
+	<view class="mainwrap2" style="top: 73rpx;">
 		<view class="subwrap">
 		<view v-html="content"></view>
 		</view>
@@ -13,7 +14,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				content:""
diff --git a/subpkg/rechallenge/rechallenge.vue b/subpkg/rechallenge/rechallenge.vue
index be04a54..d4b421c 100644
--- a/subpkg/rechallenge/rechallenge.vue
+++ b/subpkg/rechallenge/rechallenge.vue
@@ -1,10 +1,11 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="secbar"> <label class="back" @click="back()"></label>
+		<!-- <view class="secbar"> <label class="back" @click="back()"></label>
 		<view class="title">重新挑战</view>
-		</view>
-		<view class="mainwrap2">
+		</view> -->
+		<navigation title="重新挑战"></navigation>
+		<view class="mainwrap2" style="top: 73rpx;">
 		<view class="background-info">
 		   您上次挑战的场景是“<font style="color:#fd6d1f;">{{sceneName}}</font>”，挑战角色是 “<font style="color:#fd6d1f;">{{roleName}}</font>”，共计{{total}}道题目。您可从第1题开始重新挑战，或者任意选择其中一道题重新挑战。	
 		</view>
@@ -26,7 +27,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 			   "sceneName":"",
diff --git a/subpkg/review/review.vue b/subpkg/review/review.vue
index 8c198c5..db134dd 100644
--- a/subpkg/review/review.vue
+++ b/subpkg/review/review.vue
@@ -1,10 +1,11 @@
 <template>
 	<view class="wrap">
 		<view class="stabar"></view>
-		<view class="secbar"> <label class="back" @click="back()"></label>
+		<!-- <view class="secbar"> <label class="back" @click="back()"></label>
 			<view class="title">演练回顾</view>
-		</view>
-		<view class="mainwrap2">
+		</view> -->
+		<navigation title="重新挑战"></navigation>
+		<view class="mainwrap2" style="top: 73rpx;">
 			<view class="background-info">
 				您已完成“<font style="color:#fd6d1f;">{{sceneName}}</font>”场景中 “<font style="color:#fd6d1f;">{{roleName}}
 				</font>”〞角色挑战的共计{{total}}道题目，，每道题目和您选择的答案详情如下：
@@ -33,7 +34,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
+		components: {navigation},
 		data() {
 			return {
 				"sceneName": "",
diff --git a/subpkg/role/role.vue b/subpkg/role/role.vue
index 66c6610..5e25366 100644
--- a/subpkg/role/role.vue
+++ b/subpkg/role/role.vue
@@ -1,7 +1,9 @@
 <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"> <span class="back" @click="back()"></span></view> -->
+		<navigation></navigation>
 	    <view class="mainwrap3"> 
 	      <img src="/static/images/bg_role.jpg" alt=""/>
 	      <view class="role_wrap">
@@ -42,8 +44,9 @@
 </template>
 
 <script>
+	import navigation from "@/components/navigation/navigation.vue";
 	export default {
-
+		components: {navigation},
 		data() {
 			return {
 			   showButton: false,