Explorar o código

[dev]
优化登出时的操作逻辑

Neo hai 1 ano
pai
achega
9babff64c6
Modificáronse 1 ficheiros con 39 adicións e 25 borrados
  1. 39 25
      components/nav-bar/nav-bar.vue

+ 39 - 25
components/nav-bar/nav-bar.vue

@@ -86,28 +86,24 @@ const emitclose =()=>{
 
 const handleChange =async()=>{
 	
-	console.log("props.userInfo.workStatus》》》", props.workStatus)
-	const token = uni.getStorageSync('token')
-	const userId = uni.getStorageSync('userId')
-	// if(props.workStatus=='1'){
-		const params = {
-			token: uni.getStorageSync('token'),
-			data: {
-				pharmacistUserId: userId,
-				workStatus: props.workStatus ==='1'?'0':'1'
-			}
+	const params = {
+		token: uni.getStorageSync('token'),
+		data: {
+			pharmacistUserId: uni.getStorageSync('userId'),
+			workStatus: props.workStatus ==='1'?'0':'1'
 		}
-		console.log('params.data.workStatus', params)
+	}
+	// console.log('params.data.workStatus', params)
+	
+	const {data:res} = await updateWorkStatus(params)
+	if (res.code === 200) {
+		uni.setStorageSync('workStatus', params.data.workStatus);
+		emit('updateUser', params.data.workStatus)
 		
-		const {data:res} = await updateWorkStatus(params)
-		if (res.code === 200) {
-			uni.setStorageSync('workStatus', params.data.workStatus);
-			emit('updateUser', params.data.workStatus)
-			
-		} else {
-			emit('updateUser', props.workStatus)
-		}
-	// }
+	} else {
+		emit('updateUser', props.workStatus)
+	}
+	
 }
 
 const handleScanbara = ()=>{
@@ -127,13 +123,31 @@ const handleScanbara = ()=>{
 
 const handleLogout = async()=>{
 	console.log("handleLogout", 555)
-	const tokens = uni.getStorageSync('token')
-	const userId = uni.getStorageSync('userId')
+	
+	const params1 = {
+		token: uni.getStorageSync('token'),
+		data: {
+			pharmacistUserId: uni.getStorageSync('userId'),
+			workStatus: '1'
+		}
+	}
+	console.log('params1.data.workStatus', params1)
+	
+	const {data:res1} = await updateWorkStatus(params1)
+	if (res1.code === 200) {
+		uni.setStorageSync('workStatus', '1');
+		emit('updateUser', params1.data.workStatus)
+		
+	} else {
+		emit('updateUser', props.workStatus)
+	}
+	
+	
 	const params = {
-		token: tokens,
+		token: uni.getStorageSync('token'),
 		data: {
-			pharmacistUserId: userId,
-			onlineStatus: 1
+			pharmacistUserId: uni.getStorageSync('userId'),
+			onlineStatus: '1'
 		}
 	}
 	const {data:res} = await updateOnlineStatus(params)