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/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/components/privacy-popup/privacy-popup.vue b/wuye-manager-uniapp/components/privacy-popup/privacy-popup.vue index 60df5e1..f01662f 100644 --- a/wuye-manager-uniapp/components/privacy-popup/privacy-popup.vue +++ b/wuye-manager-uniapp/components/privacy-popup/privacy-popup.vue @@ -54,22 +54,16 @@ const handleMaskClick = () => { } // 打开用户协议 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/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}]}] diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue index 820a845..318ac55 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 cbfd5c3..cac0873 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/pwd-login.vue @@ -98,6 +98,7 @@ import { ref, computed } from 'vue' import { onLoad } from '@dcloudio/uni-app' import { getLoginPassword } from '../../api/api.js' +import { clearAccountStorage } from '../../api/request.js' import PrivacyPopup from '@/components/privacy-popup/privacy-popup.vue' import { usePermStore } from '@/stores/usePermStore' @@ -128,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' + }) } // 打开隐私协议弹窗 @@ -204,13 +199,13 @@ const handleLogin = () => { cid: push_cid } permStore.clearPerm() + // 清除上个账号的所有缓存，防止新账号显示旧数据 + clearAccountStorage() getLoginPassword(params) .then(res => { // console.log('33333',res) if (res.code === 200) { uni.setStorageSync('token', res.data.token) - // 清掉上次账号的小区缓存，防止新账号显示旧小区 - uni.removeStorageSync('currentVillage') // 存用户ID // if(res.data) { // // 存当前绑定的小区ID，0 表示未绑定 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/pageSubPack/notice-list/select-community.vue b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue index fe581b2..bcf9e42 100644 --- a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue +++ b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue @@ -45,7 +45,7 @@