From 116d979d87f53f878a8c930cfad2c6a7cc831b19 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 八月 2022 16:58:31 +0800
Subject: [PATCH] 合并主线

---
 web_src/src/components/Login.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue
index 7aff1ae..1dbd919 100644
--- a/web_src/src/components/Login.vue
+++ b/web_src/src/components/Login.vue
@@ -22,7 +22,7 @@
           </div>
 
           <div class="container-login100-form-btn">
-            <div class="wrap-login100-form-btn">
+            <div class="wrap-login100-form-btn" :class="{'login-loading': isLoging}" v-loading="isLoging" element-loading-background="rgb(0 0 0 / 0%);" element-loading-custom-class="login-loading-class">
               <div class="login100-form-bgbtn"></div>
               <button class="login100-form-btn" @click="login">鐧诲綍</button>
             </div>
@@ -35,12 +35,14 @@
 
 <script>
 import crypto from 'crypto'
+import Vue from 'vue'
 export default {
   name: 'Login',
   data(){
   	return {
       isLoging: false,
       showPassword: false,
+      loginLoading: false,
   		username: '',
   		password: ''
   	}
@@ -80,14 +82,16 @@
 
       this.$axios({
       	method: 'get',
-	      url:"/api/user/login",
+        url:"/api/user/login",
         params: loginParam
       }).then(function (res) {
-        console.log(JSON.stringify(res));
-          if (res.data == "success") {
-            that.$cookies.set("session", {"username": that.username}) ;
+          console.log(res);
+          console.log(res.data.data);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            that.$cookies.set("session", {"username": that.username,"roleId":res.data.data.role.id}) ;
             //鐧诲綍鎴愬姛鍚�
             that.cancelEnterkeyDefaultAction();
+            Vue.prototype.$loginUser = res.data.data
             that.$router.push('/');
           }else{
             that.isLoging = false;

--
Gitblit v1.8.0