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-07-21 09:41:54 +08:00
parent 7b1864f439
commit e68579a5d3
15 changed files with 1143 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
property-uniapp-project/pageSubPack/api/apiSub.js
View File

@@ -259,3 +259,13 @@ export const checkAppUpdate = (data) => {
export const postUpdateLog = (data) => {
return post(`/api/app/updateLog`, data)
}
// ===========巡检记录========
// 列表
export const getInspectionList = (data) =>{
return get('/api/resident/inspection/list',data)
}
// 详情
export const inspectionDetails = (data) =>{
return get(`/api/resident/inspection/${data.id}`,data)
}

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

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

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

@@ -1,124 +1,240 @@
<template>
<view class="page">
<scroll-view scroll-y class="scroll">
<!-- 第一块信息卡片 -->
<view class="card">
<view class="row-title">
<text>幸福苑小区1号楼1单元电梯间</text>
<text class="status">已巡检</text>
</view>
<view class="text-item">巡检项目：设备巡检</view>
<view class="text-item">巡检时间：07:00:00 –09:00:00</view>
<view class="text-item">巡检小区：幸福苑小区</view>
<view class="text-item">巡检路线：常规巡检路线1</view>
<view class="text-item">巡检点：安全出口1号；巡检点2；巡检点3</view>
</view>
<view class="page">
<view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
<uni-nav-bar title="巡检详情" backgroundColor="transparent" :border="false" left-icon="left"
@click-left="goBack" />
<scroll-view scroll-y class="scroll">
<!-- 加载中 -->
<view class="loading-wrap" v-if="loading">
<uni-load-more status="loading" :content-text="{ contentdown: '上拉加载更多', contentrefresh: '加载中...', contentnomore: '没有更多了' }" />
</view>
<!-- 第二块巡检结果卡片 -->
<view class="card">
<view class="card-subtitle">巡检结果</view>
<view class="text-item">巡检人：李祥龙</view>
<view class="text-item">手机号码：13013001300</view>
<view class="text-item">巡检时间：2026-10-25 08:10:10</view>
<view class="text-item">巡检结果：</view>
<view class="result-desc">
<text>1.设备正常，无任何异动和意向</text>
<text>2.电力系统正常、无故障提示</text>
<text>3.设备使用正常，无异常提示</text>
</view>
<view class="text-item">巡检照片：</view>
<!-- 图片区域 flex自动换行 -->
<view class="img-wrap">
<view
class="img-box"
v-for="(img, idx) in imgList"
:key="idx"
>
<image
class="img"
:src="img"
mode="aspectFill"
></image>
</view>
</view>
</view>
</scroll-view>
</view>
<template v-if="!loading && detail">
<!-- 第一块：基本信息 -->
<view class="card">
<view class="row-title">
<text>{{ detail.locationName }}</text>
<text class="status">{{ detail.status }}</text>
</view>
<view class="text-item">巡检项目：{{ detail.inspectionType }}</view>
<view class="text-item">巡检时间：{{ detail.taskTime }}</view>
<view class="text-item">巡检小区：{{ detail.villageName }}</view>
<view class="text-item">巡检路线：{{ detail.routeName }}</view>
<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="text-item">巡检时间：{{ sub.checkTime }}</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.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)">
<image class="img" :src="img" mode="aspectFill"></image>
</view>
</view>
</view>
</template>
<!-- 加载失败 -->
<view class="error-wrap" v-if="!loading && !detail">
<text class="empty-text">数据加载失败</text>
<view class="retry-btn" @click="fetchDetail">点击重试</view>
</view>
</scroll-view>
</view>
</template>
<script setup>
import { ref } from 'vue'
import { ref } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import { inspectionDetails } from '../api/apiSub.js'
// 图片列表，空图片占位，真实环境替换成接口图片地址
const imgList = ref([
'',
'',
'',
''
])
const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
const loading = ref(false)
const detail = ref(null)
let recordId = ''
onLoad((options) => {
if (options.id) {
recordId = options.id
fetchDetail()
}
})
const fetchDetail = async () => {
if (!recordId) return
loading.value = true
detail.value = null
try {
const res = await inspectionDetails({ id: recordId })
if (res.code === 200) {
detail.value = res.data
} else {
uni.showToast({ title: res.msg || '获取详情失败', icon: 'none' })
}
} catch (err) {
console.error('获取巡检详情失败', err)
uni.showToast({ title: '网络异常，请重试', icon: 'none' })
} finally {
loading.value = false
}
}
const goBack = () => {
uni.navigateBack()
}
const previewImage = (url) => {
if (!url) return
// 收集当前所有可预览图片
const allPhotos = []
if (detail.value.photos) allPhotos.push(...detail.value.photos)
if (detail.value.details) {
detail.value.details.forEach(d => {
if (d.photos) allPhotos.push(...d.photos.split(','))
})
}
uni.previewImage({
current: url,
urls: allPhotos
})
}
</script>
<style scoped>
page {
background-color: #f7f8fa;
}
.page {
padding: 24rpx;
}
.scroll {
height: 100vh;
}
.card {
background: #fff;
border-radius: 20rpx;
padding: 36rpx;
margin-bottom: 24rpx;
}
.row-title {
display: flex;
justify-content: space-between;
font-size: 32rpx;
color: #222;
margin-bottom: 24rpx;
}
.status {
font-size: 24rpx;
color: #555;
}
.card-subtitle {
font-size: 32rpx;
font-weight: 500;
color: #222;
margin-bottom: 24rpx;
}
.text-item {
font-size: 28rpx;
color: #333;
line-height: 2;
}
.result-desc {
font-size: 28rpx;
color: #333;
display: flex;
flex-direction: column;
line-height: 1.8;
margin: 12rpx 0;
}
/* 图片容器 flex-wrap换行 */
.img-wrap {
margin-top: 16rpx;
display: flex;
flex-wrap: wrap;
gap: 16rpx;
}
.img-box {
width: 140rpx;
height: 140rpx;
background-color: #d8d9db;
border-radius: 8rpx;
}
.img {
width: 100%;
height: 100%;
}
page {
background-color: #f7f8fa;
}
.status-bar {
width: 100%;
flex-shrink: 0;
}
.page {
height: 100vh;
display: flex;
flex-direction: column;
}
.scroll {
flex: 1;
padding: 24rpx;
box-sizing: border-box;
}
.card {
background: #fff;
border-radius: 20rpx;
padding: 36rpx;
margin-bottom: 24rpx;
}
.row-title {
display: flex;
justify-content: space-between;
font-size: 32rpx;
color: #222;
margin-bottom: 24rpx;
}
.status {
font-size: 24rpx;
color: #555;
}
.card-subtitle {
font-size: 32rpx;
font-weight: 500;
color: #222;
margin-bottom: 24rpx;
}
.text-item {
font-size: 28rpx;
color: #333;
line-height: 2;
}
.result-desc {
font-size: 28rpx;
color: #333;
display: flex;
flex-direction: column;
line-height: 1.8;
margin: 12rpx 0;
}
/* 图片容器 flex-wrap换行 */
.img-wrap {
margin-top: 16rpx;
display: flex;
flex-wrap: wrap;
gap: 16rpx;
}
.img-box {
width: 140rpx;
height: 140rpx;
background-color: #d8d9db;
border-radius: 8rpx;
overflow: hidden;
}
.img {
width: 100%;
height: 100%;
}
.empty-img-tip {
font-size: 26rpx;
color: #999;
}
.loading-wrap {
padding-top: 200rpx;
}
.error-wrap {
display: flex;
flex-direction: column;
align-items: center;
padding-top: 200rpx;
}
.empty-text {
font-size: 28rpx;
color: #999;
}
.retry-btn {
margin-top: 24rpx;
padding: 12rpx 48rpx;
border: 2rpx solid #2F77FD;
border-radius: 8rpx;
color: #2F77FD;
font-size: 28rpx;
}
</style>

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

