zhouyanli/property-resident-side
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
zhouyanli
2026-08-14 16:22:44 +08:00
parent 9e8f5d6acc
commit 53ea3996a0
17 changed files with 164 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
View File

@@ -177,8 +177,8 @@
取消报名
</button>
<!-- 活动实况页显示添加实况按钮 -->
<button class="action-btn add-status-btn" v-if="hasSigned && isActivityStarted && !isActivityEnded && activeTab === 'status'" @click="liveClick">添加实况</button>
<!-- 活动实况页显示添加实况按钮（活动开始之后、结束之前显示） -->
<button class="action-btn add-status-btn" v-if="isActivityStarted && !isActivityEndedByTime && activeTab === 'status'" @click="liveClick">添加实况</button>
</view>
<!-- 报名确认模态框 -->
@@ -257,6 +257,12 @@ const isActivityStarted = computed(() => {
return moment().isSameOrAfter(moment(activityConent.value.startTime))
})
// 判断活动是否已到结束时间
const isActivityEndedByTime = computed(() => {
if (!activityConent.value.endTime) return false
return moment().isAfter(moment(activityConent.value.endTime))
})

2
property-uniapp-project/pageSubPack/api/api.js
View File

@@ -119,7 +119,7 @@ export const getQueryRepair = (data) =>{
}
// 获取房屋列表
export const getHouseList = (data) =>{
return get('/api/resident/my/house/list',data)
return get('/repairOrder/certifiedHouseList',data)
}
// 报修详情
export const getRepairDetail = (data) =>{

4
property-uniapp-project/pageSubPack/api/request.js
View File

@@ -2,8 +2,8 @@ import { navigateToLogin } from '@/common/checkLogin.js'
let baseUrl = '';
if (process.env.NODE_ENV === 'development') {
// baseUrl = 'http://192.168.1.6:8080'; // 开发环境
baseUrl = 'http://192.168.1.222:8080';
baseUrl = 'http://192.168.1.6:8080'; // 开发环境
// baseUrl = 'http://192.168.1.222:8080';
} else {
baseUrl = 'https://wuyeapi.ckdzkj.com'; // 生产环境
}

2
property-uniapp-project/pageSubPack/api/useImageUpload.js
View File

@@ -1,6 +1,6 @@
// 服务器地址（与 request.js 保持一致）
const baseUrl = 'https://wuyeapi.ckdzkj.com';
// const baseUrl = "http://192.168.1.222:8080"
// const baseUrl = "http://192.168.1.6:8080"
/**
* 图片上传 Hook

36
property-uniapp-project/pageSubPack/inspection-revenue/inspection-details.vue
View File

@@ -21,31 +21,16 @@
<view class="text-item">巡检点：{{ detail.pointNames }}</view>
</view>
<!-- 第二块：巡检结果 -->
<view class="card">
<view class="card-subtitle">巡检结果</view>
<view class="text-item">巡检人：{{ detail.inspectorName }}</view>
<view class="text-item">手机号码：{{ detail.phoneNumber }}</view>
<view class="text-item">巡检时间：{{ detail.inspectTime }}</view>
<view class="text-item">巡检结果：</view>
<view class="result-desc">
<text v-for="(r, idx) in detail.results" :key="idx">{{ idx + 1 }}.{{ r }}</text>
</view>
<view class="text-item">巡检照片：</view>
<view class="img-wrap">
<view class="img-box" v-for="(img, idx) in detail.photos" :key="idx" @click="previewImage(img)">
<image class="img" :src="img" mode="aspectFill"></image>
</view>
<view class="empty-img-tip" v-if="!detail.photos || detail.photos.length === 0">暂无照片</view>
</view>
</view>
<!-- 第三块：巡检明细列表 -->
<view class="card" v-for="(sub, idx) in detail.details" :key="sub.id">
<view class="card-subtitle">{{ sub.pointName }}</view>
<view class="card-subtitle">巡检结果</view>
<view class="text-item">巡检点：{{ sub.pointName }}</view>
<view class="text-item">巡检人：{{ detail.inspectorName }}</view>
<view class="text-item">手机号码：{{ detail.phoneNumber }}</view>
<view class="text-item">巡检时间：{{ sub.checkTime }}</view>
<view class="text-item">巡检状态：{{ getXunJianStatus(sub.status) }}</view>
<view class="text-item">巡检结果：{{ sub.checkResult }}</view>
<view class="text-item" v-if="sub.remark">备注：{{ sub.remark }}</view>
<!-- <view class="text-item" v-if="sub.remark">备注：{{ sub.remark }}</view> -->
<view class="text-item" v-if="sub.photos">巡检照片：</view>
<view class="img-wrap" v-if="sub.photos">
<view class="img-box" v-for="(img, i) in sub.photos.split(',')" :key="i" @click="previewImage(img)">
@@ -82,6 +67,15 @@
fetchDetail()
}
})
// 巡检状态字段映射 0正常，1异常
function getXunJianStatus(status){
const staMap = {
"0":'正常',
"1":"异常"
}
return staMap[status]
}
const fetchDetail = async () => {
if (!recordId) return

8
property-uniapp-project/pageSubPack/my/houseDetail.vue
View File

@@ -37,7 +37,7 @@
</view>
<view class="info-row">
<text class="info-label">业主</text>
<text class="info-value">{{form.ownerName}}</text>
<text class="info-value">{{form.name}}</text>
</view>
<view class="info-row">
<text class="info-label">房间状态</text>
@@ -58,7 +58,7 @@
</view>
<view class="info-row">
<text class="info-label">住户</text>
<text class="info-value">{{form.name}}</text>
<text class="info-value">{{form.residentName}}</text>
</view>
<view class="info-row">
<text class="info-label">房间号</text>
@@ -220,6 +220,10 @@
id: id.value
}).then(res => {
if (res.code === 200) {
// 删除后清空小区缓存，避免首页仍显示已删除的小区
uni.setStorageSync('needReloadUserInfo', true)
uni.removeStorageSync('currentVillageId')
uni.removeStorageSync('home_cache_' + (uni.getStorageSync('userId') || ''))
uni.showToast({
title: '删除成功',
icon: 'success'

10
property-uniapp-project/pageSubPack/my/myCarIndex.vue
View File

@@ -162,7 +162,7 @@
min-height: 0;
height: 0;
overflow-y: auto;
padding: 0px 40rpx;
padding: 0px 40rpx 140rpx;
box-sizing: border-box;
}
@@ -183,9 +183,15 @@
}
.bottom-btn {
padding: 20rpx 30rpx 40rpx;
position: fixed;
left: 0;
right: 0;
bottom: 0;
padding: 20rpx 30rpx;
padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
flex-shrink: 0;
background-color: #f5f7fa;
box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.05);
}
.car-item {

23
property-uniapp-project/pageSubPack/my/myHouseIndex.vue
View File

@@ -2,6 +2,11 @@
<view class="contentStyle" style="">
<scroll-view class="page" scroll-y :refresher-enabled="true" :refresher-triggered="isRefreshing" @refresherrefresh="onRefresh" @scrolltolower="loadMore">
<!-- 空状态 -->
<view v-if="houseList.length === 0" class="empty-state">
<uni-icons type="info" size="30" color="#ccc"></uni-icons>
<text class="empty-text">暂无数据</text>
</view>
<!-- 房屋列表 v-for 渲染 -->
<view class="house-list">
<view class="house-card" v-for="(item, index) in houseList" :key="index" @click="tapHouse(item)">
@@ -218,6 +223,24 @@
box-sizing: border-box;
}
/* 空状态 */
.empty-state {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100%;
min-height: 500rpx;
color: #ccc;
}
.empty-text {
font-size: 32rpx;
color: #999;
margin-top: 20rpx;
margin-bottom: 10rpx;
}
/* 列表 */
.house-list {
}

11
property-uniapp-project/pageSubPack/my/myParkingSpaceIndex.vue
View File

@@ -196,7 +196,7 @@
.page {
flex: 1;
overflow-y: auto;
padding: 0px 40rpx;
padding: 0px 40rpx 140rpx;
box-sizing: border-box;
}
@@ -217,7 +217,14 @@
}
.bottom-btn {
padding: 20rpx 30rpx 40rpx;
position: fixed;
left: 0;
right: 0;
bottom: 0;
padding: 20rpx 30rpx;
padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
background: #f5f7fa;
box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.05);
}
.parkingSpace-card {

2
property-uniapp-project/pageSubPack/my/parkingSpaceDetail.vue
View File

@@ -24,7 +24,7 @@
<view class="info-card">
<view class="card-title">
<view class="title-line"></view>
房屋信息
车位信息
</view>
<view class="info-row">
<text class="info-label">小区</text>

54
property-uniapp-project/pageSubPack/my/selectParingLot.vue
View File

@@ -26,6 +26,9 @@
ref,
onMounted
} from 'vue'
import {
onUnload
} from '@dcloudio/uni-app'
import {
getResidentCarAreaManageAreaListByVillageId,
getResidentCarAreaManageParkingListByAreaId
@@ -37,6 +40,8 @@
const selectedParkingLot = ref(uni.getStorageSync('parkingLotId'))
const selectedParkingSpace = ref(uni.getStorageSync('parkingSpaceId'))
const isSubmitting = ref(false)
let navTimer = null
let lockTimer = null
onMounted(() => {
checkType.value = uni.getStorageSync('checkType')
@@ -94,37 +99,38 @@
}
const selectedParking = (item) => {
// 防重复点击锁：处理中直接返回，避免重复选择/重复跳转
if (isSubmitting.value) return
isSubmitting.value = true
console.log(item);
if (checkType.value == '停车场') {
selectedParkingLot.value = item.id
} else if (checkType.value == '车位编号') {
selectedParkingSpace.value = item.id
}
setTimeout(() => {
uni.showToast({
title: '选择成功',
icon: 'success'
})
console.log(checkType.value);
try {
if (checkType.value == '停车场') {
selectedParkingLot.value = item.id
uni.setStorageSync('parkingLotId', item.id)
uni.setStorageSync('parkingLotName', item.name)
uni.removeStorageSync('parkingSpaceId')
uni.removeStorageSync('parkingSpaceName')
uni.setStorageSync('checkType', '车位编号')
} else if (checkType.value == '车位编号') {
console.log(item.id);
selectedParkingSpace.value = item.id
uni.setStorageSync('parkingSpaceId', item.id)
uni.setStorageSync('parkingSpaceName', item.name)
}
}, 1000)
setTimeout(() => {
goFreash()
}, 2500)
uni.showToast({
title: '选择成功',
icon: 'success'
})
navTimer = setTimeout(() => {
goFreash()
}, 1500)
} finally {
// 正常跳转后页面会销毁，防止异常时锁死
lockTimer = setTimeout(() => {
isSubmitting.value = false
}, 1500)
}
}
const goFreash = () => {
@@ -149,6 +155,18 @@
}
uni.navigateBack()
}
// 页面销毁时清理定时器，避免手势返回后延迟跳转仍触发
onUnload(() => {
if (navTimer) {
clearTimeout(navTimer)
navTimer = null
}
if (lockTimer) {
clearTimeout(lockTimer)
lockTimer = null
}
})
</script>
<style lang="scss">

10
property-uniapp-project/pageSubPack/my/settingIndex.vue
View File

@@ -372,14 +372,20 @@
.page {
flex: 1;
overflow-y: auto;
padding: 0 40rpx;
padding: 0 40rpx 140rpx;
box-sizing: border-box;
background-color: #fff;
}
.bottom-btn {
padding: 20rpx 30rpx 40rpx;
position: fixed;
left: 0;
right: 0;
bottom: 0;
padding: 20rpx 30rpx;
padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
background-color: #fff;
box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.05);
}
</style>

