From ca6d3fc8c3b66bbc0ac13d6874575ebbffb92bf4 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 8 Sep 2023 16:00:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                           |  5 +++--
 pages/oaMy/oaMy.vue                  |  2 +-
 subpkg/newPersonnel/newPersonnel.vue | 12 ++++++------
 subpkg/orderDetail/orderDetail.vue   | 20 +++++++++++++-------
 subpkg/taskAdmin/taskAdmin.vue       |  6 +++++-
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/pages.json b/pages.json
index f0f0302..6f890a3 100644
--- a/pages.json
+++ b/pages.json
@@ -66,6 +66,7 @@
       "path": "pages/oaMy/oaMy",
       "style": {
         "navigationBarTitleText": "",
+        "enablePullDownRefresh": true,
         "app-plus": {
           "titleNView": false
         },
@@ -350,7 +351,7 @@
       "path": "orderDetail/orderDetail",
       "style": {
         "navigationBarTitleText": "流水详情",
-        "enablePullDownRefresh": false,
+        "enablePullDownRefresh": true,
         "navigationBarBackgroundColor": "#0122C7",
         "navigationBarTextStyle": "white"
       }
@@ -458,7 +459,7 @@
       "path": "taskAdmin/taskAdmin",
       "style": {
         "navigationBarTitleText": "任务管理",
-        "enablePullDownRefresh": false,
+        "enablePullDownRefresh": true,
         "navigationBarBackgroundColor": "#0122C7",
         "navigationBarTextStyle": "white"
       }
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index bff3d02..98f3d52 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -189,6 +189,7 @@
 			async getOaUserInfo() {
 				const res = await userInfo();
 				this.$store.commit('setUserInfo', res.data);
+        uni.stopPullDownRefresh()
 			},
 			navTo (url) {
 			  if(url){
@@ -216,7 +217,6 @@
 		},
 		onPullDownRefresh() {
 			this.getOaUserInfo()
-			uni.stopPullDownRefresh()
 		}
 	}
 </script>
diff --git a/subpkg/newPersonnel/newPersonnel.vue b/subpkg/newPersonnel/newPersonnel.vue
index 1135048..5ab1e33 100644
--- a/subpkg/newPersonnel/newPersonnel.vue
+++ b/subpkg/newPersonnel/newPersonnel.vue
@@ -73,7 +73,7 @@
 								<u-upload
 									:fileList="formData.qualification.id_card?[{url:formData.qualification.id_card}]:[]"
 									@afterRead="afterRead" @delete="formData.qualification.id_card=''" name="id_card"
-									:maxCount="1" width="638rpx" height="300rpx" style="margin-top: 10rpx;">
+									:maxCount="1" width="300rpx" height="200rpx" style="margin-top: 10rpx;">
 								</u-upload>
 								<!-- 
 								<u-upload :fileList="formData.avatar?[{url:formData.avatar}]:[]"
@@ -95,7 +95,7 @@
 								<u-upload
 									:fileList="formData.qualification.id_card_b?[{url:formData.qualification.id_card_b}]:[]"
 									@afterRead="afterRead" @delete="formData.qualification.id_card_b=''"
-									name="id_card_b" :maxCount="1" width="638rpx" height="300rpx"
+									name="id_card_b" :maxCount="1" width="300rpx" height="200rpx"
 									style="margin-top: 10rpx;">
 								</u-upload>
 							</view>
@@ -124,7 +124,7 @@
 								<u-upload
 									:fileList="formData.qualification.bank_account?[{url:formData.qualification.bank_account}]:[]"
 									@afterRead="afterRead" @delete="formData.qualification.bank_account=''"
-									name="bank_account" :maxCount="1" width="638rpx" height="300rpx"
+									name="bank_account" :maxCount="1" width="300rpx" height="200rpx"
 									style="margin-top: 10rpx;">
 								</u-upload>
 							</view>
@@ -142,7 +142,7 @@
 								<u-upload
 									:fileList="formData.qualification.bank_account_b?[{url:formData.qualification.bank_account_b}]:[]"
 									@afterRead="afterRead" @delete="formData.qualification.bank_account_b=''"
-									name="bank_account_b" :maxCount="1" width="638rpx" height="300rpx"
+									name="bank_account_b" :maxCount="1" width="300rpx" height="200rpx"
 									style="margin-top: 10rpx;">
 								</u-upload>
 							</view>
@@ -170,7 +170,7 @@
 								<u-upload
 									:fileList="formData.qualification.car_card?[{url:formData.qualification.car_card}]:[]"
 									@afterRead="afterRead" @delete="formData.qualification.car_card=''" name="car_card"
-									:maxCount="1" width="638rpx" height="300rpx" style="margin-top: 10rpx;">
+									:maxCount="1" width="300rpx" height="200rpx" style="margin-top: 10rpx;">
 								</u-upload>
 							</view>
 						</view>
@@ -187,7 +187,7 @@
 								<u-upload
 									:fileList="formData.qualification.car_card_b?[{url:formData.qualification.car_card_b}]:[]"
 									@afterRead="afterRead" @delete="formData.qualification.car_card_b=''"
-									name="car_card_b" :maxCount="1" width="638rpx" height="300rpx"
+									name="car_card_b" :maxCount="1" width="300rpx" height="200rpx"
 									style="margin-top: 10rpx;">
 								</u-upload>
 							</view>
diff --git a/subpkg/orderDetail/orderDetail.vue b/subpkg/orderDetail/orderDetail.vue
index b8ae9e5..ccf2fdd 100644
--- a/subpkg/orderDetail/orderDetail.vue
+++ b/subpkg/orderDetail/orderDetail.vue
@@ -110,8 +110,8 @@
       }
     },
     onLoad() {
-      this.initDate()
-      this.loadBill()
+      this.initDate();
+      this.initLoad();
     },
     onShow() {},
     computed: {
@@ -175,6 +175,13 @@
       this.loadBill()
     },
     methods: {
+      // 初始化加载
+      async initLoad(){
+        this.loadConfig.page = 1;
+        this.loadConfig.status = 'loadmore';
+        this.billList = [];
+        await this.loadBill();
+      },
       async loadBill() {
         if (this.loadConfig.status == "nomore") return;
         this.loadConfig.status = "loading"
@@ -203,10 +210,7 @@
         this.nowDate.y = e.year;
         this.nowDate.m = +e.month;
         this.nowDate.d = e.date;
-        this.loadConfig.page = 1;
-        this.loadConfig.status = 'loadmore';
-        this.billList = [];
-        this.loadBill();
+        this.initLoad()
       },
       // 选择月份
       bindDateChangeMonth(e) {
@@ -216,7 +220,9 @@
       }
     },
     onPullDownRefresh() {
-      uni.stopPullDownRefresh()
+      this.initLoad().then(()=>{
+        uni.stopPullDownRefresh();
+      })
     }
   }
 </script>
diff --git a/subpkg/taskAdmin/taskAdmin.vue b/subpkg/taskAdmin/taskAdmin.vue
index 6af1564..dfb4026 100644
--- a/subpkg/taskAdmin/taskAdmin.vue
+++ b/subpkg/taskAdmin/taskAdmin.vue
@@ -100,7 +100,11 @@
       },
     },
     onPullDownRefresh() {
-      uni.stopPullDownRefresh()
+      this.loadConfig.page = 1;
+      this.loadConfig.status = 'loadmore';
+      this.loadTaskList().then(()=>{
+        uni.stopPullDownRefresh()
+      })
     }
   }
 </script>