From 839f3ee1b7b7e0518d217587de96bec7ea7b32dc Mon Sep 17 00:00:00 2001 From: zhouyanli <593579392@qq.com> Date: Tue, 11 Aug 2026 14:52:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wuye-manager-uniapp/api/request.js | 19 +++++++++- .../pageSubPack/loginSub/login.vue | 5 ++- .../pageSubPack/loginSub/pwd-login.vue | 5 ++- .../notice-list/select-community.vue | 38 +++++++++++-------- .../pageSubPack/setting/setting.vue | 6 ++- wuye-manager-uniapp/pages/index/index.vue | 6 ++- 6 files changed, 56 insertions(+), 23 deletions(-) diff --git a/wuye-manager-uniapp/api/request.js b/wuye-manager-uniapp/api/request.js index c142941..541085a 100644 --- a/wuye-manager-uniapp/api/request.js +++ b/wuye-manager-uniapp/api/request.js @@ -37,7 +37,7 @@ export default function request(url, data = {}, method = 'GET') { title: '登录过期,请重新登录', icon: 'none' }) - uni.clearStorageSync('token') + clearAccountStorage() setTimeout(() => { uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' @@ -114,6 +114,23 @@ export const upload = (filePath, url, fileName) => { * @param {Object|null|undefined} params - 原始请求参数 * @returns {Object} 过滤后的干净参数对象,只保留有效值 */ +/** + * 清除账号相关缓存(退出登录/切换账号/登录过期时调用) + * 只清除账号绑定的 key,保留设备级和应用级 key(如 push_cid、hasShowGuide、rememberPwd 等) + */ +export function clearAccountStorage() { + const keys = [ + 'token', + 'userId', + 'userPermission', + 'currentVillage', + 'currentVillageId', + 'home_banner_cache', + 'tempChangePwdParams' + ] + keys.forEach(key => uni.removeStorageSync(key)) +} + export function filterParams(params) { if (!params) return {} return Object.keys(params).reduce((acc, key) => { diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue index 820a845..342b032 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue @@ -99,6 +99,7 @@ \ No newline at end of file + diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue index a8af761..cac0873 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue @@ -129,22 +129,16 @@ const toggleRemember = () => { // 打开用户协议 const goToUserAgreement = () => { - // #ifdef APP-PLUS - plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/butler_xieyi.html') - // #endif - // #ifdef H5 - window.open('https://wuye.ckdzkj.com/parivw/butler_xieyi.html') - // #endif + uni.navigateTo({ + url: '/pageSubPack/loginSub/user-agreement' + }) } // 打开隐私政策 const goToPrivacy = () => { - // #ifdef APP-PLUS - plus.runtime.openURL('https://wuye.ckdzkj.com/parivw/butler.html') - // #endif - // #ifdef H5 - window.open('https://wuye.ckdzkj.com/parivw/butler.html') - // #endif + uni.navigateTo({ + url: '/pageSubPack/loginSub/privacy' + }) } // 打开隐私协议弹窗 diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/user-agreement.vue b/wuye-manager-uniapp/pageSubPack/loginSub/user-agreement.vue new file mode 100644 index 0000000..8c6ade5 --- /dev/null +++ b/wuye-manager-uniapp/pageSubPack/loginSub/user-agreement.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/wuye-manager-uniapp/pages.json b/wuye-manager-uniapp/pages.json index 6a261c0..1175169 100644 --- a/wuye-manager-uniapp/pages.json +++ b/wuye-manager-uniapp/pages.json @@ -40,7 +40,13 @@ { "path": "privacy", "style": { - "navigationBarTitleText": "用户隐私协议" + "navigationBarTitleText": "隐私政策" + } + }, + { + "path": "user-agreement", + "style": { + "navigationBarTitleText": "用户协议" } }, { From ff0d5b0c25d89459b6d88052265b3af0d2ccc151 Mon Sep 17 00:00:00 2001 From: zhouyanli <593579392@qq.com> Date: Fri, 14 Aug 2026 16:23:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E4=BF=AE?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wuye-manager-uniapp/api/api.js | 4 ++-- .../pageSubPack/fault-reporting/repairSelect.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wuye-manager-uniapp/api/api.js b/wuye-manager-uniapp/api/api.js index 22d2c0b..f4129ba 100644 --- a/wuye-manager-uniapp/api/api.js +++ b/wuye-manager-uniapp/api/api.js @@ -58,8 +58,8 @@ export const getNoticeList = data => { // ======故障上报===== // 获取报修项目 -export const getRepairOrder = () => { - return get('/manage/repair/order/list') +export const getRepairOrder = (data) => { + return get('/manage/repair/order/list',data) } // 提交维修信息 export const addRepairList = data => { diff --git a/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue b/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue index de70229..5cefcc6 100644 --- a/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue +++ b/wuye-manager-uniapp/pageSubPack/fault-reporting/repairSelect.vue @@ -68,7 +68,7 @@ const selectCategory = (item) => { // 获取维修项目 const fetchProjectList = async () => { try { - const res = await getRepairOrder() + const res = await getRepairOrder({projectType:0}) if (res.code === 200) { const data = res.data || [] // 兼容后端嵌套格式 [{id, name, children: [{id, name}]}]