From 65e6e5bf303b5cef829b91a1b73a339fd5fb771a Mon Sep 17 00:00:00 2001 From: zhouyanli <593579392@qq.com> Date: Tue, 21 Apr 2026 15:48:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=9B=BE=E7=89=87=E5=B9=B6?= =?UTF-8?q?=E5=88=A0=E6=8E=89=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=89=87=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity-list/activityList.vue | 7 +- .../activity-list/activityListDetails.vue | 6 +- .../activity-list/live-add.vue | 0 .../loginSub/change-pwd.vue | 10 ++- .../loginSub/forget-pwd.vue | 30 ++++--- .../{pages => pageSubPack}/loginSub/login.vue | 68 ++++++++------ .../loginSub/pwd-login.vue | 85 ++++++++++-------- .../loginSub/register-new-user.vue | 54 +++++++---- .../notice-list/noticeList.vue | 2 +- .../notice-list/noticeListDetails.vue | 4 +- .../notice-list/oneClickOpen.vue | 12 +-- .../notice-list/selectHome.vue | 38 ++++---- .../online-repair/onlineRepair.vue | 34 ++++--- .../online-repair/personalRepair.vue | 4 +- .../online-repair/personalSelectPoject.vue | 0 .../online-repair/publicRepair.vue | 2 +- .../online-repair/repairDetail.vue | 32 ++++--- .../online-repair/repairSelect.vue | 2 +- .../online-repair/selectHouse.vue | 2 +- .../visitor/qrcode-page.vue | 2 +- .../visitor/visitor-add.vue | 11 +-- .../visitor/visitor-detail.vue | 2 +- .../visitor/visitor-list.vue | 17 ++-- property-uniapp-project/pages.json | 22 ++--- property-uniapp-project/pages/api/api.js | 6 +- property-uniapp-project/pages/api/request.js | 19 ++-- property-uniapp-project/pages/index/index.vue | 48 ++++++---- .../pages/navigation/navigation.vue | 8 +- property-uniapp-project/static/bannar1.png | Bin 135466 -> 0 bytes property-uniapp-project/static/bannar2.png | Bin 64395 -> 0 bytes .../static/js/chinaRegions | 1 + property-uniapp-project/static/logo.png | Bin 186 -> 0 bytes .../static/tabbar/{首页.png => home.png} | Bin .../tabbar/{首页蓝.png => homeBlue.png} | Bin .../static/tabbar/{我的.png => mine.png} | Bin .../tabbar/{我的蓝.png => mineBlue.png} | Bin .../static/tabbar/{服务.png => service.png} | Bin .../tabbar/{服务蓝.png => serviceBlue.png} | Bin .../static/一键开门/东入门-白.png | Bin 289 -> 0 bytes .../static/一键开门/东入门.png | Bin 286 -> 0 bytes .../static/一键开门/单元门-白.png | Bin 1218 -> 0 bytes .../static/一键开门/单元门.png | Bin 1227 -> 0 bytes .../static/一键开门/西入门-白.png | Bin 290 -> 0 bytes .../static/一键开门/西入门.png | Bin 282 -> 0 bytes .../static/一键开门/远程开门.png | Bin 14371 -> 0 bytes .../static/在线报修/个人报修.png | Bin 5212 -> 0 bytes .../static/在线报修/公共报修.png | Bin 5711 -> 0 bytes .../static/在线报修/房屋.png | Bin 470 -> 0 bytes property-uniapp-project/static/引导1.png | Bin 45885 -> 0 bytes property-uniapp-project/static/引导2.png | Bin 41416 -> 0 bytes property-uniapp-project/static/引导3.png | Bin 48764 -> 0 bytes .../static/活动/现场实况.png | Bin 348 -> 0 bytes property-uniapp-project/static/登录/密码.png | Bin 471 -> 0 bytes .../static/登录/手机号.png | Bin 376 -> 0 bytes property-uniapp-project/static/登录/账号.png | Bin 382 -> 0 bytes .../static/登录/验证码.png | Bin 624 -> 0 bytes .../static/首页/activity-img.png | Bin 31217 -> 0 bytes .../static/首页/adress.png | Bin 397 -> 0 bytes .../static/首页/arr-left.png | Bin 440 -> 0 bytes .../static/首页/banner.png | Bin 68344 -> 0 bytes .../static/首页/notice-1.png | Bin 136933 -> 0 bytes .../static/首页/notice-2.png | Bin 129393 -> 0 bytes .../static/首页/一键开门.png | Bin 1937 -> 0 bytes property-uniapp-project/static/首页/位置.png | Bin 586 -> 0 bytes property-uniapp-project/static/首页/公告.png | Bin 294 -> 0 bytes .../static/首页/在线报修.png | Bin 1305 -> 0 bytes property-uniapp-project/static/首页/小区.png | Bin 309 -> 0 bytes property-uniapp-project/static/首页/广告1.png | Bin 1368 -> 0 bytes .../static/首页/生活缴费.png | Bin 1436 -> 0 bytes .../static/首页/访客邀请.png | Bin 1283 -> 0 bytes 70 files changed, 316 insertions(+), 212 deletions(-) rename property-uniapp-project/{pages => pageSubPack}/activity-list/activityList.vue (97%) rename property-uniapp-project/{pages => pageSubPack}/activity-list/activityListDetails.vue (98%) rename property-uniapp-project/{pages => pageSubPack}/activity-list/live-add.vue (100%) rename property-uniapp-project/{pages => pageSubPack}/loginSub/change-pwd.vue (95%) rename property-uniapp-project/{pages => pageSubPack}/loginSub/forget-pwd.vue (88%) rename property-uniapp-project/{pages => pageSubPack}/loginSub/login.vue (82%) rename property-uniapp-project/{pages => pageSubPack}/loginSub/pwd-login.vue (70%) rename property-uniapp-project/{pages => pageSubPack}/loginSub/register-new-user.vue (85%) rename property-uniapp-project/{pages => pageSubPack}/notice-list/noticeList.vue (99%) rename property-uniapp-project/{pages => pageSubPack}/notice-list/noticeListDetails.vue (97%) rename property-uniapp-project/{pages => pageSubPack}/notice-list/oneClickOpen.vue (85%) rename property-uniapp-project/{pages => pageSubPack}/notice-list/selectHome.vue (88%) rename property-uniapp-project/{pages => pageSubPack}/online-repair/onlineRepair.vue (87%) rename property-uniapp-project/{pages => pageSubPack}/online-repair/personalRepair.vue (99%) rename property-uniapp-project/{pages => pageSubPack}/online-repair/personalSelectPoject.vue (100%) rename property-uniapp-project/{pages => pageSubPack}/online-repair/publicRepair.vue (99%) rename property-uniapp-project/{pages => pageSubPack}/online-repair/repairDetail.vue (88%) rename property-uniapp-project/{pages => pageSubPack}/online-repair/repairSelect.vue (97%) rename property-uniapp-project/{pages => pageSubPack}/online-repair/selectHouse.vue (95%) rename property-uniapp-project/{pages => pageSubPack}/visitor/qrcode-page.vue (97%) rename property-uniapp-project/{pages => pageSubPack}/visitor/visitor-add.vue (98%) rename property-uniapp-project/{pages => pageSubPack}/visitor/visitor-detail.vue (98%) rename property-uniapp-project/{pages => pageSubPack}/visitor/visitor-list.vue (95%) delete mode 100644 property-uniapp-project/static/bannar1.png delete mode 100644 property-uniapp-project/static/bannar2.png create mode 160000 property-uniapp-project/static/js/chinaRegions delete mode 100644 property-uniapp-project/static/logo.png rename property-uniapp-project/static/tabbar/{首页.png => home.png} (100%) rename property-uniapp-project/static/tabbar/{首页蓝.png => homeBlue.png} (100%) rename property-uniapp-project/static/tabbar/{我的.png => mine.png} (100%) rename property-uniapp-project/static/tabbar/{我的蓝.png => mineBlue.png} (100%) rename property-uniapp-project/static/tabbar/{服务.png => service.png} (100%) rename property-uniapp-project/static/tabbar/{服务蓝.png => serviceBlue.png} (100%) delete mode 100644 property-uniapp-project/static/一键开门/东入门-白.png delete mode 100644 property-uniapp-project/static/一键开门/东入门.png delete mode 100644 property-uniapp-project/static/一键开门/单元门-白.png delete mode 100644 property-uniapp-project/static/一键开门/单元门.png delete mode 100644 property-uniapp-project/static/一键开门/西入门-白.png delete mode 100644 property-uniapp-project/static/一键开门/西入门.png delete mode 100644 property-uniapp-project/static/一键开门/远程开门.png delete mode 100644 property-uniapp-project/static/在线报修/个人报修.png delete mode 100644 property-uniapp-project/static/在线报修/公共报修.png delete mode 100644 property-uniapp-project/static/在线报修/房屋.png delete mode 100644 property-uniapp-project/static/引导1.png delete mode 100644 property-uniapp-project/static/引导2.png delete mode 100644 property-uniapp-project/static/引导3.png delete mode 100644 property-uniapp-project/static/活动/现场实况.png delete mode 100644 property-uniapp-project/static/登录/密码.png delete mode 100644 property-uniapp-project/static/登录/手机号.png delete mode 100644 property-uniapp-project/static/登录/账号.png delete mode 100644 property-uniapp-project/static/登录/验证码.png delete mode 100644 property-uniapp-project/static/首页/activity-img.png delete mode 100644 property-uniapp-project/static/首页/adress.png delete mode 100644 property-uniapp-project/static/首页/arr-left.png delete mode 100644 property-uniapp-project/static/首页/banner.png delete mode 100644 property-uniapp-project/static/首页/notice-1.png delete mode 100644 property-uniapp-project/static/首页/notice-2.png delete mode 100644 property-uniapp-project/static/首页/一键开门.png delete mode 100644 property-uniapp-project/static/首页/位置.png delete mode 100644 property-uniapp-project/static/首页/公告.png delete mode 100644 property-uniapp-project/static/首页/在线报修.png delete mode 100644 property-uniapp-project/static/首页/小区.png delete mode 100644 property-uniapp-project/static/首页/广告1.png delete mode 100644 property-uniapp-project/static/首页/生活缴费.png delete mode 100644 property-uniapp-project/static/首页/访客邀请.png diff --git a/property-uniapp-project/pages/activity-list/activityList.vue b/property-uniapp-project/pageSubPack/activity-list/activityList.vue similarity index 97% rename from property-uniapp-project/pages/activity-list/activityList.vue rename to property-uniapp-project/pageSubPack/activity-list/activityList.vue index 20a9805..2396e5d 100644 --- a/property-uniapp-project/pages/activity-list/activityList.vue +++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue @@ -7,7 +7,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -75,18 +75,15 @@ {{ activity.title }} - 时间：{{ formatDate(activity.startTime) }} 至 {{ formatDate(activity.endTime) }} - 地点：{{ activity.location }} - 活动名额{{ activity.totalQuota }}人，已报名{{ activity.signedCount }}人 diff --git a/property-uniapp-project/pages/activity-list/activityListDetails.vue b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue similarity index 98% rename from property-uniapp-project/pages/activity-list/activityListDetails.vue rename to property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue index 9b2bb4a..34f09b4 100644 --- a/property-uniapp-project/pages/activity-list/activityListDetails.vue +++ b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue @@ -106,7 +106,7 @@ - + 现场实况 {{ liveRecords.length }}次 @@ -245,7 +245,7 @@ const liveRecords = ref([ user: '微信用户', time: '2023-08-20 16:20:02', content: '目前现场的互动氛围很好', - images: ['/static/logo.png', '/static/引导1.png'] + images: ['http://47.104.199.163:9090/images/logo.png', 'http://47.104.199.163:9090/images/repair/house1.png'] } ]) // 接受参数 @@ -306,7 +306,7 @@ const confirmCancel = () => { // 添加实况跳转 const liveClick = () =>{ uni.navigateTo({ - url:'/pages/activity-list/live-add' + url:'/pageSubPack/activity-list/live-add' }) } diff --git a/property-uniapp-project/pages/activity-list/live-add.vue b/property-uniapp-project/pageSubPack/activity-list/live-add.vue similarity index 100% rename from property-uniapp-project/pages/activity-list/live-add.vue rename to property-uniapp-project/pageSubPack/activity-list/live-add.vue diff --git a/property-uniapp-project/pages/loginSub/change-pwd.vue b/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue similarity index 95% rename from property-uniapp-project/pages/loginSub/change-pwd.vue rename to property-uniapp-project/pageSubPack/loginSub/change-pwd.vue index ee94afb..20f27e8 100644 --- a/property-uniapp-project/pages/loginSub/change-pwd.vue +++ b/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue @@ -91,10 +91,18 @@ const handleConfirm = () => { if(res.code === 200){ //uni.setStorageSync('token', res.token); // 假设后端返回token字段 uni.showToast({ title: '修改成功', icon: 'success' }); - uni.navigateTo({ url: '/pages/login/pwd-login' }); + setTimeout(() =>{ + uni.navigateTo({ url: '/pageSubPack/loginSub/pwd-login' }); + },1500) + }else{ uni.showToast({ title: "修改失败", icon: 'error' }); } + }).catch(err =>{ + uni.showToast({ + title: '网络异常', + icon: 'error' + }); }) // 模拟修改密码请求 diff --git a/property-uniapp-project/pages/loginSub/forget-pwd.vue b/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue similarity index 88% rename from property-uniapp-project/pages/loginSub/forget-pwd.vue rename to property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue index 4a3dc55..6bb3a40 100644 --- a/property-uniapp-project/pages/loginSub/forget-pwd.vue +++ b/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue @@ -8,7 +8,7 @@ - + @@ -17,7 +17,7 @@ - + { title: '验证码已发送', icon: 'success' }); + // 开始60秒倒计时 + countDown.value = 60; + timer = setInterval(() => { + countDown.value--; + if (countDown.value <= 0) { + clearInterval(timer); + timer = null; + } + }, 1000); }else{ uni.showToast({ @@ -82,15 +91,7 @@ const getVerifyCode = () => { }); } }) - // 开始60秒倒计时 - countDown.value = 60; - timer = setInterval(() => { - countDown.value--; - if (countDown.value <= 0) { - clearInterval(timer); - timer = null; - } - }, 1000); + }; // 是否下一步 @@ -101,14 +102,19 @@ const canRegister = computed(() => { return phoneReg.test(phoneNumber.value) && verifyReg.test(verifyCode.value) }); +// 下一步 const handleNext = () =>{ // 把参数存到本地缓存 uni.setStorageSync('tempChangePwdParams', { phoneNumber:phoneNumber.value, verifyCode: verifyCode.value }); + if(!canRegister.value){ + uni.showToast({ title: '请输入',icon: 'error'}); + return + } uni.navigateTo({ - url: '/pages/loginSub/change-pwd' + url: '/pageSubPack/loginSub/change-pwd' }); } // 返回上一页 diff --git a/property-uniapp-project/pages/loginSub/login.vue b/property-uniapp-project/pageSubPack/loginSub/login.vue similarity index 82% rename from property-uniapp-project/pages/loginSub/login.vue rename to property-uniapp-project/pageSubPack/loginSub/login.vue index bd9516a..3cc39f1 100644 --- a/property-uniapp-project/pages/loginSub/login.vue +++ b/property-uniapp-project/pageSubPack/loginSub/login.vue @@ -8,7 +8,7 @@ - + @@ -26,8 +26,7 @@ - - + @@ -77,8 +76,8 @@ - 账号密码登录 - 注册新用户 + 账号密码登录 + 注册新用户 @@ -133,50 +132,69 @@ const getVerifyCode = () => { phone:phoneNumber.value, scene:'login' } + uni.showLoading({ title: '发送中...', mask: true }); getSendCode(params).then(res =>{ + console.log('44444',res) if(res.code === 200){ + uni.hideLoading(); uni.showToast({ title: '验证码已发送', icon: 'success' }); - + // 开始60秒倒计时 + countDown.value = 60; + timer = setInterval(() => { + countDown.value--; + if (countDown.value <= 0) { + clearInterval(timer); + timer = null; + } + }, 1000); }else{ uni.showToast({ title: '验证码发送失败', icon: 'error' }); } - }) - // 开始60秒倒计时 - countDown.value = 60; - timer = setInterval(() => { - countDown.value--; - if (countDown.value <= 0) { - clearInterval(timer); - timer = null; - } - }, 1000); + }).catch(err => { + uni.showToast({ + title: '网络异常', + icon: 'error' + }); + }) + }; // 登录处理 const handleLogin = () => { if (!canLogin.value) return; + uni.showLoading({ title: '登录中...', mask: true }); let params = { phone:phoneNumber.value, smsCode:'123456', scene:'login', } - // getLoginBySms(params).then(res =>{ - // if(res.code === 200){ - // //uni.setStorageSync('token', res.token); // 假设后端返回token字段 - // uni.showToast({ title: '登录成功', icon: 'success' }); + getLoginBySms(params).then(res =>{ + if(res.code === 200){ + //uni.setStorageSync('token', res.token); // 假设后端返回token字段 + uni.hideLoading(); + uni.showToast({ title: '登录成功', icon: 'success' }); + setTimeout(() =>{ + uni.switchTab({ url: '/pages/index/index' }); + },1500) - // }else{ - // uni.showToast({ title:'登录失败', icon: 'error' }); - // } + }else{ + uni.showToast({ title:'登录失败', icon: 'error' }); + } - // }) - uni.switchTab({ url: '/pages/index/index' }); + }).catch(err => { + uni.showToast({ + title: '网络异常，请重试', + icon: 'error' + }); + }) + + // 模拟登录请求 // uni.showLoading({ // title: '登录中...' diff --git a/property-uniapp-project/pages/loginSub/pwd-login.vue b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue similarity index 70% rename from property-uniapp-project/pages/loginSub/pwd-login.vue rename to property-uniapp-project/pageSubPack/loginSub/pwd-login.vue index 141521a..389bd9d 100644 --- a/property-uniapp-project/pages/loginSub/pwd-login.vue +++ b/property-uniapp-project/pageSubPack/loginSub/pwd-login.vue @@ -8,7 +8,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,13 +44,13 @@ > 我已阅读并同意《用户隐私政策》 - 忘记密码？ + 忘记密码？