diff --git a/property-uniapp-project/pageSubPack/inspection-revenue/inspection-details.vue b/property-uniapp-project/pageSubPack/inspection-revenue/inspection-details.vue new file mode 100644 index 0000000..aede379 --- /dev/null +++ b/property-uniapp-project/pageSubPack/inspection-revenue/inspection-details.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/property-uniapp-project/pageSubPack/inspection-revenue/inspection.vue b/property-uniapp-project/pageSubPack/inspection-revenue/inspection.vue new file mode 100644 index 0000000..4057a72 --- /dev/null +++ b/property-uniapp-project/pageSubPack/inspection-revenue/inspection.vue @@ -0,0 +1,217 @@ + + + + + \ No newline at end of file diff --git a/property-uniapp-project/pageSubPack/inspection-revenue/public-revenue-details.vue b/property-uniapp-project/pageSubPack/inspection-revenue/public-revenue-details.vue new file mode 100644 index 0000000..1e8876d --- /dev/null +++ b/property-uniapp-project/pageSubPack/inspection-revenue/public-revenue-details.vue @@ -0,0 +1,440 @@ + + + + + \ No newline at end of file diff --git a/property-uniapp-project/pageSubPack/inspection-revenue/public-revenue.vue b/property-uniapp-project/pageSubPack/inspection-revenue/public-revenue.vue new file mode 100644 index 0000000..b6ad75b --- /dev/null +++ b/property-uniapp-project/pageSubPack/inspection-revenue/public-revenue.vue @@ -0,0 +1,255 @@ + + + + + \ No newline at end of file diff --git a/property-uniapp-project/pageSubPack/my/myHouseIndex.vue b/property-uniapp-project/pageSubPack/my/myHouseIndex.vue index f010865..7487eaf 100644 --- a/property-uniapp-project/pageSubPack/my/myHouseIndex.vue +++ b/property-uniapp-project/pageSubPack/my/myHouseIndex.vue @@ -20,7 +20,7 @@ 默认 {{ item.villageName+item.buildingName+item.unitNo+'单元'+item.floorNo+'楼' }} + class="house-name">{{ item.villageName+"-"+item.buildingName+"-"+item.unitNo }} {{ item.certificationStatus=='0'?'未认证':item.certificationStatus=='1'?'认证成功':item.certificationStatus=='2'?'认证失败':'' }} diff --git a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue index e2a383c..565b377 100644 --- a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue +++ b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue @@ -146,6 +146,7 @@ import { ref, computed, onMounted } from 'vue' import { onLoad, onUnload } from '@dcloudio/uni-app' import { addQueryRepair, uploadFile } from '../api/api.js' +import { getUserProfile } from '../api/apiSub.js' import moment from 'moment/moment' // 选中的房屋/项目名称 @@ -282,6 +283,14 @@ onLoad(() => { uni.$on('selectProject', (data) => { projectName.value = data.name projectId.value = data.id + form.value.title = data.name + }) + + // 自动获取当前登录用户手机号 + getUserProfile().then(res => { + if (res.code === 200 && res.data && res.data.phone) { + form.value.phone = res.data.phone + } }) }) @@ -350,9 +359,9 @@ const submitForm = async () => { if (!houseName.value) return uni.showToast({ title: '请选择报修房屋', icon: 'none' }) if (!projectName.value) return uni.showToast({ title: '请选择维修项目', icon: 'none' }) if (!form.value.title) return uni.showToast({ title: '请输入标题', icon: 'none' }) - if (!form.value.desc) return uni.showToast({ title: '请输入问题描述', icon: 'none' }) + // if (!form.value.desc) return uni.showToast({ title: '请输入问题描述', icon: 'none' }) if (!/^1[3-9]\d{9}$/.test(form.value.phone)) return uni.showToast({ title: '手机号不正确', icon: 'none' }) - if (!form.value.datetime) return uni.showToast({ title: '请选择预约时间', icon: 'none' }) + // if (!form.value.datetime) return uni.showToast({ title: '请选择预约时间', icon: 'none' }) const villageId = uni.getStorageSync('currentVillageId') if (!villageId || villageId === '0') return uni.showToast({ title: '请先选择小区', icon: 'none' }) diff --git a/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue b/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue index 0b24bf8..51368ad 100644 --- a/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue +++ b/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue @@ -15,14 +15,12 @@ 标题 - 问题描述 - @@ -59,6 +57,7 @@ import { ref } from 'vue' import{onLoad,onUnload} from "@dcloudio/uni-app" import { addQueryRepair, uploadFile } from '../api/api.js' +import { getUserProfile } from '../api/apiSub.js' // 接收上个页面传的维修项目 const repairProject = ref('') @@ -79,12 +78,21 @@ onLoad((options) => { if (options.category && options.project) { repairProject.value = `${options.category}-${options.project}` projectId.value = options.projectId + form.value.title = `${options.category}-${options.project}` } // ✅ 监听返回选择的项目 uni.$on('selectRepairProject', (data) => { repairProject.value = `${data.category}-${data.project}` projectId.value = data.projectId + form.value.title = `${data.category}-${data.project}` + }) + + // 自动获取当前登录用户手机号 + getUserProfile().then(res => { + if (res.code === 200 && res.data && res.data.phone) { + form.value.phone = res.data.phone + } }) }) @@ -163,10 +171,10 @@ const submitForm = async () => { uni.showToast({ title: '请输入问题标题', icon: 'none' }) return } - if (!form.value.desc) { - uni.showToast({ title: '请输入问题描述', icon: 'none' }) - return - } + // if (!form.value.desc) { + // uni.showToast({ title: '请输入问题描述', icon: 'none' }) + // return + // } if (!/^1[3-9]\d{9}$/.test(form.value.phone)) { uni.showToast({ title: '请输入正确的手机号', icon: 'none' }) return diff --git a/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue b/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue index 5b64d55..43fed97 100644 --- a/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue +++ b/property-uniapp-project/pageSubPack/payment-list/paymentIndex.vue @@ -19,6 +19,7 @@ {{item.type}} 已欠费 + (余额:{{item.balance|| 0.00}}元) {{item.villageName+item.buildingName+item.fullAddress}} @@ -456,6 +457,15 @@ margin-left: 10rpx; line-height: 1.5; } + .balance-normal { + font-size: 28rpx; + color: #333; + } + + .balance-debt { + font-size: 28rpx; + color: #E34D59; + } .arrow { width: 12rpx; diff --git a/property-uniapp-project/pages.json b/property-uniapp-project/pages.json index 5ea588e..c52977a 100644 --- a/property-uniapp-project/pages.json +++ b/property-uniapp-project/pages.json @@ -472,6 +472,36 @@ } } ] + }, + { + "root": "pageSubPack/inspection-revenue", + "pages": [{ + "path": "inspection", + "style": { + "navigationBarTitleText": "巡检记录", + "navigationStyle": "custom" + } + }, + { + "path": "inspection-details", + "style": { + "navigationBarTitleText": "巡检详情" + } + }, + { + "path": "public-revenue", + "style": { + "navigationBarTitleText": "公区收益", + "navigationStyle": "custom" + } + }, + { + "path": "public-revenue-details", + "style": { + "navigationBarTitleText": "收益详情" + } + } + ] } ], diff --git a/property-uniapp-project/pages/index/index.vue b/property-uniapp-project/pages/index/index.vue index 50780ff..08b156d 100644 --- a/property-uniapp-project/pages/index/index.vue +++ b/property-uniapp-project/pages/index/index.vue @@ -111,18 +111,16 @@ - - 活动列表 - - - - - 查看更多 - + + 活动列表 + + + 查看更多 + - + diff --git a/property-uniapp-project/pages/serviceIndex/serviceIndex.vue b/property-uniapp-project/pages/serviceIndex/serviceIndex.vue index 9dc60d2..428b700 100644 --- a/property-uniapp-project/pages/serviceIndex/serviceIndex.vue +++ b/property-uniapp-project/pages/serviceIndex/serviceIndex.vue @@ -123,6 +123,16 @@ name: "联系物业", icon: "http://47.104.199.163:9090/images/propertyImgs/icon-contact.png", path: "/pageSubPack/service-list/contactProperty" + }, + { + name: "巡检记录", + icon: "http://47.104.199.163:9090/images/propertyImgs/icon-contact.png", + path: "/pageSubPack/inspection-revenue/inspection" + }, + { + name: "公区收益", + icon: "http://47.104.199.163:9090/images/propertyImgs/icon-contact.png", + path: "/pageSubPack/inspection-revenue/public-revenue" } ]) const loginName = ref("wangh") @@ -273,13 +283,17 @@ line-height: 1.4; } - /* 智慧社区网格(适配9个图标,最后一个左对齐) */ - .community-grid .func-item { - width: 22%; + /* 智慧社区网格 */ + .community-grid { + justify-content: flex-start; } - .community-grid .func-item:nth-child(9) { - margin-right: auto; - margin-left: 0; + .community-grid .func-item { + width: 22%; + margin-right: calc((100% - 22% * 4) / 3); + } + + .community-grid .func-item:nth-child(4n) { + margin-right: 0; } \ No newline at end of file