From 920d34a20109cbec85e10b0345baea8723b36352 Mon Sep 17 00:00:00 2001
From: y505174330 <505174330@qq.com>
Date: 星期六, 18 五月 2024 17:21:50 +0800
Subject: [PATCH] 1

---
 src/pages/Login/Login.vue |   53 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index c76d138..c874ce4 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -18,6 +18,7 @@
 					<view class="LoginBg"></view>
 					<view class=""> </view>
 				</view>
+				
 				<el-form :hide-required-asterisk="true" ref="formLogin1" label-position="top" :rules="rules1"
 					:model="loginData">
 					<el-form-item label="鐧诲綍璐﹀彿" prop="loginID">
@@ -52,7 +53,9 @@
 </template>
 
 <script>
-	import CryptoJS from 'crypto-js';
+	import {
+		encryptAES,decryptAES
+	} from '@/utils/Crypto.js'
 	import {
 		nextTick
 	} from "vue";
@@ -104,7 +107,9 @@
 						required: true,
 						message: '璇疯緭鍏ョ櫥褰曡处鍙�',
 						trigger: 'blur'
-					}],
+					},
+		
+					],
 					pass: [{
 							required: true,
 							message: '璇疯緭鍏ュ瘑鐮�',
@@ -174,24 +179,24 @@
 				// 鐧诲綍鐢ㄦ埛璐﹀彿
 				loginData: {
 					// 璐﹀彿
-					loginID: 'bbb',
-					pass: 'acy2jnwt/loR44ytIPPZBg=='
+					loginID: '',
+					pass: ''
 				},
 				// 涔︾睄鏁版嵁
 				listData: [{
-						name: '鍘嗕唬鍖诲浼犺搴�',
+						name: '涓尰浜虹墿鏁版嵁搴�',
 						id: 1,
 					}, {
-						name: '涓栧尰鍖诲搴�',
+						name: '涓栧尰鍖诲鏁版嵁搴�',
 						id: 2,
 					}, {
-						name: '鍖诲瀛︽湳娴佹淳',
+						name: '涓尰瀛︽湳娴佹淳',
 						id: 3,
 					}, {
-						name: '涓浗鍦板煙鍖昏氨',
+						name: '涓尰鍦板煙鍖昏氨',
 						id: 4,
 					}, {
-						name: '涓浗鍖讳簨鍒跺害',
+						name: '涓尰鍖讳簨鍒跺害',
 						id: 5,
 					},
 
@@ -217,16 +222,16 @@
 				// uni.setStorageSync('globalData', { id: 123, name: 'example' });
 				if (item.id == 1) {
 					uni.navigateTo({
-						url: '/pages/repository/repository?id=' + item.id
+						url: '/pages/character/detail?id=' + item.id
 					})
 				} else if (item.id == 2) {
 					console.log(item.name);
 					// uni.navigateTo({
-					// 	url:'/pages/repository/repository?id='+item.id
+					// 	url:'/pages/character/detail?id='+item.id
 					// })
 				} else if (item.id == 3) {
 					uni.navigateTo({
-						url: '/pages/dataDisplay/dataDisplay?id=' + item.id
+						url: '/pages/academicGenres/index?id=' + item.id
 					})
 				} else if (item.id == 4) {
 					uni.navigateTo({
@@ -269,19 +274,14 @@
 			},
 			// 鐢ㄦ埛鐧诲綍
 			async Login(formName) {
-				// let Obj = {
-				// 	username: this.loginData.loginID,
-				// 	password: this.loginData.pass,
-				// }
-				// AES 鍔犲瘑
-				console.log(this.loginData.pass);
-				const encrypted = CryptoJS.AES.encrypt(this.loginData.pass, 'secret passphrase');
+				console.log(decryptAES(this.loginData.pass),'this.loginData.pass');
+				let Obj = {
+					username: this.loginData.loginID,
+					// encryptAES(this.loginData.pass) | this.loginData.pass
+					password: encryptAES(this.loginData.pass),
+				}
+				console.log(Obj, 'Obj');
 
-				// 灏嗗姞瀵嗙粨鏋滆浆鎹负 Base64
-				const base64Result = encrypted.toString(CryptoJS.enc.Base64);
-
-				// 杈撳嚭鍔犲瘑鍚庡苟杞崲涓� Base64 鐨勭粨鏋�
-				console.log('Encrypted and Base64 encoded password:', base64Result);
 				let res = await getLogin(Obj)
 				console.log(res, 'sfdsf');
 				if (res.success) {
@@ -293,6 +293,9 @@
 					await getUserInfo().then(res => {
 						console.log(res, 'rrrrrrrrrrsd');
 					})
+					// 灏嗚处鍙峰瓨鍏ュ埌vuex涓�
+					this.$store.dispatch('setUserName',res.object.username)
+					
 					uni.redirectTo({
 						url: '/pages/index/index'
 					})
@@ -508,7 +511,7 @@
 		width: 1.2rem;
 		height: .37rem;
 		background: url(@/static/image/鐢ㄦ埛鐧诲綍.png) no-repeat 0 0;
-		background-size: 100% 100%;
+		background-size: 100%;
 		margin-bottom: .47rem;
 	}
 

--
Gitblit v1.9.1