合并主线

648540858

2022-08-09 116d979d87f53f878a8c930cfad2c6a7cc831b19

 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: ''
     }
@@ -83,11 +85,13 @@
        url:"/api/user/login",
        params: loginParam
      }).then(function (res) {
        console.log(JSON.stringify(res));
          console.log(res);
          console.log(res.data.data);
          if (res.data.code == 0 && res.data.msg == "success") {
            that.$cookies.set("session", {"username": that.username}) ;
            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;