From 110767de2ade859596c77b47a4d5a0490d84f7ce Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 16 Aug 2024 14:50:22 +0800
Subject: [PATCH] =?UTF-8?q?HL-4766=20=E5=9C=A8WMS=E7=9A=84=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=92=8CPDA=E7=9A=84=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=8F=96=E6=B6=88=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js       |  2 +-
 src/pages/login/index.vue | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index f654afbd..8dc5ef33 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -19,7 +19,7 @@ export function getCaptchaImage(params) {
  */
 export function login(username, password, code, uuid, tenantName) {
 	return request({
-		url: baseApi + '/system/auth/login',
+		url: baseApi + '/system/auth/loginNoCode',
 		headers: {
 			isToken: false
 		},
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 50420dd7..71ac4b30 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -65,13 +65,13 @@
 						</view>
 
 					</view>
-					<view style="display: flex;flex-direction: row;">
+					<view style="display: flex;flex-direction: row;" v-if="needCode">
 						<!-- <view class="uni-input">
 							<input class="" placeholder="请输入验证码"
 							v-model="code"
 								style="background-color: lightgray;padding-top: 40rpx;padding-bottom: 40rpx;margin-right: 20rpx;" />
 						</view> -->
-						<view class="uni-input-wrapper">
+						<view class="uni-input-wrapper" >
 							<input class="" style="height: 80rpx; background-color: #F7F9FF;margin-right: 20rpx;"
 								placeholder="请输入验证码" type="number" v-model="code" />
 						</view>
@@ -119,7 +119,8 @@
 				imageSrc: "",
 				code: "",
 				uuid: "",
-				version: ""
+				version: "",
+				needCode:false
 			}
 		},
 		// computed: mapState(['forcedLogin', 'hasLogin']),
@@ -185,13 +186,15 @@
 						icon: 'none',
 						mask: true
 					})
-				} else if (this.code === '') {
+				} 
+				else if (this.needCode&&this.code === '') {
 					uni.showToast({
 						title: '验证码不能为空',
 						icon: 'none',
 						mask: true
 					})
-				} else {
+				} 
+				else {
 					// console.log("用户名：", this.username, "密码：", this.password, this.tapstyle, this.smloginmsg)
 					let logininfo = {
 						username: "",