From c8b6ed5823fbe8e7eeef2e733859b4406b2ba4c5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 一月 2021 13:22:07 +0800
Subject: [PATCH] Merge pull request #38 from lawrencehj/wvp-28181-2.0
---
web_src/src/components/Login.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue
index 030d3ee..160197a 100644
--- a/web_src/src/components/Login.vue
+++ b/web_src/src/components/Login.vue
@@ -10,16 +10,14 @@
<div class="log-logo">Welcome!</div>
<div class="log-text"></div>
</div>
- <div class="log-email">
+ <div class="log-email" v-loading="isLoging" >
<input type="text" placeholder="鐢ㄦ埛鍚�" :class="'log-input' + (username==''?' log-input-empty':'')" v-model="username"><input type="password" placeholder="瀵嗙爜" :class="'log-input' + (password==''?' log-input-empty':'')" v-model="password">
<a href="javascript:;" class="log-btn" @click="login" >鐧诲綍</a>
</div>
- <Loading v-if="isLoging" marginTop="-30%"></Loading>
</div>
</template>
<script>
-import Loading from './Loading.vue'
import crypto from 'crypto'
export default {
name: 'Login',
@@ -29,9 +27,6 @@
username: '',
password: ''
}
- },
- components:{
- Loading
},
created(){
var that = this;
@@ -67,7 +62,7 @@
//璁剧疆鍦ㄧ櫥褰曠姸鎬�
this.isLoging = true;
- this.$axios.get("/auth/login",{
+ this.$axios.get("/api/user/login",{
params: loginParam
} )
.then(function (res) {
@@ -76,10 +71,18 @@
that.$cookies.set("session", {"username": that.username}) ;
//鐧诲綍鎴愬姛鍚�
that.$router.push('/');
+ }else{
+ that.isLoging = false;
+ that.$message({
+ showClose: true,
+ message: '鐧诲綍澶辫触锛岀敤鎴峰悕鎴栧瘑鐮侀敊璇�',
+ type: 'error'
+ });
}
})
.catch(function (error) {
- console.log(error);
+ that.$message.error(error.response.statusText);
+ that.isLoging = false;
});
--
Gitblit v1.8.0