2
property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
View File

@@ -29,7 +29,7 @@
<view class="form-item-wenti">
<text class="label">问题描述</text>
<view class="textarea-wrap">
<textarea v-model="form.desc" placeholder="请描述你的问题（最多200字）" maxlength="200" class="desc-textarea" />
<textarea v-model="form.desc" placeholder="请描述你的问题或位置（最多200字）" maxlength="200" class="desc-textarea" />
<text class="char-count">{{ form.desc.length }}/200</text>
</view>
<!-- <uni-easyinput v-model="form.desc" placeholder="请描述你的问题" type="textarea" maxlength="200"></uni-easyinput> -->

2
property-uniapp-project/pageSubPack/online-repair/publicRepair.vue
View File

@@ -22,7 +22,7 @@
<view class="form-item-wenti">
<text class="label">问题描述</text>
<view class="textarea-wrap">
<textarea v-model="form.desc" placeholder="请描述你的问题（最多200字）" maxlength="200" class="desc-textarea" />
<textarea v-model="form.desc" placeholder="请描述你的问题或位置（最多200字）" maxlength="200" class="desc-textarea" />
<text class="char-count">{{ form.desc.length }}/200</text>
</view>
</view>

28
property-uniapp-project/pageSubPack/online-repair/selectHouse.vue
View File

