From 738dd6bd47e5cec999eb3d61dc82f33b8202f853 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 22 Jul 2023 15:37:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E5=90=8C=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                   |  2 +-
 subpkg/contract/contract.vue | 32 +++++++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/pages.json b/pages.json
index cf08612..0169bda 100644
--- a/pages.json
+++ b/pages.json
@@ -157,7 +157,7 @@
                     "path" : "contract/contract",
                     "style" :                                                                                    
                 {
-                    "navigationBarTitleText": "合同签订",
+                    "navigationBarTitleText": "合同管理",
                     "enablePullDownRefresh": false
                 }
                 
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index d42ff58..badbb6c 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="">
-    <view class="tabs">
+    <!-- <view class="tabs">
       <view class="left">
         <view class="item" :class="changeType==0?'active':''" @click="changeType=0">合同列表</view>
         <view class="item" :class="changeType==1?'active':''" @click="changeType=1">已签订合同</view>
@@ -8,7 +8,7 @@
       <view class="right">
         <text>新增</text>
       </view>
-    </view>
+    </view> -->
     <view class="contract_list">
       <view class="item" v-for="(item,index) in list" :key="item.id">
         <view class="top">
@@ -21,7 +21,7 @@
             <view class="date">
               <!-- <text class="time">2023-04-27 至 2024-04-28 </text> -->
               <text class="time">修改时间:{{item.update_time}}</text>
-              <text class="expire">365天后到期</text>
+              <!-- <text class="expire">365天后到期</text> -->
             </view>
           </view>
         </view>
@@ -33,6 +33,7 @@
         </view>
       </view>
     </view>
+    <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
   </view>
 </template>
 
@@ -42,7 +43,15 @@
     data() {
       return {
         changeType: 0,
-        list: []
+        list: [],
+        loadConfig:{
+          page: 1,
+          limit: 15,
+          loadingText: '努力加载中',
+          loadmoreText: '轻轻上拉',
+          nomoreText: '我也是有底线的~~',
+          status: 'loadmore'
+        },
       }
     },
     onLoad() {},
@@ -63,10 +72,19 @@
           }) : Toast('暂未开放')
       },
       async initContractList() {
-        let res = await contractList();
-        if (res?.data?.data.length > 0) {
-          this.list = res.data.data;
+        if(this.loadConfig.status=="nomore")return;
+        this.loadConfig.status="loading"
+        let res = await contractList({
+          page: this.loadConfig.page,
+          limit: this.loadConfig.limit
+        })
+        this.loadConfig.status="loadmore"
+        if(res.data.data.length<this.loadConfig.limit){
+          this.loadConfig.status="nomore"
+        }else {
+          this.loadConfig.page++;
         }
+        this.list = [...this.list, ...res.data?.data]
       }
     },
     onPullDownRefresh() {