From a6243cf4660cbdd84196b5173e83cc651b59f11f Mon Sep 17 00:00:00 2001 From: zhouyanli <593579392@qq.com> Date: Wed, 29 Jul 2026 17:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.claude/settings.local.json | 6 +- property-uniapp-project/App.vue | 22 +- .../pageSubPack/api/apiSub.js | 6 + .../pageSubPack/api/request.js | 39 +- .../pageSubPack/api/useImageUpload.js | 3 +- .../pageSubPack/loginSub/change-pwd.vue | 14 +- .../pageSubPack/loginSub/forget-pwd.vue | 12 +- .../pageSubPack/loginSub/login.vue | 476 +++++++++--------- .../pageSubPack/loginSub/pwd-login.vue | 356 ------------- .../loginSub/register-new-user.vue | 30 +- .../pageSubPack/my/addCar.vue | 9 +- .../pageSubPack/my/addHouse.vue | 59 +-- .../pageSubPack/my/deleteAccount.vue | 2 +- .../pageSubPack/my/houseDetail.vue | 2 +- .../pageSubPack/my/selectBuilding.vue | 5 + .../pageSubPack/my/selectParingLot.vue | 32 +- .../pageSubPack/my/settingIndex.vue | 6 +- .../online-repair/personalRepair.vue | 8 +- .../pageSubPack/payment-list/paymentIndex.vue | 77 +-- property-uniapp-project/pages.json | 39 +- property-uniapp-project/pages/index/index.vue | 298 ++++------- .../pages/myIndex/myIndex.vue | 4 +- .../pages/navigation/navigation.vue | 36 +- .../pages/serviceIndex/serviceIndex.vue | 4 +- 24 files changed, 533 insertions(+), 1012 deletions(-) delete mode 100644 property-uniapp-project/pageSubPack/loginSub/pwd-login.vue diff --git a/property-uniapp-project/.claude/settings.local.json b/property-uniapp-project/.claude/settings.local.json index 364fa09..92e0956 100644 --- a/property-uniapp-project/.claude/settings.local.json +++ b/property-uniapp-project/.claude/settings.local.json @@ -27,7 +27,11 @@ "Bash(sed -i '232s/^\t\t /\\\\t\\\\t/' pages/index/index.vue)", "Bash(sed -i '233s/^\t\t /\\\\t\\\\t\\\\t/' pages/index/index.vue)", "Bash(awk 'NR==235 { print substr\\($0, 2\\); next } 1' \"D:/wuye-jumin-front/property-uniapp-project/pages.json\")", - "Bash(mv /tmp/pages_temp.json \"D:/wuye-jumin-front/property-uniapp-project/pages.json\")" + "Bash(mv /tmp/pages_temp.json \"D:/wuye-jumin-front/property-uniapp-project/pages.json\")", + "Bash(sed -i '32,36s/.*//' App.vue)", + "Bash(sed -i '32d;33d;34d;35d;36d' App.vue)", + "Bash(perl -i -pe 's/\\\\\\\\t\\\\t\\\\t\\\\t\\\\t\"disableScroll\": true/\\\\t\\\\t\\\\t\\\\t\\\\t\\\\t\"disableScroll\": true/' pages.json)", + "Bash(perl -i -pe 's/^t\\\\t\\\\t\\\\t\\\\t\"disableScroll\"/\\\\t\\\\t\\\\t\\\\t\\\\t\\\\t\"disableScroll\"/' pages.json)" ] } } diff --git a/property-uniapp-project/App.vue b/property-uniapp-project/App.vue index 7550da6..de8394c 100644 --- a/property-uniapp-project/App.vue +++ b/property-uniapp-project/App.vue @@ -10,27 +10,25 @@ console.log('App 启动') uni.onPushMessage((res) => { console.log("收到推送消息：",res) //监听推送消息 - }) + }) // #ifdef APP-PLUS // 只有 App 平台才获取 CID getPushCID() // #endif - // 首页已是入口页：已登录用户不做跳转，直接留首页 - // 仅对未登录用户按需跳转到引导页或登录页 - const token = uni.getStorageSync('token') + // 路由分发（同步）：所有人先进首页，点击功能再提示登录 + const token = uni.getStorageSync('token') || '' const hasShowGuide = uni.getStorageSync('hasShowGuide') + + // 首次使用：标记引导已看过（不再强制引导页），直接进首页 if (!token && !hasShowGuide) { - // 首次使用：跳转引导页 - console.log('首次启动，跳转引导页') - uni.reLaunch({ url: '/pages/navigation/navigation' }) - } else if (!token && hasShowGuide) { - // 已看过引导但未登录：跳转登录页 - console.log('已看过引导页，跳转登录页') - uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' }) + console.log('首次启动，标记引导已看过，进入首页') + uni.setStorageSync('hasShowGuide', true) } - // 有 token：已在首页，不做跳转 + + // 所有人统一进首页 + console.log('进入首页（hasToken=' + !!token + '）') }) onShow((options) => { console.log('App Show', options) diff --git a/property-uniapp-project/pageSubPack/api/apiSub.js b/property-uniapp-project/pageSubPack/api/apiSub.js index 741dc5a..7aca36b 100644 --- a/property-uniapp-project/pageSubPack/api/apiSub.js +++ b/property-uniapp-project/pageSubPack/api/apiSub.js @@ -57,6 +57,12 @@ export const deleteMyHouse = (data) => { export const setMyHouseDefault = (data) => { return post(`/api/resident/my/house/default`, data) } + +// 添加房屋与业主关系-下拉数据 +export const getHouseDataList = (data) => { + return get(`/api/resident/my/house/dataList`, data) +} + // 获取当前用户登录信息 export const getUserProfile = (data) => { return get(`/api/resident/user/profile`, data) diff --git a/property-uniapp-project/pageSubPack/api/request.js b/property-uniapp-project/pageSubPack/api/request.js index 3898ed4..1555ac9 100644 --- a/property-uniapp-project/pageSubPack/api/request.js +++ b/property-uniapp-project/pageSubPack/api/request.js @@ -13,15 +13,20 @@ export default function request(url, data = {}, method = "GET") { // mask: true // }); + const token = uni.getStorageSync("token") || ""; + const header = { + "clientid": "resident", + 'content-type': 'application/json' + }; + if (token) { + header["Authorization"] = "Bearer " + token; + } + uni.request({ url: baseUrl + url, data: data, method: method, - header: { - "Authorization": "Bearer " + (uni.getStorageSync("token") || ''), - "clientid": "resident", - 'content-type': 'application/json' - }, + header, success: (res) => { // uni.hideLoading(); @@ -33,13 +38,12 @@ export default function request(url, data = {}, method = "GET") { const resData = res.data || {}; - // token 过期 + // token 过期：仅在有 token 且过期时跳转登录页（无 token 用户正常浏览首页，由点击拦截处理） if (resData.code === 401) { - uni.showToast({ title: '登录过期，请重新登录', icon: 'none' }); - uni.clearStorageSync('token'); - setTimeout(() => { - uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' }); - }, 1500); + if (token) { + uni.clearStorageSync('token'); + uni.reLaunch({ url: '/pageSubPack/loginSub/login?mode=pwd' }); + } reject({ msg: '登录过期', code: 401 }); return; } @@ -69,14 +73,19 @@ export const putMethod = (url, data) => request(url, data, 'PUT'); // 上传 export const upload = (filePath, url) => { return new Promise((resolve, reject) => { + const t = uni.getStorageSync("token") || ""; + const uploadHeader = { + "clientid": "resident" + }; + if (t) { + uploadHeader["Authorization"] = "Bearer " + t; + } + uni.uploadFile({ url: baseUrl + url, filePath: filePath, name: 'file', - header: { - "Authorization": "Bearer " + (uni.getStorageSync("token") || ''), - "clientid": "resident" - }, + header: uploadHeader, success: (res) => { try { const data = JSON.parse(res.data); diff --git a/property-uniapp-project/pageSubPack/api/useImageUpload.js b/property-uniapp-project/pageSubPack/api/useImageUpload.js index 7e6f22e..f41aec7 100644 --- a/property-uniapp-project/pageSubPack/api/useImageUpload.js +++ b/property-uniapp-project/pageSubPack/api/useImageUpload.js @@ -1,5 +1,6 @@ // 服务器地址（与 request.js 保持一致） -const baseUrl = 'https://wuyeapi.ckdzkj.com'; +// const baseUrl = 'https://wuyeapi.ckdzkj.com'; +const baseUrl = "http://192.168.1.222:8080" /** * 图片上传 Hook diff --git a/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue b/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue index 3202c20..efbcf1f 100644 --- a/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue +++ b/property-uniapp-project/pageSubPack/loginSub/change-pwd.vue @@ -2,10 +2,10 @@ - + 密码为 6-16 位，需同时包含字母和数字 @@ -13,14 +13,14 @@ + placeholder="请输入密码" :inputBorder="false" maxlength="16" :placeholderStyle="placeholderStyle"> + placeholder="请再次输入密码" :inputBorder="false" maxlength="16" :placeholderStyle="placeholderStyle"> @@ -95,7 +95,7 @@ const handleConfirm = () => { //uni.setStorageSync('token', res.token); // 假设后端返回token字段 uni.showToast({ title: '修改成功', icon: 'success' }); setTimeout(() =>{ - uni.navigateTo({ url: '/pageSubPack/loginSub/pwd-login' }); + uni.navigateTo({ url: '/pageSubPack/loginSub/login?mode=pwd' }); },1500) }else{ @@ -116,7 +116,9 @@ const handleConfirm = () => { /* 页面容器 */ .reset-pwd-page { padding: 20rpx 40rpx 40rpx; - min-height: 100vh; + height: 100vh; + overflow: hidden; + box-sizing: border-box; background: repeating-linear-gradient(180deg, #E2F0FF, #F6FAFF ); } .status_bar{ diff --git a/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue b/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue index 67afc1d..ec90629 100644 --- a/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue +++ b/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue @@ -1,16 +1,16 @@