guoyujia 1 year ago
parent
commit
c1ab8dcbbe
2 changed files with 46 additions and 33 deletions
  1. 18 15
      components/dialog-login/dialog-login.vue
  2. 28 18
      pages/index/index.vue

+ 18 - 15
components/dialog-login/dialog-login.vue

@@ -22,14 +22,16 @@
 		ref,
 		getCurrentInstance
 	} from 'vue'
-	import {getUserInfo} from '@/api/login/index.js'
+	import {
+		getUserInfo
+	} from '@/api/login/index.js'
 	import baseURL from '@/api/base/path.js'
 	// 对话框
 	const baseDialog = ref(null)
 	const currentUser = ref({})
 	const errorMsg = ref('用户名或密码错误')
 	const successMsg = ref('登录成功')
-	const userInfo = ref ({})
+	const userInfo = ref({})
 	const user = ref([])
 	// const { proxy } = getCurrentInstance()
 
@@ -38,10 +40,10 @@
 		// console.log(dialog.value)
 		baseDialog.value.open()
 	}
-	 const handleLogin = () => {
+	const handleLogin = () => {
 		uni.request({
 			method: 'POST',
-			url: baseURL +'/login',
+			url: baseURL + '/login',
 			data: {
 				username: currentUser.value.userName,
 				password: currentUser.value.password
@@ -56,23 +58,24 @@
 					// 保存token
 					uni.setStorageSync('token', res.data.token);
 					uni.setStorage({
-					    key: currentUser.value.userName,
-					    data:currentUser.value.password, 
-					    success: function() {
-					        
+						key: currentUser.value.userName,
+						data: currentUser.value.password,
+						success: function() {
+
 						}
 					});
-					getUserInfo(currentUser.value).then((res)=>{
-						if(res.code ==200) {
+					getUserInfo(currentUser.value).then((res) => {
+						if (res.code == 200) {
 							userInfo.value = res.data;
 							user.value.push(userInfo.value);
-							console.log(userInfo.value,999);
+							console.log(userInfo.value.nickName, 999);
 							uni.redirectTo({
-					  url: '/pages/dashboard/index?userName='+userInfo.value.userName + '&userId=' + userInfo.value.userId
-					});
+								url: '/pages/dashboard/index?userName=' + userInfo.value
+									.userName + '&userId=' + userInfo.value.userId
+							});
 						}
 					})
-					
+
 				} else {
 					uni.showToast({
 						title: errorMsg.value,
@@ -81,7 +84,7 @@
 						duration: 2000
 					})
 				}
-			} 
+			}
 		})
 
 	}

+ 28 - 18
pages/index/index.vue

@@ -6,13 +6,13 @@
 
 		<view v-for="(item, index) in loggedUsers" class="item-user uni-row" @click="handleSelectUser(item)"
 			@longpress="handleLongPressUser(item)">
-			<view class="user-avatar uni-row"><text class="label">{{item['nickname']}}</text></view>
+			<view class="user-avatar uni-row"><text class="label">{{item.nickname}}</text></view>
 			<view class="user-info">
 				<view class="nickname">
-					<text class="label">{{item['nickname']}}-{{index}}</text>
+					<text class="label">{{item.nickName}}</text>
 				</view>
 				<view class="username">
-					<text class="label">{{item['userName']}}</text>
+					<text class="label">{{item.userName}}</text>
 				</view>
 			</view>
 		</view>
@@ -38,13 +38,18 @@
 		onLoad,
 		onReady
 	} from '@dcloudio/uni-app'
-
+	import {
+		getUserInfo
+	} from '@/api/login/index.js'
 	// 登录过的用户
 	const loggedUsers = ref([])
 	const loginDialog = ref(null)
-
+	const userInfo = ref({})
+	const users = ref([])
+	const nickName = ref('')
 	onLoad(() => {
 		init();
+		// getUser();
 	})
 
 	function init() {
@@ -55,30 +60,36 @@
 					let storagekey = res.keys[i];
 					console.log(storagekey)
 					uni.getStorage({
-						key: storagekey,
+						key: storagekey, 
 						success: function(res) {
-							if (storagekey !== 'token' && storagekey !== '__DC_STAT_UUID') {
-								loggedUsers.value.push({
-									userName: storagekey,
-									password: res.data
-								})
-							}
+							getUserInfo().then((res)=> {
+								userInfo.value = res.data;
+								var nick = userInfo.value.nickName;
+								if (storagekey !== 'token' && storagekey !== '__DC_STAT_UUID') {
+									loggedUsers.value.push({
+										userName: storagekey,
+										password: res.data,
+										nickName: nick
+									})
+								}
+							})
+	
 						}
 					});
 				}
 			}
 		});
-		console.log(loggedUsers)
 	}
+
+	
 	const handleShowLoginDialog = (user) => {
 		let _user = user ?? {}
 		// 调用子组件中的方法
 		loginDialog.value.open(_user)
 	}
 	const handleSelectUser = (user) => {
-		console.log(user)
 		handleShowLoginDialog(user)
-	}
+	} 
 	const handleLongPressUser = (user) => {
 		console.log(user)
 		uni.showModal({
@@ -99,8 +110,8 @@
 							});
 							loggedUsers.value = [];
 							init();
-							
-							
+
+
 						}, // 成功回调函数
 
 						fail: () => {
@@ -120,7 +131,6 @@
 				users: ''
 			},
 			success: () => {
-				console.log('success');
 			}
 		})
 	}