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 @@ > 我已阅读并同意《用户隐私政策》 - 忘记密码? + 忘记密码?