updatex

static/public/js/login.js

@@ -8,15 +8,14 @@ const usernameInput = document.getElementById('loginUsername');
 const passwordInput = document.getElementById('loginPassword');
 const emailInput = document.getElementById('loginEmail');
 const agreeBox = document.getElementById('agreeBox');
-const protocol = document.getElementById('agreement');
-const submit = document.getElementById('loginBtn');
-
-const resetUser = document.getElementById('resetUser');
-const registerBtn = document.getElementById('registerBtn');
+const protocol = document.getElementById('agreement');
+const resetUser = document.getElementById('resetUser');
+const registerBtn = document.getElementById('registerBtn');
+const loginButton = document.getElementById('loginBtn');
 
 resetUser.addEventListener('click', function() {
 	clearTipStyle();
-})
+});
 
 function clearTipStyle() {
 	msgTip.innerHTML = '';
@@ -36,68 +35,37 @@ clearTipStyle();
 /**
  * @returns {string|false}
  */
-function checkUsername() {
-	const val = usernameInput.value.trim();
-	msgTip.innerHTML = '';
-	msgTip.classList.remove('tip-red', 'tip-yellow', 'tip-green');
-
-	if (!val) {
-		msgTip.innerHTML = '用户名不可为空';
-		msgTip.classList.add('tip-red');
-		return false;
-	}
-	if (val.length > 20) {
-		msgTip.innerHTML = '用户名不得长于20字符！';
-		msgTip.classList.add('tip-yellow');
-		return false;
-	}
-
-	msgTip.innerHTML = '√ 用户名格式正确';
-	msgTip.classList.add('tip-green');
-	return val;
+function checkUsername() {
+	const result = FormValidators.username(usernameInput.value);
+	msgTip.innerHTML = '';
+	msgTip.classList.remove('tip-red', 'tip-yellow', 'tip-green');
+	msgTip.textContent = result.message;
+	msgTip.classList.add(result.className);
+	return result.valid ? result.value : false;
 }
 
 /**
  * @returns {string|false}
  */
-function checkPwd() {
-	const val = passwordInput.value.trim();
-	pwdTip.innerHTML = '';
-	pwdTip.classList.remove('tip-red', 'tip-yellow', 'tip-green');
-
-	if (!val) {
-		pwdTip.innerHTML = '密码不可为空！';
-		pwdTip.classList.add('tip-red');
-		return false;
-	}
-
-	pwdTip.innerHTML = '河狸';
-	pwdTip.classList.add('tip-green');
-	return val;
+function checkPwd() {
+	const result = FormValidators.password(passwordInput.value);
+	pwdTip.innerHTML = '';
+	pwdTip.classList.remove('tip-red', 'tip-yellow', 'tip-green');
+	pwdTip.textContent = result.message;
+	pwdTip.classList.add(result.className);
+	return result.valid ? result.value : false;
 }
 
 /**
  * @returns {string|false}
  */
-function checkEml() {
-	const val = emailInput.value.trim();
-	const emlStand = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-	emlTip.innerHTML = '';
-	emlTip.classList.remove('tip-red', 'tip-yellow', 'tip-green');
-
-	if (!val) {
-		emlTip.innerHTML = '邮箱不可为空！';
-		emlTip.classList.add('tip-red');
-		return false;
-	} else if (!emlStand.test(val)) {
-		emlTip.innerHTML = '邮箱格式不正确！';
-		emlTip.classList.add('tip-yellow');
-		return false;
-	}
-
-	emlTip.innerHTML = '河狸';
-	emlTip.classList.add('tip-green');
-	return val;
+function checkEml() {
+	const result = FormValidators.email(emailInput.value);
+	emlTip.innerHTML = '';
+	emlTip.classList.remove('tip-red', 'tip-yellow', 'tip-green');
+	emlTip.textContent = result.message;
+	emlTip.classList.add(result.className);
+	return result.valid ? result.value : false;
 }
 
 /**
@@ -134,21 +102,7 @@ agreeBox.addEventListener('change', checkAgree);
 
 registerBtn.addEventListener('click', function() {
 	location.href = 'register.html';
-})
-
-/**
- * @param {string}
- * @returns {string}
- */
-function htmlEscape(str) {
-    if (typeof str !== 'string') return str;
-    return str
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
-}
+});
 
 form.addEventListener('submit', async function(e) {
 	e.preventDefault();
@@ -169,6 +123,7 @@ form.addEventListener('submit', async function(e) {
     });
 	
 	try {
+		loginButton.disabled = true;
 		const res = await fetch('/login', {
             method: 'POST',
             headers: {
@@ -182,8 +137,9 @@ form.addEventListener('submit', async function(e) {
 
 		try {
 			result = JSON.parse(responseText);
-		} catch (err) {
-			throw new Error(`服务器返回了非 JSON 内容（HTTP ${res.status}）：${responseText.slice(0, 100)}`);
+		} catch {
+			console.error(`登录接口返回非 JSON 内容（HTTP ${res.status}）：`, responseText);
+			throw new Error('服务器响应格式异常，请稍后重试');
 		}
 
 		if (!res.ok) {
@@ -191,6 +147,9 @@ form.addEventListener('submit', async function(e) {
 		}
 
         if (result.code === 0) {
+			if (!result.data || !result.data.token || !result.data.username) {
+				throw new Error('登录成功，但服务器返回的数据不完整');
+			}
             alert(`${result.message}，账号：${result.data.username}`);
             sessionStorage.setItem('token', result.data.token);
             location.href = 'main.html';
@@ -200,5 +159,7 @@ form.addEventListener('submit', async function(e) {
     } catch (err) {
 		alert(err.message || '接口请求失败，请检查后端服务是否启动');
         console.error('登录请求异常：', err);
-    }
+	} finally {
+		loginButton.disabled = false;
+	}
 });