From 60a8bb2f25a15f1fd4a68677b976eef87bdfd138 Mon Sep 17 00:00:00 2001
From: zzyuan <781948537@qq.com>
Date: Tue, 17 Jun 2025 16:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=AB=98=E5=BA=A6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 12 +++++++++---
 pages/advanceOrder/dishDetail.vue             |  6 +++---
 pages/advanceOrder/orderDetails.vue           |  3 ++-
 pages/advanceOrder/stopperSelection/index.vue |  3 ++-
 pages/amendPassword.vue                       |  3 ++-
 pages/code/index.vue                          |  4 ++--
 pages/components/Navbar.vue                   |  8 ++++++--
 pages/feedback/history.vue                    |  3 ++-
 pages/feedback/index.vue                      |  3 ++-
 pages/index.vue                               |  8 ++++----
 pages/login.vue                               |  3 ++-
 pages/mine/announcement/aDetails.vue          |  3 ++-
 pages/mine/announcement/index.vue             |  3 ++-
 pages/mine/collect/index.vue                  |  2 +-
 pages/mine/me/basicInfo.vue                   |  3 ++-
 pages/mine/me/bindingPhone.vue                |  3 ++-
 pages/mine/me/carteenCard.vue                 |  3 ++-
 pages/mine/me/myAddress.vue                   |  3 ++-
 pages/mine/me/phoneCode.vue                   |  3 ++-
 pages/mine/me/updatePhone.vue                 |  3 ++-
 pages/newPassword.vue                         |  5 +++--
 pages/passenger/canteenList.vue               |  3 ++-
 pages/passenger/flowDetail.vue                |  3 ++-
 pages/remainingSum/rechargeRecord.vue         |  3 ++-
 pages/survey/details.vue                      |  3 ++-
 pages/survey/index.vue                        |  5 +++--
 pages/system.vue                              |  7 +++++--
 pages/weeklyMenu/index.vue                    |  4 ++--
 pages/weeklyMenu/menuDetail.vue               |  6 +++---
 pages/work/details.vue                        |  3 ++-
 pages/work/evaluate.vue                       |  5 +++--
 pages/work/index copy.vue                     |  4 ++--
 32 files changed, 84 insertions(+), 49 deletions(-)

diff --git a/App.vue b/App.vue
index 4c233de..23f6fb5 100644
--- a/App.vue
+++ b/App.vue
@@ -39,8 +39,14 @@ export default {
   margin: 0;
   padding: 0;
 }
