From 2c2811f65a26fd6821f618dfa233842be06519c2 Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Thu, 17 Oct 2024 09:47:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=98=E5=B7=A5=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/http.js    | 30 +++++++++++++++---------------
 pageStaff/addstaff.vue |  9 +++++++--
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/http/yskApi/http.js b/http/yskApi/http.js
index 47ef1f2..ad8678f 100644
--- a/http/yskApi/http.js
+++ b/http/yskApi/http.js
@@ -64,7 +64,7 @@ function commonsProcess(showLoading, httpReqCallback) {
 
 	return httpReqCallback().then((httpData) => {
 		reqFinishFunc(); // 请求完毕的动作
-
+console.log(httpData,'调试1')
 		// 从http响应数据中解构响应数据 [ 响应码、 bodyData ]
 		let {
 			statusCode,
@@ -93,20 +93,20 @@ function commonsProcess(showLoading, httpReqCallback) {
 		}
 
 		// 业务响应异常
-		if (bodyData.hasOwnProperty('code') && bodyData.code != 200) {
-			isShowErrorToast = true
-			infoBox.showToast(bodyData.msg)
-			if (bodyData.code == 5005) { // 密码已过期， 直接跳转到更改密码页面
-				uni.reLaunch({
-					url: '/pageUser/setting/updatePwd'
-				})
-			}
-			// if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面
-			// 	uni.redirectTo({url: '/pages/login/index'})
-			// }
-			return bodyData
-			// return Promise.reject(bodyData)
-		}
+		// if (bodyData.hasOwnProperty('code') && bodyData.code != 200) {
+		// 	isShowErrorToast = true
+		// 	infoBox.showToast(bodyData.msg)
+		// 	if (bodyData.code == 5005) { // 密码已过期， 直接跳转到更改密码页面
+		// 		uni.reLaunch({
+		// 			url: '/pageUser/setting/updatePwd'
+		// 		})
+		// 	}
+		// 	// if(bodyData.code == 500){ // 密码已过期， 直接跳转到更改密码页面
+		// 	// 	uni.redirectTo({url: '/pages/login/index'})
+		// 	// }
+		// 	return bodyData
+		// 	// return Promise.reject(bodyData)
+		// }
 
 		// 加密数据
 		if (!bodyData.data && bodyData.encryptData) {
diff --git a/pageStaff/addstaff.vue b/pageStaff/addstaff.vue
index fb412b5..f42e985 100644
--- a/pageStaff/addstaff.vue
+++ b/pageStaff/addstaff.vue
@@ -71,7 +71,7 @@
 		<view class="">
 			<up-checkbox shape='circle' :customStyle="{marginBottom: '8px'}" v-model:checked="ele.hasPermission"
 				usedAlone v-for="(ele, index) in item.children" :key="index" :label="ele.label"
-				style="margin-right: 40rpx;font-size: 28rpx;">
+				:labelColor="ele.isImportant==1?'#e66c6d':''" style="margin-right: 40rpx;font-size: 28rpx;">
 			</up-checkbox>
 		</view>
 	</view>
@@ -132,13 +132,18 @@
 		} else {
 			// 调用id查询接口和编辑接口
 			gettbPlussShopStaffDetail(props.id)
+			uni.setNavigationBarTitle({
+				title: '编辑员工'
+			})
 		}
 	})
 
 	function gettbPlussShopStaffDetail(id) {
 		tbPlussShopStaffDetail(id).then(res => {
 			datas.formData = res
-			datas.rolesdata = datas.rolesList.filter(ele => ele.id == res.roleId)[0].name
+			if (datas.rolesList) {
+				datas.rolesdata = datas.rolesList.filter(ele => ele.id == res.roleId)[0].name
+			}
 		})
 	}