From 18f157e36c9f9ea19782605d75a34e1f867c93da Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 8 Dec 2025 14:35:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json                                | 10 ++-
 src/pages/calendar/index.vue                  | 90 +++++++------------
 src/pages/statistic/index.vue                 | 14 +--
 .../accounts/accountDealRecord/addEdit.vue    |  5 +-
 .../work/bill/creditCardBill/details.vue      | 33 +++----
 src/pages/work/index.vue                      | 14 +--
 6 files changed, 58 insertions(+), 108 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index ec1241c..ba21248 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -30,6 +30,7 @@
       "path": "pages/calendar/index",
       "style": {
         "navigationBarTitleText": "",
+        "navigationStyle": "custom",
         "disableScroll": true
       }
     },
@@ -49,21 +50,24 @@
     {
       "path": "pages/work/index",
       "style": {
-        "navigationBarTitleText": ""
+        "navigationBarTitleText": "",
+        "navigationStyle": "custom"
       }
     },
 
     {
       "path": "pages/statistic/index",
       "style": {
-        "navigationBarTitleText": ""
+        "navigationBarTitleText": "",
+        "navigationStyle": "custom"
       }
     },
     {
       "path": "pages/mine",
       "style": {
         "navigationBarTitleText": "",
-        "disableScroll": true
+        "disableScroll": true,
+        "navigationStyle": "custom"
       }
     },
     {
diff --git a/src/pages/calendar/index.vue b/src/pages/calendar/index.vue
index 1f0556a..88c1075 100644
--- a/src/pages/calendar/index.vue
+++ b/src/pages/calendar/index.vue
@@ -1,6 +1,5 @@
 <template>
-<div class="calendar-container">
-  <u-sticky offsetTop="0">
+  <view class="content">
     <view class="calendar-header">
       <view class="header-content">
         <view class="title-section">
@@ -18,38 +17,36 @@
         </view>
       </view>
     </view>
-  </u-sticky>
-  
-  <!-- 月视图和周视图显示，列视图显示表格形式 -->
-  <div class="calendar-wrapper">
-    <div v-show="type !== '3'" ref="fullcalendar" class="calendar-view" />
-  </div>
-  
-  <view class="events-section">
-    <view class="section-title">
-      <text class="title-text">{{ currentDateTitle }}</text>
-    </view>
-    <view class="events-list">
-      <view v-for="(item, index) in currentInfoList" :key="index">
-        <view class="event-card" @click="enterDetails(item)">
-          <view class="event-icon" :style="{ background: getEventColor(item.type) }">
-            <uni-icons :type="getEventIcon(item.type)" size="16" color="#fff"></uni-icons>
-          </view>
-          <view class="event-content">
-            <text class="event-title">{{ item.title }}</text>
-          </view>
-          <uni-icons type="arrow-right" size="16" color="#ccc"></uni-icons>
-        </view>
+    
+    <div class="calendar-wrapper">
+      <div v-show="type !== '3'" ref="fullcalendar" class="calendar-view" />
+    </div>
+    
+    <view class="events-section">
+      <view class="section-title">
+        <text class="title-text">{{ currentDateTitle }}</text>
       </view>
-      <view v-if="currentInfoList.length === 0" class="empty-state">
-        <uni-icons type="calendar" size="60" color="#ddd"></uni-icons>
-        <text class="empty-text">暂无事项</text>
+      <view class="events-list">
+        <view v-for="(item, index) in currentInfoList" :key="index">
+          <view class="event-card" @click="enterDetails(item)">
+            <view class="event-icon" :style="{ background: getEventColor(item.type) }">
+              <uni-icons :type="getEventIcon(item.type)" size="16" color="#fff"></uni-icons>
+            </view>
+            <view class="event-content">
+              <text class="event-title">{{ item.title }}</text>
+            </view>
+            <uni-icons type="arrow-right" size="16" color="#ccc"></uni-icons>
+          </view>
+        </view>
+        <view v-if="currentInfoList.length === 0" class="empty-state">
+          <uni-icons type="calendar" size="60" color="#ddd"></uni-icons>
+          <text class="empty-text">暂无事项</text>
+        </view>
       </view>
     </view>
   </view>
-</div>
-      <!-- 悬停按钮刷新-->
-      <refresh></refresh>
+  <!-- 悬停按钮刷新-->
+  <refresh></refresh>
 </template>
 
 <script>
@@ -396,19 +393,8 @@ const handleSelectDate = (info) => {
 }
 </script>
 <style lang="scss" scoped>
-page {
-  display: flex;
-  flex-direction: column;
-  box-sizing: border-box;
+.content {
   background-color: #f5f7fa;
-  min-height: 100%;
-  height: auto;
-}
-
-.calendar-container {
-  background: #f5f7fa;
-  display: flex;
-  flex-direction: column;
 }
 
 .calendar-header {
@@ -475,32 +461,16 @@ page {
 }
 
 .events-section {
-  flex: 1;
   margin: 6rpx 16rpx 10rpx;
   background: #ffffff;
   border-radius: 16rpx;
   padding: 20rpx 16rpx 16rpx;
   box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.06);
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  min-height: 0;
+  min-height: 400rpx;
 }
 
 .events-list {
-  flex: 1;
-  overflow-y: auto;
-  overflow-x: hidden;
-  min-height: 0;
-  
-  /* 隐藏滚动条 */
-  &::-webkit-scrollbar {
-    display: none !important;
-    width: 0 !important;
-    height: 0 !important;
-  }
-  scrollbar-width: none !important;
-  -ms-overflow-style: none !important;
+  /* 不设置 overflow，让它自然显示 */
 }
 
 .section-title {
diff --git a/src/pages/statistic/index.vue b/src/pages/statistic/index.vue
index c0a61e2..dd324e0 100644
--- a/src/pages/statistic/index.vue
+++ b/src/pages/statistic/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="work-container">
+  <view class="content">
 
     <!-- 账单统计分析 -->
     <view class="section-header" v-show="auth.hasPermi('invest:creditAnalysis:list')">
@@ -61,6 +61,7 @@
       </view>
     </view>
   </view>
+  <!-- <refresh></refresh> -->
 </template>
 
 <script setup>
@@ -103,18 +104,9 @@
 
 <style lang="scss">
   /* #ifndef APP-NVUE */
-  page {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: #f5f7fa;
-    min-height: 100%;
-    height: auto;
-  }
-
   /* #endif */
 
-  .work-container {
+  .content {
     padding: 12rpx 0;
   }
 
diff --git a/src/pages/work/accounts/accountDealRecord/addEdit.vue b/src/pages/work/accounts/accountDealRecord/addEdit.vue
index 3dbd014..115da6c 100644
--- a/src/pages/work/accounts/accountDealRecord/addEdit.vue
+++ b/src/pages/work/accounts/accountDealRecord/addEdit.vue
@@ -321,8 +321,9 @@ getDicts('deal_category').then(result => {
         tempDebitTypeName.value = null
         queryAccountParams.value.debitType = null
         
-        // 如果是储蓄账户(type='1')且不是修改模式，显示储蓄账户类型选择
-        if (form.value.type === '1' && form.value.id == null) {
+        // 如果是储蓄账户(type='1')，显示储蓄账户类型选择
+        // 编辑模式(id不为null且flag为null)时不需要显示，因为已经在getData中处理
+        if (form.value.type === '1' && !(form.value.id != null && flag.value == null)) {
           debitTypeShow.value = true
         } else {
           debitTypeShow.value = false
diff --git a/src/pages/work/bill/creditCardBill/details.vue b/src/pages/work/bill/creditCardBill/details.vue
index 09874fa..911ee34 100644
--- a/src/pages/work/bill/creditCardBill/details.vue
+++ b/src/pages/work/bill/creditCardBill/details.vue
@@ -9,15 +9,19 @@
     >
     </u-navbar>
     
-    <view class="search-view">
-      <u--input v-model="queryParams.time" border="false" disabled placeholder="请输入时间" class="search-input"
-        @blur="searchBlur" suffixIcon="calendar" suffixIconStyle="color: #909399">
-      </u--input>
-      <view class="filter-btn" @click="filterPanel = !filterPanel">
-        <uni-icons type="list" size="18" color="#667eea"></uni-icons>
-        <text>筛选</text>
+    <u-sticky offsetTop="0rpx" customNavHeight="0rpx">
+      <view class="search-view">
+          <u--input v-model="queryParams.time" border="false" disabled placeholder="请输入时间" class="search-input"
+            @blur="searchBlur" suffixIcon="calendar" suffixIconStyle="color: #909399">
+          </u--input>
+          <view class="filter-btn" @click="filterPanel = !filterPanel">
+            <uni-icons type="list" size="18" color="#667eea"></uni-icons>
+            <text>筛选</text>
+          </view>
       </view>
-      <u-transition :show="filterPanel" mode="fade">
+    </u-sticky>
+    
+    <u-transition :show="filterPanel" mode="fade">
           <view class="filter-panel" :style="{ height: `${windowHeight - 42}px` }">
             <view class="filter-panel-content">
               <view class="filter-title">交易类别</view>
@@ -48,7 +52,6 @@
             ></u-datetime-picker>
           </view>
         </u-transition>
-      </view>
     <u-list @scrolltolower="loadmore" :spaceHeight="170" lowerThreshold="100">
       <u-list-item v-for="(item, index) in listData" :key="index">
         <view class="list-item">
@@ -272,18 +275,6 @@ page {
   height: 100%;
   overflow: auto;
 }
-
-
-
-.btnAdd {
-      width: 146rpx;
-      height: 56rpx;
-      line-height: 56rpx;
-      border-radius: 8rpx;
-      display:float;
-      text-align: center;
-    }
-
 .search-view {
   padding: 12rpx 32rpx;
   background-color: #ffffff;
diff --git a/src/pages/work/index.vue b/src/pages/work/index.vue
index d44860e..e5e37ec 100644
--- a/src/pages/work/index.vue
+++ b/src/pages/work/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="work-container">
+  <view class="content">
 
     <!-- 常用功能 -->
     <view class="section-header" v-show="auth.hasPermi('invest:accountDealRecord:list')">
@@ -81,6 +81,7 @@
       </view>
     </view>
   </view>
+  <!-- <refresh></refresh> -->
 </template>
 
 <script setup>
@@ -134,18 +135,9 @@ import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
 
 <style lang="scss">
   /* #ifndef APP-NVUE */
-  page {
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    background-color: #f5f7fa;
-    min-height: 100%;
-    height: auto;
-  }
-
   /* #endif */
 
-  .work-container {
+  .content {
     padding: 12rpx 0;
   }