-body,html {
-    height: 100vh !important;
-    overflow: auto !important;
+html{
+	height: 100% !important;
+	overflow: hidden !important;
+	box-sizing: border-box;
+}
+body {
+    height: 100vh !important; 
+	overflow: hidden !important;
+	box-sizing: border-box;
 }
 </style>
diff --git a/pages/advanceOrder/dishDetail.vue b/pages/advanceOrder/dishDetail.vue
index 9a08676..2f60c8e 100644
--- a/pages/advanceOrder/dishDetail.vue
+++ b/pages/advanceOrder/dishDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
-	<view>
+	<view style="height: 100vh;overflow-y: auto;">
 		<view class="image-box"> 
 			<image style="width: 100%;height: 100%;" :src="dashesData.imageUrl"></image> 
 		</view>
@@ -637,8 +637,8 @@ page {
   flex-direction: column;
   box-sizing: border-box;
   background-color: #fff;
-  min-height: 100%;
-  height: auto;
+  height: 98vh;
+  overflow-y: auto;
 }
 .image-box{
 	width: 90%;
diff --git a/pages/advanceOrder/orderDetails.vue b/pages/advanceOrder/orderDetails.vue
index 3b2419e..e829344 100644
--- a/pages/advanceOrder/orderDetails.vue
+++ b/pages/advanceOrder/orderDetails.vue
@@ -467,7 +467,8 @@ export default {
 .page {
   background: #f9fbff;
   padding: 16px;
-  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
   color: #0f274b;
 }
 .appraise {
diff --git a/pages/advanceOrder/stopperSelection/index.vue b/pages/advanceOrder/stopperSelection/index.vue
index ed124a9..56da061 100644
--- a/pages/advanceOrder/stopperSelection/index.vue
+++ b/pages/advanceOrder/stopperSelection/index.vue
@@ -101,7 +101,8 @@ export default {
 
 <style lang="scss" scoped>
 .page-container {
-  min-height: 100vh;
+  height: 96vh;
+  overflow-y: auto;
   background-color: #f5f5f5;
   padding: 20rpx;
 }
diff --git a/pages/amendPassword.vue b/pages/amendPassword.vue
index 6302206..2941eb3 100644
--- a/pages/amendPassword.vue
+++ b/pages/amendPassword.vue
@@ -166,7 +166,8 @@ export default {
 .password-page {
   padding: 40rpx;
   background-color: #ffffff;
-  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
 
   .title {
     font-size: 40rpx;
diff --git a/pages/code/index.vue b/pages/code/index.vue
index 0633aed..dfe6572 100644
--- a/pages/code/index.vue
+++ b/pages/code/index.vue
@@ -71,8 +71,8 @@
 		flex-direction: column;
 		box-sizing: border-box;
 		background-color: #F9FBFF;
-		min-height: 100%;
-		height: auto;
+		height: 100vh;
+		overflow-y: auto;
 	}
 
 	.work-container {
diff --git a/pages/components/Navbar.vue b/pages/components/Navbar.vue
index 4e41f15..b92e888 100644
--- a/pages/components/Navbar.vue
+++ b/pages/components/Navbar.vue
@@ -6,7 +6,7 @@
       @leftClick="goBack"
       @rightClick="clickIcon"
       :autoBack="true"
-      placeholder
+      placeholder :leftIconSize="leftIconSize"
       titleStyle="font-size: 32rpx;font-weight: 700;"
     >
       <view slot="right">
@@ -51,7 +51,11 @@ export default {
     text: {
       type: String,
       default: ''
-    }
+    },
+	leftIconSize:{
+	  type: Number,
+	  default: 20
+	}
   },
   data() {
     return {
diff --git a/pages/feedback/history.vue b/pages/feedback/history.vue
index 43a57ec..d843409 100644
--- a/pages/feedback/history.vue
+++ b/pages/feedback/history.vue
@@ -102,7 +102,8 @@ export default {
     background: #fff;
   }
   .message-page {
-    min-height: 94vh;
+    height: 96vh; 
+	overflow-y: auto;
     background-color: #f5f5f5;
     background: #fff;
     padding: 12px;
diff --git a/pages/feedback/index.vue b/pages/feedback/index.vue
index 6cc9fac..95b9e00 100644
--- a/pages/feedback/index.vue
+++ b/pages/feedback/index.vue
@@ -253,7 +253,8 @@ export default {
 
 <style lang="scss" scoped>
 .feedback-page {
-  height:94vh;
+  height:96vh;
+  overflow-y: auto;
   background-color: #FFF; 
 
   .type-section {
diff --git a/pages/index.vue b/pages/index.vue
index c04f530..1f3e837 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -419,8 +419,8 @@ page {
   flex-direction: column;
   box-sizing: border-box;
   background-color: #fafcff;
-  min-height: 100%;
-  height: auto;
+  height: 100vh;
+  overflow-y: auto;
 }
 
 view {
@@ -486,10 +486,10 @@ view {
 	
 	.handle-box-item2{
 		width: 100%;
-		margin-bottom: 10px;
+		margin-bottom: 12px;
 		background-color: #ffffff;
 		border-radius: 12rpx;
-		padding: 18rpx 20rpx;
+		padding: 24rpx 20rpx;
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
diff --git a/pages/login.vue b/pages/login.vue
index 351486c..7a3e8e9 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -219,7 +219,8 @@ export default {
 <style lang="scss" scoped>
 page {
   // background-color: #ffffff;
-  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
   background-image: url('../static/images/login/back.png');
   background-size: 100% 100%;
 }
diff --git a/pages/mine/announcement/aDetails.vue b/pages/mine/announcement/aDetails.vue
index 450b8f6..3d8a698 100644
--- a/pages/mine/announcement/aDetails.vue
+++ b/pages/mine/announcement/aDetails.vue
@@ -58,7 +58,8 @@ export default {
 .notice-detail {
   padding: 16px;
   background-color: #fff;
-  min-height: 94vh;
+  height: 96vh;
+  overflow-y: auto;
 }
 
 .notice-title {
diff --git a/pages/mine/announcement/index.vue b/pages/mine/announcement/index.vue
index 078303a..3bc97c3 100644
--- a/pages/mine/announcement/index.vue
+++ b/pages/mine/announcement/index.vue
@@ -137,7 +137,8 @@ export default {
     background: #fff;
   }
   .message-page {
-    min-height: 94vh;
+    height: 96vh;
+    overflow-y: auto;
     background-color: #f5f5f5;
     background: #fff;
     padding: 12px;
diff --git a/pages/mine/collect/index.vue b/pages/mine/collect/index.vue
index bfee773..7a19211 100644
--- a/pages/mine/collect/index.vue
+++ b/pages/mine/collect/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
 	<u-loading-page :loading="showLoading" loading-text="加载中..."></u-loading-page>
-	<view style="background-color: #fff;height: 94vh;">
+	<view style="background-color: #fff;height: 94vh;overflow-y: auto;">
 		<view class="top-bar">
 			<view style="font-size: 28rpx;font-weight: bold;">共{{collectData.length}}个菜品</view>
 			<view style="color: red;" @click="isShowBtn=!isShowBtn">管理</view>
diff --git a/pages/mine/me/basicInfo.vue b/pages/mine/me/basicInfo.vue
index c328ea0..b47b204 100644
--- a/pages/mine/me/basicInfo.vue
+++ b/pages/mine/me/basicInfo.vue
@@ -323,7 +323,8 @@
 
 <style lang="scss">
 	.container {
-		min-height: 100vh;
+		height: 100vh;
+		overflow-y: auto;
 		background-color: #FBFCFF;
 	}
 
diff --git a/pages/mine/me/bindingPhone.vue b/pages/mine/me/bindingPhone.vue
index 42a7f1c..50bae9a 100644
--- a/pages/mine/me/bindingPhone.vue
+++ b/pages/mine/me/bindingPhone.vue
@@ -76,7 +76,8 @@ export default {
 
 <style lang="scss">
 .container {
-  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
   background-color: #fff;
 }
 
diff --git a/pages/mine/me/carteenCard.vue b/pages/mine/me/carteenCard.vue
index a8a1741..f80351d 100644
--- a/pages/mine/me/carteenCard.vue
+++ b/pages/mine/me/carteenCard.vue
@@ -144,7 +144,8 @@ export default {
     background: #f5f5f5;
   }
   .list-page {
-    min-height: 94vh;
+    height: 96vh;
+    overflow-y: auto;
     background-color: #f5f5f5; 
     padding: 12px;
   } 
diff --git a/pages/mine/me/myAddress.vue b/pages/mine/me/myAddress.vue
index ce0c9b9..d7489f2 100644
--- a/pages/mine/me/myAddress.vue
+++ b/pages/mine/me/myAddress.vue
@@ -114,7 +114,8 @@ export default {
 
 <style lang="scss" scoped>
 .address-list {
-  min-height: 100vh;
+  height: 94vh;
+  overflow-y: auto;
   background-color: #f8f8f8;
   padding: 30rpx;
 }
diff --git a/pages/mine/me/phoneCode.vue b/pages/mine/me/phoneCode.vue
index 7c94acd..c3caa50 100644
--- a/pages/mine/me/phoneCode.vue
+++ b/pages/mine/me/phoneCode.vue
@@ -201,7 +201,8 @@ export default {
 
 <style lang="scss">
 .container {
-  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
   background-color: #fff;
 }
 
diff --git a/pages/mine/me/updatePhone.vue b/pages/mine/me/updatePhone.vue
index e5b0a86..2594558 100644
--- a/pages/mine/me/updatePhone.vue
+++ b/pages/mine/me/updatePhone.vue
@@ -93,7 +93,8 @@ export default {
 
 <style lang="scss">
 .container {
-  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
   background-color: #fff;
 }
 
diff --git a/pages/newPassword.vue b/pages/newPassword.vue
index 41ba27a..9543404 100644
--- a/pages/newPassword.vue
+++ b/pages/newPassword.vue
@@ -109,8 +109,9 @@ export default {
 <style lang="scss" scoped>
 .password-page {
   padding: 40rpx;
-  background-color: #ffffff;
-  min-height: 100vh;
+  background-color: #ffffff; 
+  height: 94vh;
+  overflow-y: auto;
 
   .title {
     font-size: 40rpx;
diff --git a/pages/passenger/canteenList.vue b/pages/passenger/canteenList.vue
index e62afcc..2833fa1 100644
--- a/pages/passenger/canteenList.vue
+++ b/pages/passenger/canteenList.vue
@@ -115,7 +115,8 @@ export default {
 
 <style lang="scss" scoped>
 .page-container {
-  min-height: 100vh;
+  height: 96vh;
+  overflow-y: auto;
   background-color: #f5f5f5;
   padding: 20rpx;
 }
diff --git a/pages/passenger/flowDetail.vue b/pages/passenger/flowDetail.vue
index 8279984..21019ce 100644
--- a/pages/passenger/flowDetail.vue
+++ b/pages/passenger/flowDetail.vue
@@ -282,7 +282,8 @@ export default {
 
 <style lang="scss" scoped>
 .page-container {
-  min-height: 100vh;
+  height: 96vh;
+  overflow-y: auto;
   background-color: #f5f5f5;
   padding: 20rpx;
 }
diff --git a/pages/remainingSum/rechargeRecord.vue b/pages/remainingSum/rechargeRecord.vue
index 99a0f6e..a5176cf 100644
--- a/pages/remainingSum/rechargeRecord.vue
+++ b/pages/remainingSum/rechargeRecord.vue
@@ -217,7 +217,8 @@ page {
 .recharge-history {
   background: #fff;
   //background-color: #f3f4f6;
-  min-height: 94vh;
+  height: 94vh; 
+  overflow-y: auto;
 }
 
 .tab-navigation {
diff --git a/pages/survey/details.vue b/pages/survey/details.vue
index cb4a40b..6c54032 100644
--- a/pages/survey/details.vue
+++ b/pages/survey/details.vue
@@ -213,7 +213,8 @@ export default {
 <style scoped>
 .report-detail { 
   background-color: #fff;
-  min-height: 94vh;
+  height: 100vh;
+  overflow-y: auto;
 }
 .info-item {
 	display: flex;
diff --git a/pages/survey/index.vue b/pages/survey/index.vue
index a759757..7e7681b 100644
--- a/pages/survey/index.vue
+++ b/pages/survey/index.vue
@@ -98,8 +98,9 @@ export default {
   page {
     background: #fff;
   }
-  .message-page {
-    min-height: 94vh;
+  .message-page { 
+	height: 96vh;
+	overflow-y: auto;
     background-color: #f5f5f5;
     background: #fff;
     padding: 12px;
diff --git a/pages/system.vue b/pages/system.vue
index 280f472..6220126 100644
--- a/pages/system.vue
+++ b/pages/system.vue
@@ -2,7 +2,8 @@
 	<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
 	<view class="index_main" :style="{ minHeight: screenH + 'px' }">
 	<!-- <Navbar title="皖送e餐" :showRightText="false" :isBack="false" :showBack="false"/> -->
-	<view style="height: 50px;width: 100%;text-align: center;line-height: 50px;background: #FFF;font-weight: 600;font-size: 32rpx;margin-bottom: 20rpx;">皖送e餐</view>
+	<Navbar title="皖送e餐" :showRightText="false" :isBack="false" :showBack="false" :leftIconSize="0"/>
+	<!-- <view style="height: 50px;width: 100%;text-align: center;line-height: 50px;background: #FFF;font-weight: 600;font-size: 32rpx;margin-bottom: 20rpx;">皖送e餐</view> -->
     <view class="back-top"></view>
     <!-- 轮播图 -->
     <view class="swiper_nav">
@@ -136,7 +137,8 @@ export default {
 
 <style lang="scss">
 page {
-  min-height: 100vh;
+  height: 100vh;
+  overflow-y: auto;
   background-image: url('../static/images/system/bg.png');
 }
 
@@ -163,6 +165,7 @@ page {
   border-radius: 20rpx;
   padding: 0 24rpx;
   box-sizing: border-box;
+  margin-top: 28rpx;
 }
 
 .main_menu {
diff --git a/pages/weeklyMenu/index.vue b/pages/weeklyMenu/index.vue
index e9c2f1d..025b6fc 100644
--- a/pages/weeklyMenu/index.vue
+++ b/pages/weeklyMenu/index.vue
@@ -68,8 +68,8 @@ page {
   flex-direction: column;
   box-sizing: border-box;
   background-color: #f9fbff;
-  min-height: 100%;
-  height: auto;
+  height: 100vh;
+  overflow-y: auto;
 }
 
 .work-container {
diff --git a/pages/weeklyMenu/menuDetail.vue b/pages/weeklyMenu/menuDetail.vue
index e492758..02d08f8 100644
--- a/pages/weeklyMenu/menuDetail.vue
+++ b/pages/weeklyMenu/menuDetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
-	<view>
+	<view style="height: 100vh;overflow-y: auto;">
 		<view class="image-box">
 			
 			<image style="width: 100%;height: 100%;" :src="dashesData.imageUrl"></image>
@@ -262,8 +262,8 @@ page {
   flex-direction: column;
   box-sizing: border-box;
   background-color: #fff;
-  min-height: 100%;
-  height: auto;
+  height: 100vh;
+  overflow-y: auto;
 }
 .image-box{
 	width: 90%;
diff --git a/pages/work/details.vue b/pages/work/details.vue
index 266969f..935b586 100644
--- a/pages/work/details.vue
+++ b/pages/work/details.vue
@@ -325,7 +325,8 @@ export default {
 .page {
   background: #f9fbff;
   padding: 16px;
-  min-height: 100vh;
+  height: 98vh;
+  overflow-y: auto;
   color: #0f274b;
 }
 .appraise {
diff --git a/pages/work/evaluate.vue b/pages/work/evaluate.vue
index 97d2eb5..4451eb1 100644
--- a/pages/work/evaluate.vue
+++ b/pages/work/evaluate.vue
@@ -208,8 +208,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.rating-page {
-  min-height: 94vh;
+.rating-page { 
+  height: 94vh;
+  overflow-y: auto;
   background-color: #ffffff;
   padding: 40rpx;
   padding-bottom: 120rpx;
diff --git a/pages/work/index copy.vue b/pages/work/index copy.vue
index db9ce51..1b0eb06 100644
--- a/pages/work/index copy.vue	
+++ b/pages/work/index copy.vue	
@@ -115,8 +115,8 @@
     flex-direction: column;
     box-sizing: border-box;
     background-color: #fff;
-    min-height: 100%;
-    height: auto;
+    height: 100vh;
+    overflow-y: auto;
   }
 
   view {