From 7aa94f2efdf8d018cde079aa62148b20e374a1d4 Mon Sep 17 00:00:00 2001
From: chenhaizhao <2291973799@qq.com>
Date: Tue, 6 Jan 2026 17:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  3 +-
 main.js                                       |  3 +
 pages.json                                    | 12 +++
 pages/index/index.vue                         | 11 ++-
 .../patientFbDetail/patientFbDetail.vue       | 63 +++++++--------
 pages/patient/patientFbList/patientFbList.vue | 81 +++++++++++--------
 pages/patient/patientList/patientList.vue     | 18 +++--
 7 files changed, 117 insertions(+), 74 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3539e58..02d9f16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 unpackage
-node_modules
\ No newline at end of file
+node_modules
+CLAUDE.md
\ No newline at end of file
diff --git a/main.js b/main.js
index 105595c..5d2aeee 100644
--- a/main.js
+++ b/main.js
@@ -1,8 +1,11 @@
 import App from './App'
 import { createSSRApp } from 'vue'
 import pinia from './store'
+import Loadmore from "@/components/Loadmore/Loadmore.vue"
+
 export function createApp() {
   const app = createSSRApp(App)
+  app.component("Loadmore", Loadmore)
   app.use(pinia)
   return {
     app
diff --git a/pages.json b/pages.json
index 791b48f..cd82078 100644
--- a/pages.json
+++ b/pages.json
@@ -7,6 +7,18 @@
 	},
 	
 	"pages": [
+		{
+			"path": "pages/brand/brandDetail/brandDetail",
+			"style": {
+				"navigationBarTitleText": "品牌详情"
+			}
+		},
+		{
+			"path": "pages/brand/brandList/brandList",
+			"style": {
+				"navigationBarTitleText": "品牌列表"
+			}
+		},
 		{
 			"path": "pages/index/index",
 			"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d5638a0..1e0f10f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -31,7 +31,16 @@ const clickMenu = (value) => {
 			uni.navigateTo({
 				url:"/pages/patient/patientList/patientList"
 			})
-			
+			break;
+		case 2:
+			uni.navigateTo({
+				url:"/pages/patient/patientFbList/patientFbList"
+			})
+			break;
+		case 3:
+			uni.navigateTo({
+				url:"/pages/brand/brandList/brandList"
+			})
 			break;
 	
 		default:
diff --git a/pages/patient/patientFbDetail/patientFbDetail.vue b/pages/patient/patientFbDetail/patientFbDetail.vue
index e9f5b7e..256ef83 100644
--- a/pages/patient/patientFbDetail/patientFbDetail.vue
+++ b/pages/patient/patientFbDetail/patientFbDetail.vue
@@ -29,41 +29,38 @@
     </view>
 </template>
 <style lang="scss" scoped>
-.box{
-    padding-top: 20rpx;
-    .head {
-        display: flex;
-        padding: 20rpx;
-        gap: 20rpx;
-        align-items: center;
-        color: #000;
-        image {
-            width: 100rpx;
-            height: 100rpx;
-            border-radius: 50%;
-            border: 1rpx solid #d4d4d4;
-        }
-        .info {
-            font-size: 24rpx;
-            >view {
-                display: flex;
-                gap: 30rpx;
-                align-items: flex-end;
-            }
-            .adorn {
-                font-weight: bold;
-                font-size: 32rpx;
-            }
-        }
+.head {
+    display: flex;
+    padding: 20rpx;
+    gap: 20rpx;
+    align-items: center;
+    color: #000;
+    image {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 50%;
+        border: 1rpx solid #d4d4d4;
     }
-    .content {
-        color: #333;
-        padding-bottom: 20rpx;
-        :first-child {
-            padding: 15rpx 0;
-            border-top: 1rpx solid #d4d4d4;
+    .info {
+        font-size: 24rpx;
+        >view {
+            display: flex;
+            gap: 30rpx;
+            align-items: flex-end;
+        }
+        .adorn {
+            font-weight: bold;
+            font-size: 32rpx;
         }
-        
     }
 }
+.content {
+    color: #333;
+    padding-bottom: 20rpx;
+    :first-child {
+        padding: 15rpx 0;
+        border-top: 1rpx solid #d4d4d4;
+    }
+    
+}
 </style>
\ No newline at end of file
diff --git a/pages/patient/patientFbList/patientFbList.vue b/pages/patient/patientFbList/patientFbList.vue
index 8e00368..6671a66 100644
--- a/pages/patient/patientFbList/patientFbList.vue
+++ b/pages/patient/patientFbList/patientFbList.vue
@@ -1,55 +1,70 @@
 <script setup>
-
+const clickDetail = () => {
+    uni.navigateTo({
+        url: "/pages/patient/patientFbDetail/patientFbDetail"
+    })
+}
 </script>
 <template>
     <!-- 病人反馈 -->
-     <view class="fb_list main">
-         <wd-card custom-class="item" v-for="item in 9" :key="item">
-            <view class="title">
-                <view class="left">
+    <view class="fb_list main">
+        <wd-card custom-class="item" v-for="item in 9" :key="item">
+            <view class="content" @tap="clickDetail">
+                <view class="title">
+                    <!-- <view class="left">
+                    </view> -->
                     <view>
                         姓名：xxx
                     </view>
                     <view>
-                       &nbsp; &nbsp;ID：133456
+                        ID：133456
                     </view>
+                    <view>2020-10-20</view>
+                </view>
+                <view class="text">
+                    病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
+                    病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
+                    病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
+                    病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
                 </view>
-                <view>日期：2020-10-20</view>
             </view>
-             <view class="content">
-                 病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
-                 病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
-                 病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
-                 病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
-             </view>
-         </wd-card>
-     </view>
+        </wd-card>
+    </view>
+    <Loadmore></Loadmore>
 </template>
 <style lang="scss" scoped>
 .fb_list {
     font-size: 26rpx;
-    padding-top: 20rpx;
+
     :deep(.item) {
         padding: 0;
     }
-    .title {
-        display: flex;
-        justify-content: space-between;
-        padding: 20rpx;
-        color: #333;
-        border-bottom: 1px solid #e7e8e8;
-    }
     .content {
-        padding: 20rpx;
-        height: 123rpx;
-        line-height: 45rpx;
-        letter-spacing: 3rpx;
-        word-break: break-all;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 3;
+        padding-bottom: 25rpx;
+        .title {
+            display: flex;
+            justify-content: space-between;
+            padding: 20rpx;
+            color: #333;
+            font-size: 26rpx;
+            align-items: flex-end;
+            :first-child {
+                font-size: 30rpx;
+            }
+        }
+    
+        .text {
+            padding: 0 20rpx;
+            height: 123rpx;
+            line-height: 40rpx;
+            letter-spacing: 3rpx;
+            word-break: break-all;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 3;
+        }
     }
 }
 </style>
\ No newline at end of file
diff --git a/pages/patient/patientList/patientList.vue b/pages/patient/patientList/patientList.vue
index 83034a5..a0f5669 100644
--- a/pages/patient/patientList/patientList.vue
+++ b/pages/patient/patientList/patientList.vue
@@ -3,18 +3,22 @@ import { ref } from 'vue';
 import { onLoad } from "@dcloudio/uni-app"
 import { getPatientList } from "@/services/patient"
 let active = ref('all')
+let num = ref(5)
+// 切换导航
 let cutNav = (type) => {
     active.value = type
 }
 onLoad(() => {
-    getPatientList()
+    // getPatientList()
 })
+const reachBottom = () => {
+    if (num.value < 20) num.value += 5
+}
 </script>
 
 <template>
     <!-- 病人管理 -->
     <view class="main">
-        <wd-watermark content="wot-design-uni"></wd-watermark>
         <wd-fab inactiveIcon="ellipsis" activeIcon="rollback">
             <view class="fab">
                 <view>调压趋势</view>
@@ -31,12 +35,13 @@ onLoad(() => {
             </view>
             <wd-search placeholder="住院号/病人名称/医生" hide-cancel />
         </view>
+        <wd-gap height="190rpx"></wd-gap>
         <view class="patient_list">
-            <wd-card custom-class="item" v-for="value in 10" :key="value">
+            <wd-card custom-class="item" v-for="item in num" :key="item">
                 <view class="top">
                     <text>住院号：000000</text>
                     <text>2020-12-22</text>
-                    <text>手术次数：1</text>
+                    <text>手术次数：{{ item }}{{ num }}</text>
                 </view>
                 <view class="content">
                     <view>患者姓名：xxx</view>
@@ -57,6 +62,7 @@ onLoad(() => {
             </wd-card>
         </view>
     </view>
+    <Loadmore :number="num" :total="20" @reachBottom="reachBottom"></Loadmore>
 </template>
 
 <style lang="scss" scoped>
@@ -76,9 +82,9 @@ onLoad(() => {
 }
 
 .nav_bar {
-    position: sticky;
-    left: 0;
+    position: fixed;
     top: 0;
+    width: 100%;
     background-color: #fff;
     z-index: 10;
     box-shadow: 0px 2px 5px #c5c5c5;