From 49970b5d8d1af27c2fc4656168334161ccd3d356 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Tue, 11 Mar 2025 16:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=99=BB=E9=99=86=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E8=BE=93=E5=85=A5=E5=AF=86=E7=A0=81=EF=BC=9B=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E4=B8=BA10=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/http/request.js | 4 ++--
 src/views/login.vue | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/http/request.js b/src/http/request.js
index fa9eae5..c36eb93 100644
--- a/src/http/request.js
+++ b/src/http/request.js
@@ -2,11 +2,11 @@ import axios from 'axios'
 
 const request = axios.create({
     baseURL: 'https://csclasrs.ecorp.cat.com/wmsServer/wms',
-    timeout: 5000
+    timeout: 10000
 })
 
 // axios.defaults.baseURL = 'http://10.90.36.70:443/wmsServer/wms'
-// axios.defaults.baseURL = 'http://localhost:12315/wms'
+//axios.defaults.baseURL = 'http://localhost:12315/wms'
 // axios.defaults.baseURL = 'https://csclasrs.ecorp.cat.com/wmsServer/wms'
 
 // // request 请求器
diff --git a/src/views/login.vue b/src/views/login.vue
index f527c94..10eb548 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -5,9 +5,9 @@
             <el-form-item>
                 <el-input type="text" v-model="loginForm.loginAccount" auto-complete="off" placeholder="账号"></el-input>
             </el-form-item>
-            <!-- <el-form-item>
+            <el-form-item>
                 <el-input type="password" v-model="loginForm.loginPassword" auto-complete="off" placeholder="密码"></el-input>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item style="width: 100%">
                 <el-button type="primary" style="width: 100%;  border: none" @click="login">登录</el-button>
             </el-form-item>
@@ -70,7 +70,7 @@ const login = () => {
         text: 'Loading',
         background: 'rgba(0, 0, 0, 0.7)',
     })
-    loginWithoutAuth(loginForm).then(res => {
+  loginWithAuth(loginForm).then(res => {
         loading.close()
         if (res.data.code == 0) {
             store.commit('mutationUser', res.data.returnData.user)// 用户信息