From 2d1e691f78b3eddba52b77aa2b8a63da378395f0 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 18 Apr 2023 09:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/login/Login.vue | 16 ++++++++++------
 src/pages/login/Setup.vue |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue
index b311c29..09b112d 100644
--- a/src/pages/login/Login.vue
+++ b/src/pages/login/Login.vue
@@ -53,14 +53,18 @@ export default {
     async loginApi () {
       try {
         let res = await loginApi(this.loginname, encrypt(this.password))
-        let obj = {}
-        if (this.memberName) {
-          obj = Object.assign({}, res.user.user, {token: res.token, loginname: this.loginname})
+        if (res.code === '1') {
+          let obj = {}
+          if (this.memberName) {
+            obj = Object.assign({}, res.result.user.user, {token: res.token, loginname: this.loginname})
+          } else {
+            obj = Object.assign({}, res.result.user.user, {token: res.token, loginname: ''})
+          }
+          this.$store.dispatch('userInfo', JSON.stringify(obj))
+          this.$router.push('/home')
         } else {
-          obj = Object.assign({}, res.user.user, {token: res.token, loginname: ''})
+          this.toast(res.desc)
         }
-        this.$store.dispatch('userInfo', JSON.stringify(obj))
-        this.$router.push('/home')
         this.disabled = false
       } catch (err) {
         this.disabled = false
diff --git a/src/pages/login/Setup.vue b/src/pages/login/Setup.vue
index 237adee..93cccfb 100644
--- a/src/pages/login/Setup.vue
+++ b/src/pages/login/Setup.vue
@@ -5,11 +5,11 @@
       <ul class="pwd-manage-content">
         <li>
           <span>lms地址:</span>
-          <input type="text" v-model="addrip">
+          <input type="text" v-model.trim="addrip">
         </li>
         <li>
           <span>acs地址:</span>
-          <input type="text" v-model="acsip">
+          <input type="text" v-model.trim="acsip">
         </li>
         <!-- <li>
           <span>打印地址:</span>