guoyujia 1 an în urmă
părinte
comite
56bbe37bca
3 a modificat fișierele cu 31 adăugiri și 22 ștergeri
  1. 1 1
      api/base/path.js
  2. 9 3
      api/login/index.js
  3. 21 18
      pages/index/index.vue

+ 1 - 1
api/base/path.js

@@ -1,4 +1,4 @@
-const baseURL = 'http://192.168.31.216:8099'
+const baseURL = 'http://192.168.31.126:8099'
 // const baseURL = 'http://192.168.1.181:8099'
 
 export default baseURL

+ 9 - 3
api/login/index.js

@@ -7,14 +7,20 @@ import req from '../../utils/request.js'
 export function getUserInfo() {
 	return req.request({
 		url:'/getUserInfo',
-		// header: reqHeader,
 		method: 'GET',
 	})
 }
+
+export function getNickNameByUserName(userName) {
+	return req.request({
+		url:'/system/user/getNickNameByUserName?userName=' + userName,
+		method: 'GET',
+	})
+}
+
 export function getDeptName(userId) {
 	return req.request({
-		url:'/system/dept/getDeptName/'+userId,
-		// header: reqHeader,
+		url:'/system/dept/getDeptName/'+ userId,
 		method: 'GET',
 	})
 }

+ 21 - 18
pages/index/index.vue

@@ -39,7 +39,7 @@
 		onReady
 	} from '@dcloudio/uni-app'
 	import {
-		getUserInfo
+		getUserInfo,getNickNameByUserName
 	} from '@/api/login/index.js'
 	// 登录过的用户
 	const loggedUsers = ref([])
@@ -60,20 +60,24 @@
 					let storagekey = res.keys[i];
 					console.log(storagekey)
 					uni.getStorage({
-						key: storagekey, 
+						key: storagekey,
 						success: function(res) {
-							getUserInfo().then((response)=> {
-								userInfo.value = response.data;
-								var nick = userInfo.value.nickName;
-								if (storagekey !== 'token' && storagekey !== '__DC_STAT_UUID') {
-									loggedUsers.value.push({
-										userName: storagekey,
-										password: res.data,
-										nickName: nick
-									})
-								}
-							})
-	
+							if (storagekey !== 'token' && storagekey !== '__DC_STAT_UUID') {
+								console.log(storagekey)
+								getNickNameByUserName(storagekey).then((response) => {
+									if (response.code == 200) {
+										console.log(response)
+										loggedUsers.value.push({
+											userName: storagekey,
+											password: res.data,
+											nickName: response.msg
+										})
+										console.log(loggedUsers.value, "888")
+									}
+								})
+							}
+
+
 						}
 					});
 				}
@@ -81,7 +85,7 @@
 		});
 	}
 
-	
+
 	const handleShowLoginDialog = (user) => {
 		let _user = user ?? {}
 		// 调用子组件中的方法
@@ -89,7 +93,7 @@
 	}
 	const handleSelectUser = (user) => {
 		handleShowLoginDialog(user)
-	} 
+	}
 	const handleLongPressUser = (user) => {
 		console.log(user)
 		uni.showModal({
@@ -130,8 +134,7 @@
 			data: {
 				users: ''
 			},
-			success: () => {
-			}
+			success: () => {}
 		})
 	}
 </script>