diff --git a/property-uniapp-project/App.vue b/property-uniapp-project/App.vue
index 2c20e15..08bf570 100644
--- a/property-uniapp-project/App.vue
+++ b/property-uniapp-project/App.vue
@@ -18,18 +18,9 @@
getPushCID()
// #endif
- // 路由分发（同步）：所有人先进首页，点击功能再提示登录
+ // 路由分发：全局拦截器注册（首页 onLoad 中处理首次引导页跳转）
const token = uni.getStorageSync('token') || ''
- const hasShowGuide = uni.getStorageSync('hasShowGuide')
-
- // 首次使用：标记引导已看过（不再强制引导页），直接进首页
- if (!token && !hasShowGuide) {
- console.log('首次启动，标记引导已看过，进入首页')
- uni.setStorageSync('hasShowGuide', true)
- }
-
- // 所有人统一进首页
- console.log('进入首页（hasToken=' + !!token + '）')
+ console.log('App 启动（hasToken=' + !!token + '）')
// 全局 navigateTo 拦截器：未登录用户访问需登录页面时自动跳转登录页
uni.addInterceptor('navigateTo', {
diff --git a/property-uniapp-project/pageSubPack/loginSub/login.vue b/property-uniapp-project/pageSubPack/loginSub/login.vue
index c33c051..563c796 100644
--- a/property-uniapp-project/pageSubPack/loginSub/login.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/login.vue
@@ -51,7 +51,6 @@
diff --git a/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue b/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
index 244d13d..13fe10d 100644
--- a/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
@@ -49,7 +49,7 @@
-
{{ passwordError }}
@@ -86,6 +86,7 @@
import {
ref,
computed,
+ watch,
onUnmounted
} from 'vue';
import {
@@ -127,6 +128,18 @@
agreeAgreement.value;
});
+ // 实时校验密码格式（输入空格或特殊符号立即提示）
+ watch(password, (val) => {
+ if (!val) { passwordError.value = ''; return }
+ if (val.length < 6 || val.length > 16) {
+ passwordError.value = '密码需 6-16 位'
+ } else if (/[^a-zA-Z0-9]/.test(val)) {
+ passwordError.value = '密码格式错误'
+ } else {
+ passwordError.value = ''
+ }
+ })
+
// ========== 方法 ==========
const goBack = () => {
uni.navigateBack();
@@ -160,8 +173,8 @@
if (!val) { passwordError.value = ''; return }
if (val.length < 6 || val.length > 16) {
passwordError.value = '密码需 6-16 位'
- } else if (/\s/.test(val)) {
- passwordError.value = '密码不能包含空格'
+ } else if (/[^a-zA-Z0-9]/.test(val)) {
+ passwordError.value = '密码格式错误'
} else {
passwordError.value = ''
}
@@ -288,8 +301,8 @@
uni.showToast({ title: '密码不能超过 16 位', icon: 'none' });
return;
}
- if (/\s/.test(password.value)) {
- uni.showToast({ title: '密码格式不对，不允许注册', icon: 'none' });
+ if (/[^a-zA-Z0-9]/.test(password.value)) {
+ uni.showToast({ title: '密码格式错误', icon: 'none' });
return;
}
if (!agreeAgreement.value) {
diff --git a/property-uniapp-project/pageSubPack/my/addCar.vue b/property-uniapp-project/pageSubPack/my/addCar.vue
index 49c5474..e8ef7e8 100644
--- a/property-uniapp-project/pageSubPack/my/addCar.vue
+++ b/property-uniapp-project/pageSubPack/my/addCar.vue
@@ -294,16 +294,14 @@
}
const goBack = () => {
- uni.removeStorageSync('carNum')
- uni.removeStorageSync('carBrand')
- uni.removeStorageSync('carModel')
- uni.removeStorageSync('carColor')
- uni.removeStorageSync('carImageUrl')
- uni.removeStorageSync('carBrandId')
- uni.removeStorageSync('checkType')
- uni.navigateTo({
- url: '/pageSubPack/my/myCarIndex'
- })
+ uni.removeStorageSync("carNum")
+ uni.removeStorageSync("carBrand")
+ uni.removeStorageSync("carModel")
+ uni.removeStorageSync("carColor")
+ uni.removeStorageSync("carImageUrl")
+ uni.removeStorageSync("carBrandId")
+ uni.removeStorageSync("checkType")
+ uni.navigateBack()
}
diff --git a/property-uniapp-project/pageSubPack/my/addHouse.vue b/property-uniapp-project/pageSubPack/my/addHouse.vue
index e5f24c6..f68211b 100644
--- a/property-uniapp-project/pageSubPack/my/addHouse.vue
+++ b/property-uniapp-project/pageSubPack/my/addHouse.vue
@@ -869,25 +869,20 @@
});
const goBack = () => {
- uni.removeStorageSync('communityId');
- uni.removeStorageSync('communityName');
- uni.removeStorageSync('buildingId');
- uni.removeStorageSync('buildingName');
- uni.removeStorageSync('unitId');
- uni.removeStorageSync('unitName');
- uni.removeStorageSync('floorId');
- uni.removeStorageSync('floorName');
- uni.removeStorageSync('houseNumberId');
- uni.removeStorageSync('houseNumberName');
- uni.removeStorageSync('houseStatus')
- uni.removeStorageSync('houseIsDefault')
- uni.removeStorageSync('updateHouseId')
- uni.navigateTo({
- url: '/pageSubPack/my/myHouseIndex',
- success: res => {},
- fail: () => {},
- complete: () => {}
- });
+ uni.removeStorageSync("communityId");
+ uni.removeStorageSync("communityName");
+ uni.removeStorageSync("buildingId");
+ uni.removeStorageSync("buildingName");
+ uni.removeStorageSync("unitId");
+ uni.removeStorageSync("unitName");
+ uni.removeStorageSync("floorId");
+ uni.removeStorageSync("floorName");
+ uni.removeStorageSync("houseNumberId");
+ uni.removeStorageSync("houseNumberName");
+ uni.removeStorageSync("houseStatus")
+ uni.removeStorageSync("houseIsDefault")
+ uni.removeStorageSync("updateHouseId")
+ uni.navigateBack()
}