From c9452462852de36d41355d1bc7c86a74251f306e Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Mon, 18 Aug 2025 09:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=94=AF=E6=98=8E=E7=BB=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A20.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 enum/commonEnum.js          |  2 ++
 pages/cashFlow/cashFlow.vue | 38 ++++++++++++++++++++++---------------
 pages/login/login.vue       | 11 +++++------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/enum/commonEnum.js b/enum/commonEnum.js
index 08be3e6..76016cc 100644
--- a/enum/commonEnum.js
+++ b/enum/commonEnum.js
@@ -26,5 +26,7 @@ export const commonEnum = {
   AGENT: 'https://api.ccttiot.com/image-1755327024599.png',
   BACK: 'https://api.ccttiot.com/image-1755328282735.png', //返回
   INVITE: 'https://api.ccttiot.com/image-1755330435656.png', //邀请有礼
+  //收支明细
+  ALL_TYPE: 'https://api.ccttiot.com/image-1755479846357.png', //全部类型
 }
 export default commonEnum
diff --git a/pages/cashFlow/cashFlow.vue b/pages/cashFlow/cashFlow.vue
index 28dc735..1e222d1 100644
--- a/pages/cashFlow/cashFlow.vue
+++ b/pages/cashFlow/cashFlow.vue
@@ -1,14 +1,29 @@
 <template>
-  <view class="agents-page">
+  <view
+    :style="{
+      background: `linear-gradient(to bottom, #ff803a 0, #ff803a ${getNavBarHeight() * 2}px, transparent ${getNavBarHeight() * 2}px, transparent 100%)`,
+    }"
+    class="agents-page"
+  >
     <!-- 头部区域 -->
     <custom-nav-bar3 title="收支明细"></custom-nav-bar3>
     <view :style="{ height: getNavBarHeight() + 'px' }" class="fill"></view>
-    <view class="header"></view>
+    <view :style="{ height: getNavBarHeight() + 'px' }" class="header">
+      <view class="all-type">
+        <image class="all-type-img"></image>
+      </view>
+      <view class="cash-flow">
+        <view class="date"></view>
+      </view>
+    </view>
+
     <!-- 主要内容区域 -->
-    <view class="main-content"></view>
+    <view class="main-content">666</view>
   </view>
 </template>
 
+;
+
 <script>
 import commonEnum from '../../enum/commonEnum'
 import { getNavBarHeight } from '../../utils/system'
@@ -34,23 +49,13 @@ export default {
   },
 }
 </script>
-
 <style lang="scss" scoped>
 .agents-page {
   position: relative;
-  background: linear-gradient(
-    to bottom,
-    #ff803a 0,
-    #ff803a 348rpx,
-    transparent 348rpx,
-    transparent 100%
-  );
-  min-height: 100vh;
+  height: 100vh;
 }
 
 .header {
-  height: 185rpx;
-  border: #16ff00 1px solid;
 }
 
 // 主要内容区域
@@ -64,6 +69,9 @@ export default {
   border-radius: 40rpx;
   margin: 0 30rpx;
   padding: 40rpx;
-  height: 1050rpx;
+}
+
+view {
+  border: #16ff00 1px solid;
 }
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 7a4009e..e16c39e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -5,7 +5,7 @@
     </view>
     <view class="main-content">
       <!-- 登录按钮 -->
-      <button class="login-btn" @click="getPhoneNumber" :disabled="loginLoading">
+      <button :disabled="loginLoading" class="login-btn" @click="getPhoneNumber">
         <text class="btn-text">{{ loginLoading ? '登录中...' : '微信用户一键登录' }}</text>
       </button>
     </view>
@@ -13,7 +13,7 @@
     <!-- 底部协议 -->
     <view class="agreement-section">
       <view class="agreement-checkbox" @click="toggleAgreement">
-        <view class="checkbox" :class="{ checked: hasAgreed }">
+        <view :class="{ checked: hasAgreed }" class="checkbox">
           <text v-if="hasAgreed" class="checkmark">✓</text>
         </view>
       </view>
@@ -31,9 +31,9 @@
           <text class="popup-close" @click="closeServiceTermsPopup">×</text>
         </view>
         <scroll-view
+          :scroll-top="scrollTop"
           class="popup-body"
           scroll-y="true"
-          :scroll-top="scrollTop"
           show-scrollbar="true"
         >
           <view class="terms-content">
@@ -55,9 +55,9 @@
           <text class="popup-close" @click="closePrivacyPolicyPopup">×</text>
         </view>
         <scroll-view
+          :scroll-top="scrollTop"
           class="popup-body"
           scroll-y="true"
-          :scroll-top="scrollTop"
           show-scrollbar="true"
         >
           <view class="terms-content">
@@ -216,7 +216,6 @@ export default {
 
       if (!this.hasReadPrivacyPolicy) {
         await this.showPrivacyPolicy()
-        return
       }
     },
 
@@ -306,7 +305,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 page {
   background: #ffffff;
 }