调整

.gitignore

@@ -1,2 +1,3 @@
 unpackage
 node_modules
+CLAUDE.md

App.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { onLaunch } from "@dcloudio/uni-app"
+
 onLaunch(() => {
 	const updateManager = wx.getUpdateManager()
 	updateManager.onCheckForUpdate(function (res) {
@@ -36,5 +37,6 @@ onLaunch(() => {
 .main {
 	min-height: 95vh;
     background: linear-gradient(to top, #f2f8ff 0%, #e7f0fd 100%);
+	padding-top: 20rpx;
 }
 </style>

components/Loadmore/Loadmore.vue

@@ -0,0 +1,26 @@
+<script setup>
+import { ref } from "vue";
+import { onReachBottom } from "@dcloudio/uni-app"
+const emit = defineEmits(["reachBottom"])
+// 当前数量，总数量
+const props = defineProps({
+    number: Number,
+    total: Number
+})
+let loadState = ref("loading")
+// 触底事件
+onReachBottom(() => {
+    console.log(props);
+    if (props.number < props.total) {
+        loadState.value = "loading"
+    } else if (props.number == props.total) {
+        loadState.value = "finished"
+    }
+    emit("reachBottom")
+})
+</script>
+<template>
+    <slot></slot>
+    <wd-watermark content="wot-design-uni"></wd-watermark>
+    <wd-loadmore :state="loadState" loading-text="数据加载中"/>
+</template>

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

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": {

pages/brand/brandDetail/brandDetail.vue

@@ -0,0 +1,46 @@
+<script setup></script>
+<template>
+    <view class="main">
+        <view class="search">
+            <wd-search placeholder="请输入搜索内容" cancel-txt="搜索"/>
+        </view>
+        <wd-gap height="100rpx"></wd-gap>
+        <wd-card v-for="item in 5" :key="item">
+            <template #title>
+                <view class="title">
+                    <wd-img width="130rpx" height="130rpx" src="/static/logo.png"></wd-img>
+                    <view>
+                        <view>产品型号：</view>
+                        <view>是否抗磁：</view>
+                    </view>
+                </view>
+            </template>
+            <view class="content">
+                <view>型号描述</view>
+                <view class="text">啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊</view>
+            </view>
+        </wd-card>
+    </view>
+</template>
+<style lang="scss" scoped>
+.search {
+    position: fixed;
+    top: 0;
+    width: 100%;
+}
+.title {
+    display: flex;
+    align-items: center;
+    gap: 20rpx;
+    line-height: 40rpx;
+    font-size: 28rpx;
+}
+.content {
+    padding-bottom: 25rpx;
+    .text {
+        overflow: scroll;
+        height: 150rpx;
+        padding-top: 15rpx;
+    }
+}
+</style>

pages/brand/brandList/brandList.vue

@@ -0,0 +1,24 @@
+<script setup>
+    const clickDetail = () => {
+        uni.navigateTo({
+				url:"/pages/brand/brandDetail/brandDetail"
+			})
+    }
+</script>
+<template>
+    <view class="main">
+        <view @tap="clickDetail" v-for="item in 5" :key="item">
+            <wd-card title="分流厂家名称">
+                <view class="content">
+                    描述
+                </view>
+            </wd-card>
+        </view>
+    </view>
+    <Loadmore></Loadmore>
+</template>
+<style lang="scss" scoped>
+.content {
+    height: 200rpx;
+}
+</style>

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:

pages/patient/patientFbDetail/patientFbDetail.vue

@@ -29,8 +29,6 @@
     </view>
 </template>
 <style lang="scss" scoped>
-.box{
-    padding-top: 20rpx;
 .head {
     display: flex;
     padding: 20rpx;
@@ -65,5 +63,4 @@
     }
     
 }
-}
 </style>

pages/patient/patientFbList/patientFbList.vue

@@ -1,48 +1,62 @@
 <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="content" @tap="clickDetail">
                 <view class="title">
-                <view class="left">
+                    <!-- <view class="left">
+                    </view> -->
                     <view>
                         姓名：xxx
                     </view>
                     <view>
-                       &nbsp; &nbsp;ID：133456
+                        ID：133456
                     </view>
+                    <view>2020-10-20</view>
                 </view>
-                <view>日期：2020-10-20</view>
+                <view class="text">
+                    病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
+                    病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
+                    病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
+                    病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
                 </view>
-             <view class="content">
-                 病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
-                 病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
-                 病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
-                 病人反馈信息啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊
             </view>
         </wd-card>
     </view>
+    <Loadmore></Loadmore>
 </template>
 <style lang="scss" scoped>
 .fb_list {
     font-size: 26rpx;
-    padding-top: 20rpx;
+
     :deep(.item) {
         padding: 0;
     }
+    .content {
+        padding-bottom: 25rpx;
         .title {
             display: flex;
             justify-content: space-between;
             padding: 20rpx;
             color: #333;
-        border-bottom: 1px solid #e7e8e8;
+            font-size: 26rpx;
+            align-items: flex-end;
+            :first-child {
+                font-size: 30rpx;
             }
-    .content {
+        }
-        padding: 20rpx;
+    
+        .text {
+            padding: 0 20rpx;
             height: 123rpx;
-        line-height: 45rpx;
+            line-height: 40rpx;
             letter-spacing: 3rpx;
             word-break: break-all;
             overflow: hidden;
@@ -52,4 +66,5 @@
             -webkit-line-clamp: 3;
         }
     }
+}
 </style>

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;
+    position: fixed;
-    left: 0;
     top: 0;
+    width: 100%;
     background-color: #fff;
     z-index: 10;
     box-shadow: 0px 2px 5px #c5c5c5;