From fd1ea22e6d90a3847b3fa87afdee3d78289cd11c Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 22 Jul 2023 15:16:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=8A=9F=E8=83=BD,=E6=8F=90=E9=AB=98=E7=9B=B8?=
 =?UTF-8?q?=E5=BA=94=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/oaManager/oaManager.vue  | 22 +++++++++++++++++++---
 subpkg/manager/manager.vue     | 22 +++++++++++++++++++---
 subpkg/personnel/personnel.vue | 28 ++++++++++++++++++++++------
 3 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/pages/oaManager/oaManager.vue b/pages/oaManager/oaManager.vue
index a296b63..c666fb3 100644
--- a/pages/oaManager/oaManager.vue
+++ b/pages/oaManager/oaManager.vue
@@ -69,10 +69,12 @@
       return {
         show: false,
         loadConfig:{
+          page: 1,
+          limit: 15,
           loadingText: '努力加载中',
           loadmoreText: '轻轻上拉',
           nomoreText: '我也是有底线的~~',
-          status: 'nomore'
+          status: 'loadmore'
         },
         areaManagerList:[]
       }
@@ -87,10 +89,24 @@
     onShow() {
       this.loadAreaManager();
     },
+    onReachBottom() {
+      this.loadAreaManager();
+    },
     methods: {
       async loadAreaManager(){
-        let res = await companyAreaManager();
-        this.areaManagerList = res.data;
+        if(this.loadConfig.status=="nomore")return;
+        this.loadConfig.status="loading"
+        let res = await companyAreaManager({
+          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.areaManagerList = [...this.areaManagerList, ...res.data?.data]
       },
       //拨打电话
       callUp(phone) {
diff --git a/subpkg/manager/manager.vue b/subpkg/manager/manager.vue
index a296b63..c666fb3 100644
--- a/subpkg/manager/manager.vue
+++ b/subpkg/manager/manager.vue
@@ -69,10 +69,12 @@
       return {
         show: false,
         loadConfig:{
+          page: 1,
+          limit: 15,
           loadingText: '努力加载中',
           loadmoreText: '轻轻上拉',
           nomoreText: '我也是有底线的~~',
-          status: 'nomore'
+          status: 'loadmore'
         },
         areaManagerList:[]
       }
@@ -87,10 +89,24 @@
     onShow() {
       this.loadAreaManager();
     },
+    onReachBottom() {
+      this.loadAreaManager();
+    },
     methods: {
       async loadAreaManager(){
-        let res = await companyAreaManager();
-        this.areaManagerList = res.data;
+        if(this.loadConfig.status=="nomore")return;
+        this.loadConfig.status="loading"
+        let res = await companyAreaManager({
+          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.areaManagerList = [...this.areaManagerList, ...res.data?.data]
       },
       //拨打电话
       callUp(phone) {
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 424ab86..3a96ada 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -47,6 +47,7 @@
           </view>
         </view>
       </block>
+      <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
       <!-- <view class="personnel_item">
         <view class="type type_blue">
           <image src="../../static/icons/ok_w.png"></image>
@@ -102,6 +103,14 @@ export default {
   },
   data() {
     return {
+      loadConfig:{
+        page: 1,
+        limit: 15,
+        loadingText: '努力加载中',
+        loadmoreText: '轻轻上拉',
+        nomoreText: '我也是有底线的~~',
+        status: 'loadmore'
+      },
       userList: []
     }
   },
@@ -116,14 +125,21 @@ export default {
           url: url,
         }) : Toast('暂未开放')
     },
-    loadUserList(){
+    async loadUserList(){
       let that = this;
-      companyUser({
-        page: 1,
-        limit: 15
-      }).then(res=>{
-        that.userList = res.data.data;
+      if(this.loadConfig.status=="nomore")return;
+      this.loadConfig.status="loading"
+      let res = await companyUser({
+        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.userList = [...this.userList, ...res.data?.data]
     }
   },
   onPullDownRefresh() {