Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phasetwo_web

src/store/index.js

 import {
   defineStore
 } from 'pinia'
-import {
-  login
-} from '@/api/user';
 import {
   message
 } from 'ant-design-vue';
 import router from '@/router/index';
+import { login } from '@/api/user.js';
 export const useStore = defineStore('user', () => {
   const userInfo = ref();
   const token = ref(null);
 
 
   const getUserInfo = async (param) => {
-    // login(param).then(res => {
-    //   if (res.code == '9000') {
-    //     message.success('登录成功!');
-    //     token.value = res.data;
-    //     let strings = res.data.split("."); //截取token，获取载体
-    //     userInfo.value = JSON.parse(decodeURIComponent(escape(window.atob(strings[1].replace(/-/g, "+").replace(/_/g, "/")))));
-    //     router.push({
-    //       name: 'homepage'
-    //     });
-    //   }
-    // }).catch(err => {
-    //   message.error(err.message);
-    // })
+    login(param).then(res => {
+      if (res.code == '9000') {
+        message.success('登录成功!');
+        token.value = res.data;
+        let strings = res.data.split("."); //截取token，获取载体
+        userInfo.value = JSON.parse(decodeURIComponent(escape(window.atob(strings[1].replace(/-/g, "+").replace(/_/g, "/")))));
+        router.push({
+          name: 'homepage'
+        });
+      }
+    }).catch(err => {
+      message.error(err.message);
+    })
   }
   const clearUserInfo = () => {
     userInfo.value = {};
@@ -36,7 +34,8 @@ export const useStore = defineStore('user', () => {
 
   return {
     userInfo,
-    token
+    token,
+    getUserInfo
   }
 }, {
   persist: true

src/views/login/login.vue

@@ -35,25 +35,21 @@
 <script setup>
 import { UserOutlined, LockOutlined } from '@ant-design/icons-vue';
 import { reactive, ref } from 'vue';
-import router from '@/router/index.js';
+import router from '@/router/index';
 import { login } from '@/api/user.js';
 import { message } from 'ant-design-vue';
+import { useStore } from '@/store/index.js';
+const userStore = useStore();
 const loading = ref(false);
 const formState = reactive({
-    username:'',
-    passwordBase64:''
+    username: '',
+    passwordBase64: ''
 });
 const handleFinish = async (values) => {
+    let params = { username: formState.username, passwordBase64: btoa(formState.passwordBase64) };
     loading.value = true;
     try {
-        formState.passwordBase64 = btoa(formState.passwordBase64);
-        const response = await login(formState) || [];
-        if (response.data) {
-            message.success('登录成功！');
-            router.push({
-                name: 'home'
-            });
-        }
+        userStore.getUserInfo(params);
     } catch (error) {
         loading.value = false;
     }