From fa36d738a438e310fdf05b0d350fe92ae374877b Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Sat, 14 Sep 2024 18:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/base/tabbar.vue                         |  33 +++++++++++++--------
 pages.json                                         |   2 +-
 pages/index/center.vue                             |   3 --
 pages/index/index.vue                              |   3 +-
 pages/index/tourGuide.vue                          |   1 -
 .../{relic/apply.vue => service/applyRelic.vue}    |   8 ++---
 pages_order/static/{relic => applyRelic}/2.png     | Bin
 pages_order/static/{relic => applyRelic}/jdz.png   | Bin
 8 files changed, 26 insertions(+), 24 deletions(-)
 rename pages_order/{relic/apply.vue => service/applyRelic.vue} (85%)
 rename pages_order/static/{relic => applyRelic}/2.png (100%)
 rename pages_order/static/{relic => applyRelic}/jdz.png (100%)

diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index c56bb72..abbfa18 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -1,17 +1,20 @@
 <template>
-	<view class="tabbar">
-		<view
-		 :class="{item : true, active : select == index}"
-		 v-for="(item, index) in list"
-		 :key="index"
-		 @click="toPath(item, index)">
-			<view class="icon">
-				<image :src="select == index ? 
-				item.selectedIconPath : 
-				item.iconPath" class="icon-image" mode=""></image>
-			</view>
-			<view class="title">
-				{{ item.title }}
+	<view>
+		<view class="tabbar-box"></view>
+		<view class="tabbar">
+			<view
+			 :class="{item : true, active : select == index}"
+			 v-for="(item, index) in list"
+			 :key="index"
+			 @click="toPath(item, index)">
+				<view class="icon">
+					<image :src="select == index ? 
+					item.selectedIconPath : 
+					item.iconPath" class="icon-image" mode=""></image>
+				</view>
+				<view class="title">
+					{{ item.title }}
+				</view>
 			</view>
 		</view>
 	</view>
@@ -59,6 +62,10 @@
 </script>
 
 <style scoped lang="scss">
+.tabbar-box{
+	height: 120rpx;
+	padding-bottom: env(safe-area-inset-bottom);
+}
 .tabbar{
 	position: fixed;
 	width: 750rpx;
diff --git a/pages.json b/pages.json
index c1f0aca..8735925 100644
--- a/pages.json
+++ b/pages.json
@@ -64,7 +64,7 @@
 				"path": "service/carefree"
 			},
 			{
-				"path": "relic/apply"
+				"path": "service/applyRelic"
 			},
 			{
 				"path": "mine/subscribe"
diff --git a/pages/index/center.vue b/pages/index/center.vue
index 8c86392..d8f6494 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -94,9 +94,6 @@
 
 <style scoped lang="scss">
 	.page {
-		padding-bottom: 200rpx;
-		min-height: 100vh;
-		background-color: #FFFDF6;
 		.line{
 			margin: 30rpx;
 			background-color: #fff;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 007abcf..89c6885 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -100,7 +100,7 @@
 					{
 						icon : '/static/image/home/g1.png',
 						title : '申遗历程',
-						path : '/pages_order/relic/apply',
+						path : '/pages_order/service/applyRelic',
 					},
 					{
 						icon : '/static/image/home/g2.png',
@@ -173,7 +173,6 @@
 
 <style scoped lang="scss">
 	.page{
-		padding-bottom: 200rpx;
 		.banner{
 			position: relative;
 			.top{
diff --git a/pages/index/tourGuide.vue b/pages/index/tourGuide.vue
index 74bc9c0..7706e2b 100644
--- a/pages/index/tourGuide.vue
+++ b/pages/index/tourGuide.vue
@@ -131,6 +131,5 @@
 
 <style scoped lang="scss">
 .page{
-	padding-bottom: 200rpx;
 }
 </style>
diff --git a/pages_order/relic/apply.vue b/pages_order/service/applyRelic.vue
similarity index 85%
rename from pages_order/relic/apply.vue
rename to pages_order/service/applyRelic.vue
index 38b89bd..6282371 100644
--- a/pages_order/relic/apply.vue
+++ b/pages_order/service/applyRelic.vue
@@ -3,19 +3,19 @@
 
 		<navbar title="申请遗迹" leftClick @leftClick="$utils.navigateBack" />
 		<view class="top-img">
-			<image src="../static/relic/jdz.png" mode="aspectFill" style="width: 100%; height: 100%;"></image>
+			<image src="../static/applyRelic/jdz.png" mode="aspectFill" style="width: 100%; height: 100%;"></image>
 		</view>
 
 		<view class="middle-box">
 			<view class="middle-img">
 				<view>
-					<image src="../static/relic/2.png" mode="aspectFill" />
+					<image src="../static/applyRelic/2.png" mode="aspectFill" />
 				</view>
 				<view>
-					<image src="../static/relic/2.png" mode="aspectFill" />
+					<image src="../static/applyRelic/2.png" mode="aspectFill" />
 				</view>
 				<view>
-					<image src="../static/relic/2.png" mode="aspectFill" />
+					<image src="../static/applyRelic/2.png" mode="aspectFill" />
 				</view>
 			</view>
 			<view class="middle-font">
diff --git a/pages_order/static/relic/2.png b/pages_order/static/applyRelic/2.png
similarity index 100%
rename from pages_order/static/relic/2.png
rename to pages_order/static/applyRelic/2.png
diff --git a/pages_order/static/relic/jdz.png b/pages_order/static/applyRelic/jdz.png
similarity index 100%
rename from pages_order/static/relic/jdz.png
rename to pages_order/static/applyRelic/jdz.png