diff --git a/wuye-manager-uniapp/manifest.json b/wuye-manager-uniapp/manifest.json index 34ccb87..0c40906 100644 --- a/wuye-manager-uniapp/manifest.json +++ b/wuye-manager-uniapp/manifest.json @@ -2,8 +2,8 @@ "name" : "花开管家", "appid" : "__UNI__5F224F3", "description" : "智慧社区管家端,专为小区物业管理人员打造,支持多小区灵活切换管理。集成账号密码、手机号密码双重登录模式,内置忘记密码找回功能,保障账号安全。涵盖消息通知、日常巡检、故障报修、一键开门、工单流转、投诉处理等核心办公功能,物业人员可在线完成巡检打卡、问题上报、工单派发跟进、投诉对接处理等日常工作,同时支持查看个人上报记录、巡检历史,便捷修改账号信息与登录密码。高效简化社区物业办公流程,提升小区服务与管理效率,打造便捷智能的社区管理服务平台。", - "versionName" : "1.1.5", - "versionCode" : 115, + "versionName" : "1.1.6", + "versionCode" : 116, "transformPx" : false, "app-plus" : { "usingComponents" : true, diff --git a/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue b/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue index c96a2b9..c4b1b08 100644 --- a/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue +++ b/wuye-manager-uniapp/pageSubPack/instrument/revenue_statistics.vue @@ -200,6 +200,10 @@ params.startDate = datetimerange.value[0] params.endDate = datetimerange.value[1] } + uni.showLoading({ + title:'加载中', + mask:true + }) return getTableList(params) .then((res) => { if (res.code === 200 && res.data) { @@ -246,6 +250,8 @@ title:err.msg || '网络异常', icon:'none' }) + }).finally(() => { + uni.hideLoading() }) } diff --git a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue index 9856bba..8c0485f 100644 --- a/wuye-manager-uniapp/pageSubPack/loginSub/login.vue +++ b/wuye-manager-uniapp/pageSubPack/loginSub/login.vue @@ -401,6 +401,7 @@ const handlePwdLogin = () => { } }) .catch(err => { + uni.hideLoading() uni.showToast({ title: err.msg, icon: 'none' diff --git a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue index ce46121..c7eb273 100644 --- a/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue +++ b/wuye-manager-uniapp/pageSubPack/notice-list/select-community.vue @@ -147,24 +147,12 @@ } }).catch((err)=>{ isConfirming.value = false - uni.hideLoading() + uni.showToast({title:err.msg || '网络异常',icon:'none'}) + }).finally(()=>{ + uni.hideLoading() }) - - // uni.showModal({ - // title: '确认选择', - // content: `您已选择: ${selectedItem.value.villageName}`, - // success: (res) => { - // if (res.confirm) { - // uni.showToast({ title: '选择成功', icon: 'success', duration: 1500 }) - // uni.$emit('confirm', selectedItem.value) - // setTimeout(() => { - // uni.navigateBack() - // }, 1500) - // } - // } - // }) } diff --git a/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue b/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue index 5753d99..3f70a3e 100644 --- a/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue +++ b/wuye-manager-uniapp/pageSubPack/oneClickOpen/oneClickOpen.vue @@ -1,11 +1,11 @@ @@ -138,13 +140,9 @@ function getSwitchOpen(){ min-height: 100vh; padding: 30rpx 40rpx; box-sizing: border-box; + /* 为固定底部按钮预留空间 */ + padding-bottom: calc(140rpx + env(safe-area-inset-bottom)); } - .status_bar { - /* height: 32px; */ - width: 100%; - /* height: var(--status-bar-height); */ - flex-shrink: 0; - } /* 顶部标题 */ .top-bar { text-align: center; @@ -282,6 +280,18 @@ function getSwitchOpen(){ font-weight: 500; } +/* 底部按钮固定栏 */ +.btn-footer { + position: fixed; + left: 0; + right: 0; + bottom: 0; + padding: 20rpx 40rpx; + padding-bottom: calc(20rpx + env(safe-area-inset-bottom)); + background: linear-gradient(180deg, #F6FAFF, #E2F0FF); + z-index: 10; +} + /* 确认按钮 */ .confirm-btn { width: 100%; diff --git a/wuye-manager-uniapp/pageSubPack/setting/change-password.vue b/wuye-manager-uniapp/pageSubPack/setting/change-password.vue index 25a2371..766ac7e 100644 --- a/wuye-manager-uniapp/pageSubPack/setting/change-password.vue +++ b/wuye-manager-uniapp/pageSubPack/setting/change-password.vue @@ -1,11 +1,5 @@