@@ -27,8 +27,10 @@
</view>
<!-- 确认按钮 -->
<button class="confirm-btn" @click="confirmSelect">确认</button>
<!-- 确认按钮（固定底部，不随内容滚动） -->
<view class="confirm-bar">
<button class="confirm-btn" @click="confirmSelect">确认</button>
</view>
</view>
</template>
@@ -55,7 +57,7 @@ const fetchHouseList = async () => {
try {
const res = await getHouseList({ pageNum: pageNum.value, pageSize: pageSize.value })
if (res.code === 200) {
const list = res.rows || []
const list = res.data || []
houseList.value = list
// 仅当从表单页带入了房屋ID时，自动选中对应房屋；否则不默认选择
if (preSelectedHouseId.value) {
@@ -106,15 +108,12 @@ const confirmSelect = () => {
padding: 15px;
height: 100vh;
box-sizing: border-box;
display: flex;
flex-direction: column;
justify-content: space-between;
background: #f9f9f9;
}
.house-list {
flex: 1;
min-height: 0;
height: 100%;
overflow-y: auto;
padding-bottom: 120rpx;
}
.house-item {
display: flex;
@@ -145,6 +144,17 @@ const confirmSelect = () => {
color: #666;
margin-top: 4px;
}
.confirm-bar {
position: fixed;
left: 0;
right: 0;
bottom: 0;
padding: 20rpx 30rpx;
padding-bottom: calc(20rpx + env(safe-area-inset-bottom));
background: #f9f9f9;
box-shadow: 0 -4rpx 20rpx rgba(0, 0, 0, 0.05);
}
.confirm-btn {
width: 100%;
height: 44px;
@@ -153,8 +163,6 @@ const confirmSelect = () => {
color: #fff;
border-radius: 8px;
font-size: 28rpx;
margin-top: 20px;
margin-bottom: 20rpx;
}
/* 空状态 */
.empty-state {