From 3ce26c2b8d29f6a7cba308f5b4cc510f14b13b90 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 22 Jul 2022 12:53:34 +0800
Subject: [PATCH 1/2] up

---
 packageA/pages/generalPatrol/generalPatrol.vue           | 2 +-
 raininspection/raininspectionlist/raininspectionList.vue | 4 ++--
 utils/util.js                                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packageA/pages/generalPatrol/generalPatrol.vue b/packageA/pages/generalPatrol/generalPatrol.vue
index 4e6cddf..64e08f2 100644
--- a/packageA/pages/generalPatrol/generalPatrol.vue
+++ b/packageA/pages/generalPatrol/generalPatrol.vue
@@ -161,7 +161,7 @@
 				// 		this.filesList.push(m)
 				// 	}
 				// }
-				 this.filesList = list;
+				 this.filesList = lists;
 			},
 			confirmUnit(e) {
 				var that = this;
diff --git a/raininspection/raininspectionlist/raininspectionList.vue b/raininspection/raininspectionlist/raininspectionList.vue
index 71442ae..14a82b2 100644
--- a/raininspection/raininspectionlist/raininspectionList.vue
+++ b/raininspection/raininspectionlist/raininspectionList.vue
@@ -72,8 +72,8 @@
 								@click="todetail(item.id)" :ripple="true">查看
 							</u-button>
 						</block>
-						<block >
-							<u-button type="error"  size="medium" @click="del(item.id)"
+						<block v-if="item.status==0 || item.status==1">
+							<u-button type="error" size="medium" @click="del(item.id)"
 								:custom-style="customStyle" :ripple="true">删除
 							</u-button>
 						</block>
diff --git a/utils/util.js b/utils/util.js
index a1f704b..7d95679 100755
--- a/utils/util.js
+++ b/utils/util.js
@@ -1,8 +1,8 @@
 import md5 from "./md5.min";
 const HOSTARR = {
-	//'development': 'http://patrol.115.langye.net',
+	// 'development': 'http://patrol.115.langye.net',
 	'development': 'http://192.168.60.100:9001',
-	'production': 'http://192.168.60.100:9001'
+	// 'production': 'http://192.168.60.100:9001'
 }; // 审核状态
 
 const HOST = HOSTARR[process.env

From ed66ad90387b073b7c78f6778dca49234294787b Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 22 Jul 2022 12:56:05 +0800
Subject: [PATCH 2/2] up

---
 pages.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages.json b/pages.json
index 74b5f82..3186368 100644
--- a/pages.json
+++ b/pages.json
@@ -156,9 +156,8 @@
 			"path": "orderList/orderList",
 			"style": {
 				"navigationBarTitleText": "工单执行",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom",
-				 "disableScroll": true
+				"enablePullDownRefresh": true,
+				"disableScroll": true
 			}
 		},{
 			"path": "orderInfo/orderInfo",