@@ -1,6 +1,6 @@
<template>
<view class="contentStyle">
<view class="status-bar"></view>
<view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
<uni-nav-bar title="巡检记录" backgroundColor="transparent" :border="false" left-icon="left" @click-left="goBack" />
<view class="content-wrap">
<!-- 时间选择器 -->
@@ -19,17 +19,22 @@
</view>
<!-- 巡检列表 -->
<scroll-view scroll-y class="scroll-view">
<view class="list-container" @click="goToInspectionDetail">
<view class="card-item" v-for="(item, index) in listData" :key="index">
<view class="list-container" v-if="listData.length > 0">
<view class="card-item" v-for="(item, index) in listData" :key="index" @click="goToInspectionDetail(item)">
<view class="card-head">
<text class="address">{{ item.address }}</text>
<text class="address">{{ item.locationName }}</text>
<text class="status">{{ item.status }}</text>
</view>
<view class="tag-label">{{ item.type }}</view>
<view class="text-row">巡检时间：{{ item.time }}</view>
<view class="text-row">巡检人：{{ item.inspector }}</view>
<view class="tag-label">{{ item.inspectionType }}</view>
<view class="text-row">巡检时间：{{ item.executeDate }}</view>
<view class="text-row">巡检人：{{ item.inspectorName }}</view>
</view>
</view>
<!-- 暂无数据 -->
<view class="empty-wrap" v-if="!loading && listData.length === 0">
<uni-icons type="info" size="30" color="#ccc"></uni-icons>
<text class="empty-text">暂无数据</text>
</view>
</scroll-view>
</view>
@@ -37,51 +42,117 @@
</template>
<script setup>
import {
ref
} from 'vue';
import {ref} from 'vue'
import {onLoad,onReachBottom,onPullDownRefresh} from '@dcloudio/uni-app'
import {getInspectionList} from '../api/apiSub.js'
import moment from 'moment' // 新增
// ---------- 基础状态 ----------
const datetime = ref('')
const showDate = ref('选择日期')
const listData = ref([
{
address: '幸福苑小区1号楼1单元电梯间',
status: '已巡检',
type: '设备巡检',
time: '07:00:00 –09:00:00',
inspector: '李祥龙'
},
{
address: '幸福苑小区1号楼1单元电梯间',
status: '已巡检',
type: '设备巡检',
time: '07:00:00 –09:00:00',
inspector: '李祥龙'
}
])
const listData = ref([])
const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
const handleChangeTime = (e) => {
if (e) {
// e 格式为 YYYY-MM-DD，只取 MM-DD
showDate.value = e.slice(5)
} else {
showDate.value = '选择日期'
// ---------- 分页状态 ----------
const pageNum = ref(1)
const pageSize = ref(10)
const total = ref(0)
const loading = ref(false)
const noMore = ref(false)
// ---------- 初始化 ----------
onLoad(() => {
// 使用 moment 格式化今天
const today = moment().format('YYYY-MM-DD')
datetime.value = today
showDate.value = moment().format('MM-DD') // 显示 MM-DD
fetchList(true)
})
// ---------- 获取列表 ----------
const fetchList = async (reset = false) => {
if (loading.value) return
if (!reset && noMore.value) return
loading.value = true
try {
const params = {
date: datetime.value, // 已经是 YYYY-MM-DD
pageNum: reset ? 1 : pageNum.value,
pageSize: pageSize.value
}
const res = await getInspectionList(params)
if (res.code === 200) {
const rows = res.rows
total.value = res.total || 0
if (reset) {
listData.value = rows
pageNum.value = 1
noMore.value = rows.length < pageSize.value
} else {
listData.value = [...listData.value, ...rows]
noMore.value = rows.length < pageSize.value || listData.value.length >= total.value
}
if (!reset && rows.length > 0) {
pageNum.value += 1
}
} else {
uni.showToast({ title: res.msg || '获取列表失败', icon: 'none' })
}
} catch (err) {
console.error('获取巡检列表失败', err)
uni.showToast({ title: '网络异常，请重试', icon: 'none' })
} finally {
loading.value = false
uni.stopPullDownRefresh()
}
}
// 返回
// ---------- 日期变更（使用 moment） ----------
const handleChangeTime = (e) => {
if (e) {
// e 格式为 YYYY-MM-DD，用 moment 解析并格式化为 MM-DD
showDate.value = moment(e).format('MM-DD')
datetime.value = e
} else {
// 用户清空日期，可根据业务设置默认值或置空
showDate.value = '选择日期'
datetime.value = ''
// 如果希望清空时不请求，可 return，否则也重置列表
}
// 重置分页并刷新
pageNum.value = 1
noMore.value = false
fetchList(true)
}
// ---------- 上拉加载更多 ----------
onReachBottom(() => {
if (!noMore.value && !loading.value) {
fetchList(false)
}
})
// ---------- 下拉刷新 ----------
onPullDownRefresh(() => {
pageNum.value = 1
noMore.value = false
fetchList(true)
})
// ---------- 返回 ----------
const goBack = () => {
uni.switchTab({
url: '/pages/serviceIndex/serviceIndex'
})
}
// 跳转详情
const goToInspectionDetail = () =>{
// ---------- 跳转详情 ----------
const goToInspectionDetail = (item) => {
uni.navigateTo({
url: `/pageSubPack/inspection-revenue/inspection-details`
url: `/pageSubPack/inspection-revenue/inspection-details?id=${item.id}`
})
}
</script>
<style lang="scss" scoped>
@@ -99,8 +170,8 @@
}
.status-bar {
height: 46px;
width: 100%;
flex-shrink: 0;
}
.timebox {
@@ -214,4 +285,22 @@
color: #333;
line-height: 2;
}
// 暂无数据
.empty-wrap {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding-top: 200rpx;
}
.empty-img {
width: 240rpx;
height: 240rpx;
}
.empty-text {
font-size: 28rpx;
color: #999;
margin-top: 20rpx;
}
</style>

4
property-uniapp-project/pageSubPack/loginSub/pwd-login.vue
View File

@@ -208,7 +208,7 @@ const doLogin = () => {
},2000);
})
}else{
uni.showToast({ title: res.msg, icon: 'error' });
uni.showToast({ title: res.msg, icon: 'none' });
}
}).catch(err => {
@@ -216,7 +216,7 @@ const doLogin = () => {
uni.hideLoading();
uni.showToast({
title: err.msg || '网络异常',
icon: 'error'
icon: 'none'
});
})
};

