From 4c894dd184a3dba3c29d605d9295cc59aad01c1f Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Mon, 17 Aug 2026 09:51:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../instrument/revenue_statistics.vue         | 13 ++--
 .../pageSubPack/setting/setting.vue           | 68 +++++--------------
 .../pageSubPack/statistics/statistics.vue     |  4 +-
 3 files changed, 29 insertions(+), 56 deletions(-)

diff --git a/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue b/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue
index f2bad1c..0eef11a 100644
--- a/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue
+++ b/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue
@@ -308,12 +308,15 @@
             .filter-row {
                 display: flex;
                 align-items: center;
-                gap: 20rpx;
 
                 .filter-item {
                     flex: 1;
                     min-width: 0;
 
+                    & + .filter-item {
+                        margin-left: 20rpx;
+                    }
+
                     .filter-label {
                         display: flex;
                         align-items: center;
@@ -352,7 +355,6 @@
             .btn-row {
                 display: flex;
                 margin-top: 24rpx;
-                gap: 24rpx;
 
                 .reset-btn,
                 .search-btn {
@@ -378,6 +380,7 @@
                 }
 
                 .search-btn {
+                    margin-left: 24rpx;
                     background: linear-gradient(135deg, #4D5DFA 0%, #6C7AFF 100%);
                     color: #ffffff;
                     box-shadow: 0 8rpx 20rpx rgba(77, 93, 250, 0.25);
@@ -527,9 +530,11 @@
                 padding: 16rpx 0 12rpx;
 
                 .filter-row {
-                    gap: 12rpx;
-
                     .filter-item {
+                        & + .filter-item {
+                            margin-left: 12rpx;
+                        }
+
                         .filter-label {
                             padding: 12rpx 16rpx;
                             font-size: 24rpx;
diff --git a/wuye-manager-uniapp/pageSubPack/setting/setting.vue b/wuye-manager-uniapp/pageSubPack/setting/setting.vue
index 4ca3afc..6548128 100644
--- a/wuye-manager-uniapp/pageSubPack/setting/setting.vue
+++ b/wuye-manager-uniapp/pageSubPack/setting/setting.vue
@@ -1,17 +1,8 @@
 <template>
   <view class="setting-container">
-    <!-- <view class="status_bar"></view> -->
-    <!-- 顶部导航栏 -->
-<!--    <view class="nav-bar">
-      <view class="nav-left" @tap="goBack">
-        <uni-icons type="left" size="22" color="#000"></uni-icons>
-      </view>
-      <view class="nav-title">设置</view>
-      <view class="nav-right"></view>
-    </view> -->
 
     <!-- 内容区域 -->
-    <scroll-view class="content" scroll-y="true">
+    <view class="content">
       <!-- 手机号设置项 -->
       <view class="setting-item" @tap="goToChangePhone">
         <view class="item-label">手机号</view>
@@ -31,9 +22,12 @@
         <!-- <view class="item-value">{{  }}</view> -->
         <uni-icons type="arrowright" size="20" color="#ccc"></uni-icons>
       </view>
-    </scroll-view>
+    </view>
 
-    <!-- 退出登录按钮 -->
+    <!-- 底部占位，避免内容被固定按钮遮挡 -->
+    <view class="placeholder"></view>
+
+    <!-- 退出登录按钮（固定底部） -->
     <view class="logout-btn-wrap">
       <button class="logout-btn" @tap="handleLogout">退出登录</button>
     </view>
@@ -144,52 +138,19 @@ const confirmLogout = () => {
 .setting-container {
   min-height: 100vh;
   background-color: #ffffff;
-  display: flex;
-  flex-direction: column;
-}
-.status_bar {
-  width: 100%;
-  height: 46px;
-}
-/* 导航栏样式 */
-.nav-bar {
-  height: 44px;
-  display: flex;
-  align-items: center;
-  padding: 0 15px;
-  border-bottom: 1px solid #f0f0f0;
-  background-color: #fff;
-  position: sticky;
-  top: 0;
-  z-index: 99;
-}
-
-.nav-left {
-  width: 40px;
-  height: 44px;
-  display: flex;
-  align-items: center;
-  justify-content: flex-start;
-}
-
-.nav-title {
-  flex: 1;
-  text-align: center;
-  font-size: 32rpx;
-  font-weight: 500;
-  color: #333;
-}
-
-.nav-right {
-  width: 40px;
+  box-sizing: border-box;
 }
 
 /* 内容区域 */
 .content {
-  flex: 1;
   padding: 0;
 }
 
+/* 底部占位，高度与固定按钮区一致 */
+.placeholder {
+  height: 104px;
+}
+
 /* 设置项样式 */
 .setting-item {
   display: flex;
@@ -218,7 +179,12 @@ const confirmLogout = () => {
 
 /* 退出登录按钮 */
 .logout-btn-wrap {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
   padding: 30px 15px;
+  background-color: #ffffff;
 }
 
 .logout-btn {
diff --git a/wuye-manager-uniapp/pageSubPack/statistics/statistics.vue b/wuye-manager-uniapp/pageSubPack/statistics/statistics.vue
index 85f5c71..c977b2f 100644
--- a/wuye-manager-uniapp/pageSubPack/statistics/statistics.vue
+++ b/wuye-manager-uniapp/pageSubPack/statistics/statistics.vue
@@ -313,7 +313,6 @@ onShow(() => {
 .rate-row {
   margin-top: 20rpx;
   display: flex;
-  gap: 30rpx;
   .rate-item {
     flex: 1;
     border-radius: 8rpx;
@@ -324,6 +323,9 @@ onShow(() => {
     background-size: cover;
     background-position: center;
   }
+  .rate-item + .rate-item {
+    margin-left: 30rpx;
+  }
   .rate-occupy {
     background-image: url('https://wuye.ckdzkj.com/images/imgs/rate-occupy.png');
   }