From 1335100e875ffdda19fc16de9afdda920858ca9b Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期五, 17 五月 2024 22:17:30 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/TCM_CharacterLibrary
---
src/pages/Login/Login.vue | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index f002fb9..0171580 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">
@@ -53,10 +54,14 @@
<script>
import {
+ encryptAES,decryptAES
+ } from '@/utils/Crypto.js'
+ import {
nextTick
} from "vue";
import {
- getLogin,getUserInfo
+ getLogin,
+ getUserInfo
} from '@/api/index.js'
import Footer1 from '@/components/footer/footer.vue'
export default {
@@ -102,7 +107,9 @@
required: true,
message: '璇疯緭鍏ョ櫥褰曡处鍙�',
trigger: 'blur'
- }],
+ },
+
+ ],
pass: [{
required: true,
message: '璇疯緭鍏ュ瘑鐮�',
@@ -172,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,
},
@@ -215,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({
@@ -267,10 +274,14 @@
},
// 鐢ㄦ埛鐧诲綍
async Login(formName) {
+ console.log(decryptAES(this.loginData.pass),'this.loginData.pass');
let Obj = {
username: this.loginData.loginID,
- password: this.loginData.pass,
+ // encryptAES(this.loginData.pass) | this.loginData.pass
+ password: encryptAES(this.loginData.pass),
}
+ console.log(Obj, 'Obj');
+
let res = await getLogin(Obj)
console.log(res, 'sfdsf');
if (res.success) {
@@ -279,9 +290,12 @@
})
// 灏唗oken瀛樺偍鍐嶆湰鍦颁腑
window.localStorage.setItem("access_token", res.results.token)
- await getUserInfo().then(res=>{
- console.log(res,'rrrrrrrrrrsd');
+ await getUserInfo().then(res => {
+ console.log(res, 'rrrrrrrrrrsd');
})
+ // 灏嗚处鍙峰瓨鍏ュ埌vuex涓�
+ this.$store.dispatch('setUserName',res.object.username)
+
uni.redirectTo({
url: '/pages/index/index'
})
@@ -292,7 +306,7 @@
icon: 'error'
})
// alert("sdfdsf")
- this.loginData.pass= ''
+ this.loginData.pass = ''
}
this.$refs[formName].validate(async (valid) => {
if (valid) {
--
Gitblit v1.9.1