Browse Source

登录修改

tanxue 2 months ago
parent
commit
48dcfbcd12
2 changed files with 16 additions and 5 deletions
  1. 8 1
      components/password-lli/password-lli.vue
  2. 8 4
      pages/Login/components/loginBox.vue

+ 8 - 1
components/password-lli/password-lli.vue

@@ -42,7 +42,14 @@
 			if (window.lli && typeof window.lli.encode === 'function') {
 			} else {
 				const script = document.createElement('script')
-				script.src = '/mdist/static/encode.js'
+				// #ifdef H5
+				script.src = '/static/encode.js'
+				// #endif
+				
+				// #ifdef APP-PLUS
+				script.src = 'static/encode.js'
+				// #endif
+				
 				document.head.appendChild(script)
 			}
 		},

+ 8 - 4
pages/Login/components/loginBox.vue

@@ -20,7 +20,7 @@
 				<view class="close-btn" v-if="clearPwIcon" @click="clearPw"></view>
 			</view>
 			<button type="default" @click="handleLogin" class="phone-green-btn login-btn">登录</button>
-		<!-- 已加密的:{{lliPassword}} -->
+		已加密的:{{lliPassword}}
 		</view>
 		<passwordLli ref="passLLiRef" :password="password" @lli-password="onLliPassword" />
 	</view>
@@ -75,7 +75,6 @@
 	// 清除密码
 	function clearPw(){
 		password.value = '';
-		lliPassword.value = '';
 		clearPwIcon.value = false;
 	}
 
@@ -96,9 +95,14 @@
 			return
 		}
 		
+		// 去除 userName 两端的空格
+		const trimmedUserName = userName.value.trim();
+		const trimmedPassword = lliPassword.value.trim();
+		console.log(userName.value,'userName.value');
+		console.log(lliPassword.value,'lliPassword.value');
 		httpApi.login({
-			userName: userName.value,
-			password: lliPassword.value
+			userName: trimmedUserName,
+			password: trimmedPassword,
 		}).then(res => {
 			cacheManager.set('auth', res.data)
 			console.log('登录成功')