From 403c430ba3dd564a67684ab5d0c516174acd5e92 Mon Sep 17 00:00:00 2001
From: guoweilong <mo@mddzwhfgs.wecom.work>
Date: Wed, 18 Sep 2024 16:26:33 +0800
Subject: [PATCH] fix:员工端订单状态值修改、会员端上传图片限制大小

---
 frontend/app-employee/pages/home/home.vue                                 | 2 +-
 frontend/app-user/pages/home/repairReport.vue                             | 7 ++++++-
 frontend/front/src/views/pages/regionalManage/components/regionManage.vue | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/frontend/app-employee/pages/home/home.vue b/frontend/app-employee/pages/home/home.vue
index 0f2cedc..c7ec58f 100644
--- a/frontend/app-employee/pages/home/home.vue
+++ b/frontend/app-employee/pages/home/home.vue
@@ -363,7 +363,7 @@
 			},
 			async getStaffOrderPage() {
 				let params = {
-					zt: '待配送',
+					zt: '202',
 					current: this.pageParams.currentPage,
 					size: 10,
 				}
diff --git a/frontend/app-user/pages/home/repairReport.vue b/frontend/app-user/pages/home/repairReport.vue
index 9cdc1dd..cba7f36 100644
--- a/frontend/app-user/pages/home/repairReport.vue
+++ b/frontend/app-user/pages/home/repairReport.vue
@@ -37,7 +37,7 @@
 				<view class="flex justify-start align-end">
 					<view class="">
 						<u-upload :fileList="fileList" uploadIcon="plus" @afterRead="afterRead" @delete="deletePic"
-							multiple :maxCount="5"></u-upload>
+							multiple :maxCount="5" :maxSize="maxSize * 1024 * 1024" @oversize="overSize"></u-upload>
 					</view>
 					<view class="margin-left-sm text-gray text-lg">
 						{{ fileList.length }}/5
@@ -140,6 +140,7 @@
 						trigger: ['blur', 'change']
 					},
 				},
+				maxSize:10,
 			}
 		},
 		onLoad() {
@@ -235,6 +236,10 @@
 			deletePic(event) {
 				this[`fileList${event.name}`].splice(event.index, 1)
 			},
+			// 图片大小超出最大允许大小
+			overSize(e) {
+				uni.$u.toast(`上传图片大小不能超过${this.maxSize}MB!`)
+			},
 			// 新增图片
 			async afterRead(event) {
 				console.log('打印event', event);
diff --git a/frontend/front/src/views/pages/regionalManage/components/regionManage.vue b/frontend/front/src/views/pages/regionalManage/components/regionManage.vue
index 826070a..61964b7 100644
--- a/frontend/front/src/views/pages/regionalManage/components/regionManage.vue
+++ b/frontend/front/src/views/pages/regionalManage/components/regionManage.vue
@@ -370,6 +370,7 @@ export default {
             projection: 'EPSG:900913' 
           });
         }
+        this.map.clearOverLays();
         this.map.centerAndZoom(new T.LngLat(this.centerPoint[0], this.centerPoint[1]), 16);
         //允许鼠标双击放大地图
         this.map.enableScrollWheelZoom();
@@ -614,7 +615,9 @@ export default {
     //draw 绘制圆形，矩形，多边形
     draw(type,shapType){
       if(this.dialogParams.dialogType == 'edit'){
-        this.handler.close();
+        if(this.handler){
+          this.handler.close();
+        }
         // this.handler.clear();
         // this.mapEditor.close();
       }
--
libgit2 0.21.2