8
property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
View File

@@ -224,13 +224,13 @@
} else {
uni.showToast({
title: '验证码发送失败',
icon: 'error'
icon: 'none'
});
}
}).catch(err => {
uni.showToast({
title: err.msg || '网络异常',
icon: 'error'
icon: 'none'
});
})
@@ -309,14 +309,14 @@
} else {
uni.showToast({
title: '注册失败',
icon: 'error'
icon: 'none'
});
}
}).catch((err) => {
uni.hideLoading();
uni.showToast({
title: err.msg || '网络异常',
icon: 'error'
icon: 'none'
});
})
};

15
property-uniapp-project/pageSubPack/my/addHouse.vue
View File

@@ -539,12 +539,12 @@
getHouseAuthSendSmsCode(params).then(res => {
if (res.code === 200) {
uni.showToast({
title: `发送成功！`,
icon: 'error'
title: '发送成功',
icon: 'success'
});
} else {
uni.showToast({
title: `${res.msg}`,
title: res.msg,
icon: 'error'
});
}
@@ -739,7 +739,6 @@
uni.showToast({
title: err.msg || '提交失败',
icon: 'none',
duration: 2500
})
}
}
@@ -758,16 +757,16 @@
}, 1500);
} else {
uni.showToast({
title: `${res.msg}`,
icon: 'error'
title: res.msg,
icon: 'none'
});
}
}).catch(err => {
console.log(err);
uni.showToast({
title: `${err}`,
icon: 'error'
title: err.msg,
icon: 'none'
});
})
}

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

