From d1a84753e312239644c200ff3b37f05cfcd53d63 Mon Sep 17 00:00:00 2001
From: FrancisHu <2756004617@qq.com>
Date: Thu, 4 Jul 2024 17:03:19 +0800
Subject: [PATCH] =?UTF-8?q?7.4=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/http.js                  | 12 ++++++------
 manifest.json                 |  4 ++--
 pages/crashExam/crashExam.vue | 12 ++++++++++++
 pages/workSpace/workSpace.vue |  8 ++++----
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/apis/http.js b/apis/http.js
index 16a39a5..dcaec44 100644
--- a/apis/http.js
+++ b/apis/http.js
@@ -3,26 +3,26 @@ class HttpConfig {
 	baseUrl = "/api"
 	// #endif
 	// #ifdef APP-PLUS
-	// baseUrl = "http://112.29.103.165:21624"
+	baseUrl = "http://112.29.103.165:21624"
 	// baseUrl = "http://192.168.0.14:21624"
 	// baseUrl = "http://112.29.103.165:21626"
 	// baseUrl = "http://172.20.10.3:8080"
 	// baseUrl = "http://10.40.92.8:8080"
 	// baseUrl = "http://10.40.92.52:28080"
 	// baseUrl = "http://10.40.92.78:28080"
-	baseUrl = "http://192.168.2.122:28080"
+	// baseUrl = "http://192.168.2.122:28080"
 	// baseUrl = "https://z.csgmall.com.cn/gl"
 	// baseUrl = "http://10.40.92.141:28080"
 	// #endif
 	// 基地址
-	/* authPath = `${this.baseUrl}/dev-api/auth`
+	authPath = `${this.baseUrl}/dev-api/auth`
 	systemPath = `${this.baseUrl}/dev-api/system`
 	basePath = `${this.baseUrl}/dev-api/base`
-	materialPath = `${this.baseUrl}/dev-api/material` */
-	authPath = `${this.baseUrl}/auth`
+	materialPath = `${this.baseUrl}/dev-api/material`
+	/* authPath = `${this.baseUrl}/auth`
 	systemPath = `${this.baseUrl}/system`
 	basePath = `${this.baseUrl}/base`
-	materialPath = `${this.baseUrl}/material`
+	materialPath = `${this.baseUrl}/material` */
 	// 短链
 	serviceUrl = {
 		login: {
diff --git a/manifest.json b/manifest.json
index a191a6e..b5aecdf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "智慧仓储",
     "appid" : "__UNI__9D122E1",
     "description" : "",
-    "versionName" : "1.1.3",
-    "versionCode" : 113,
+    "versionName" : "1.1.4",
+    "versionCode" : 114,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/crashExam/crashExam.vue b/pages/crashExam/crashExam.vue
index bff55f7..329a3c8 100644
--- a/pages/crashExam/crashExam.vue
+++ b/pages/crashExam/crashExam.vue
@@ -70,6 +70,10 @@
 			</view>
 			<view class="sticky-area">
 				<h4
+					:class="[
+						{ red: fetch.taskStatus == 61 },
+						{ green: fetch.taskStatus == 59 }
+					]"
 				>
 					{{ fetch.taskStatusName }}
 				</h4>
@@ -564,6 +568,14 @@
 				border: 1px solid #3788FF; 
 				color: #3788FF;
 			}
+			.red{
+				color: #FF4141;
+				border-color: #FF4141;
+			}
+			.green{
+				color: #1BD30B;
+				border-color: #1BD30B;
+			}
 		}
 	}
 	.btm-sticky{
diff --git a/pages/workSpace/workSpace.vue b/pages/workSpace/workSpace.vue
index 1cb9450..2d6831b 100644
--- a/pages/workSpace/workSpace.vue
+++ b/pages/workSpace/workSpace.vue
@@ -72,11 +72,11 @@
 						pic: '/static/newCheck.png',
 						url: 'newCheck'
 					}, */
-					{
+					/* {
 						name: '综合服务中心审核',
 						pic: '/static/serviceCenterExam.png',
 						url: 'serviceCenterExam'
-					},
+					}, */
 					{
 						name: '新购入库',
 						pic: '/static/newInStore.png',
@@ -107,7 +107,7 @@
 						pic: '/static/fix.png',
 						url: 'fix'
 					},
-					{
+					/* {
 						name: '预报废审核',
 						pic: '/static/preCrashExam.png',
 						url: 'preCrashExam'
@@ -116,7 +116,7 @@
 						name: '预报废列表',
 						pic: '/static/preCrashList.png',
 						url: 'preCrashList'
-					},
+					}, */
 					{
 						name: '报废审核',
 						pic: '/static/crashExam.png',