diff --git a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue index 1b1f1f5..809b72d 100644 --- a/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue +++ b/wuye-manager-uniapp/pageSubPack/report-record/report-record.vue @@ -1,13 +1,14 @@ diff --git a/wuye-manager-uniapp/pages/index/index.vue b/wuye-manager-uniapp/pages/index/index.vue index 8ad32c4..b00e9b0 100644 --- a/wuye-manager-uniapp/pages/index/index.vue +++ b/wuye-manager-uniapp/pages/index/index.vue @@ -15,12 +15,18 @@ - + {{ currentCommunity }} - + @@ -50,8 +56,11 @@ - - + + - {{allCount}} + {{ allCount }} 全部巡检 - {{pendingCount}} + {{ pendingCount }} 待巡检 - {{InspectedCount}} + {{ InspectedCount }} 已巡检 @@ -91,26 +100,46 @@ - + 故障上报 - + 一键开门 - + 工单大厅 - + 我的工单 - + 投诉处理 @@ -418,7 +447,7 @@ const clickItem = index => { align-items: center; margin-right: 16rpx; - .notice-icon { + .notice-icon { width: 48rpx; height: 48rpx; margin-right: 15rpx; diff --git a/wuye-manager-uniapp/pages/my/my.vue b/wuye-manager-uniapp/pages/my/my.vue index ef4a49e..62fe05a 100644 --- a/wuye-manager-uniapp/pages/my/my.vue +++ b/wuye-manager-uniapp/pages/my/my.vue @@ -46,15 +46,17 @@ const avatar = ref('') const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0) const fetchUserInfo = () => { - getSettingInfo().then(res => { - if (res.code === 200 && res.data) { - loginName.value = res.data.nickName || '' - phoneNum.value = res.data.phonenumber || '' - avatar.value = res.data.avatar || '' - } - }).catch(err => { - uni.showToast({ title: err.msg || '获取失败', icon: 'none' }) - }) + getSettingInfo() + .then(res => { + if (res.code === 200 && res.data) { + loginName.value = res.data.nickName || '' + phoneNum.value = res.data.phonenumber || '' + avatar.value = res.data.avatar || '' + } + }) + .catch(err => { + uni.showToast({ title: err.msg || '获取失败', icon: 'none' }) + }) } onShow(() => { @@ -63,10 +65,10 @@ onShow(() => { const onItemClick = item => { const routes = { - '上报记录': '/pageSubPack/report-record/report-record', - '巡检记录': '/pageSubPack/inspection/inspection_record', - '仪表换新': '/pageSubPack/instrument/replacement_record', - '设置': '/pageSubPack/setting/setting' + 上报记录: '/pageSubPack/report-record/report-record', + 巡检记录: '/pageSubPack/inspection/inspection_record', + 仪表换新: '/pageSubPack/instrument/replacement_record', + 设置: '/pageSubPack/setting/setting' } const url = routes[item.title] if (!url) return