@@ -70,12 +70,12 @@
title: '注销账号',
type: 'arrow'
},
{
title: '升级版本',
type: 'text',
value: '当前版本 1.0.0',
valueClass: 'item-version'
}
// {
// title: '升级版本',
// type: 'text',
// value: '当前版本 1.0.0',
// valueClass: 'item-version'
// }
])
// 格式化字节大小

88
property-uniapp-project/pageSubPack/payment-list/arrearsPayment.vue
View File

@@ -55,7 +55,6 @@
<view style="border-bottom: 2rpx solid #ededed;margin:10rpx 0rpx;"></view> -->
<view class="arrears-row" v-if="outstandingPayment==true">
<text class="arrears-text">当前欠费金额¥{{ arrearsAmount }}元</text>
<text class="auto-fill-btn" @click="handleAutoFill">点击自动填入</text>
</view>
<!-- <view class="arrears-row" v-if="outstandingPayment==false">
<text class="arrears-text">暂未查询到欠费</text>
@@ -76,7 +75,7 @@
<!-- 提示文案 -->
<view class="desc">
成功缴纳{{ switchStatus(paymentItem.type) || '' }}费用 ¥{{ payNum || payAmount }}元
成功缴纳{{ switchStatus(paymentItem.type) || '' }}费用 ¥{{ arrearsAmount || payAmount }}元
</view>
@@ -123,7 +122,6 @@
const currentStep = ref(1)
const payAmount = ref('0.00')
const arrearsAmount = ref('0.00')
const payNum = ref('')
// 页面加载时初始化数据
onLoad(() => {
@@ -165,13 +163,6 @@
}
}
// 自动填充欠费金额
const handleAutoFill = () => {
payNum.value = arrearsAmount.value
uni.vibrateShort({
type: 'light'
})
}
// 返回
const goBack = () => {
@@ -189,6 +180,7 @@
// })
// return
// }
const amount = arrearsAmount.value
try {
uni.showLoading({ title: '加载中...' })
@@ -200,7 +192,8 @@
const res = await getBankMiniProgramParams({
acct: uni.getStorageSync('userId'),
orderType: '20',
orderAmount: String(Math.round(Number(payNum.value) * 100)),
orderAmount: String(Math.round(Number(amount) * 100)),
// orderAmount: String(Math.round(Number(arrearsAmount.value) * 100)),
deviceCode: paymentItem.deviceCode || '',
deviceType: mappedDeviceType,
billId: paymentItem.billId || '',
@@ -215,7 +208,7 @@
return
}
console.log('resres返回数据', res)
console.log('resres', res.data)
// console.log('resres', res.data)
const { appId, path, extraData } = res.data
console.log('navigateToMiniProgram参数:', { appId, path, extraData })
@@ -228,19 +221,19 @@
}
// 解析 extraData（后端返回可能是字符串或对象）
// ' let extraDataObj = extraData
// if (typeof extraData === 'string') {
// try {
// extraDataObj = JSON.parse(extraData)
// } catch (e) {
// console.error('extraData JSON解析失败，使用空对象', e)
// extraDataObj = {}
// }
// }
// if (!extraDataObj || typeof extraDataObj !== 'object') {
// extraDataObj = {}
// }'
/* let extraDataObj = extraData
if (typeof extraData === 'string') {
try {
extraDataObj = JSON.parse(extraData)
} catch (e) {
console.error('extraData JSON解析失败，使用空对象', e)
extraDataObj = {}
}
}
if (!extraDataObj || typeof extraDataObj !== 'object') {
extraDataObj = {}
}
console.log('解析-----extraDataObj', extraDataObj) */
// #ifdef APP-PLUS
// 原生App：通过微信SDK拉起小程序
plus.share.getServices((services) => {
@@ -253,12 +246,17 @@
uni.showToast({ title: '当前微信版本太低，不支持拉起小程序', icon: 'none' })
return
}
weixin.launchMiniProgram({
id: appId,
id: 'gh_4ba5e4fdaa83',
// appId:'00004951',
type: 1, // 0=正式版 1=测试版 2=预览版
path: path || '',
path: path,
// extMsg: JSON.stringify({ extraData: extraData })
extraData: extraData
}, (res) => {
console.log('ress-------------',res)
if (res.retCode === 'SUCCESS') {
console.log('成功拉起日照银行小程序（App）', res.retCode)
} else {
@@ -271,24 +269,24 @@
uni.showToast({ title: '拉起支付小程序失败', icon: 'none' })
})
})
// #endif
// #endif
// #ifdef MP-WEIXIN
// 微信小程序：直接navigateToMiniProgram
uni.navigateToMiniProgram({
appId: appId,
path: path || '',
extraData: extraData,
envVersion: 'develop',
success: () => {
console.log('成功拉起日照银行小程序（微信）')
},
fail: (err) => {
console.error('拉起日照银行小程序失败（微信）', JSON.stringify(err))
uni.showToast({ title: err.errMsg || err.msg || '拉起支付小程序失败', icon: 'none' })
}
})
// #endif
// // #ifdef MP-WEIXIN
// // 微信小程序：直接navigateToMiniProgram
// uni.navigateToMiniProgram({
// appId: appId,
// path: path || '',
// extraData: extraData,
// envVersion: 'develop',
// success: () => {
// console.log('成功拉起日照银行小程序（微信）')
// },
// fail: (err) => {
// console.error('拉起日照银行小程序失败（微信）', JSON.stringify(err))
// uni.showToast({ title: err.errMsg || err.msg || '拉起支付小程序失败', icon: 'none' })
// }
// })
// // #endif
} catch (err) {
uni.hideLoading()
console.error('获取支付参数异常', err)
@@ -304,7 +302,7 @@
userId: userId,
channel: 'resident',
title: '缴费成功',
content: `您已成功缴纳${switchStatus(paymentItem.type) || ''}费用 ¥${payNum.value || payAmount.value}元`
content: `您已成功缴纳${switchStatus(paymentItem.type) || ''}费用 ¥${arrearsAmount.value || payAmount.value}元`
}).catch(err => {
console.log('推送发送失败', err)
})