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

17
property-uniapp-project/App.vue
View File

@@ -17,19 +17,20 @@
getPushCID() getPushCID()
// #endif // #endif
// 自动登录：检查本地是否已有 token，有则直接跳转首页 // 首页已是入口页：已登录用户不做跳转，直接留首页
// 仅对未登录用户按需跳转到引导页或登录页
const token = uni.getStorageSync('token') const token = uni.getStorageSync('token')
const hasShowGuide = uni.getStorageSync('hasShowGuide') const hasShowGuide = uni.getStorageSync('hasShowGuide')
if (token) { if (!token && !hasShowGuide) {
// 已有登录凭证，直接进入首页 // 首次使用：跳转引导页
console.log('检测到已登录，跳转首页') console.log('首次启动，跳转引导页')
uni.reLaunch({ url: '/pages/index/index' }) uni.reLaunch({ url: '/pages/navigation/navigation' })
} else if (hasShowGuide) { } else if (!token && hasShowGuide) {
// 已看过引导页但没有 token，直接跳转登录页 // 已看过引导但未登录：跳转登录页
console.log('已看过引导页，跳转登录页') console.log('已看过引导页，跳转登录页')
uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' }) uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' })
} }
// 否则停留在引导页（navigation） // 有 token：已在首页，不做跳转
}) })
onShow(() =>{ onShow(() =>{
console.log('App Show') console.log('App Show')

6
property-uniapp-project/manifest.json
View File

@@ -3,7 +3,7 @@
"appid" : "__UNI__29C3D60", "appid" : "__UNI__29C3D60",
"description" : "智慧社区居民端面向小区业主使用，支持注册、验证码、账号密码多种登录方式，提供密码找回功能，账号使用安全便捷。支持多小区切换，首页设有轮播 banner、社区公告，集成远程开门、生活缴费、在线报修、访客邀请、社区活动常用服务。全服务板块统一涵盖门禁开门、线上缴费、报修申报、访客预约、投诉反馈、问卷调研、活动报名、社区公示、一键联系物业功能。个人中心可管理房屋、住户、车位、车辆信息，支持更换手机号、修改密码、消息通知设置、版本更新及账号退出，一站式满足业主居家生活、社区服务、房产车辆管理需求，实现社区生活数字化、便捷化。", "description" : "智慧社区居民端面向小区业主使用，支持注册、验证码、账号密码多种登录方式，提供密码找回功能，账号使用安全便捷。支持多小区切换，首页设有轮播 banner、社区公告，集成远程开门、生活缴费、在线报修、访客邀请、社区活动常用服务。全服务板块统一涵盖门禁开门、线上缴费、报修申报、访客预约、投诉反馈、问卷调研、活动报名、社区公示、一键联系物业功能。个人中心可管理房屋、住户、车位、车辆信息，支持更换手机号、修改密码、消息通知设置、版本更新及账号退出，一站式满足业主居家生活、社区服务、房产车辆管理需求，实现社区生活数字化、便捷化。",
"versionName" : "1.0.1", "versionName" : "1.0.1",
"versionCode" : 111, "versionCode" : 114,
"transformPx" : false, "transformPx" : false,
"uniCloud" : { "uniCloud" : {
"provider" : "aliyun", "provider" : "aliyun",
@@ -110,7 +110,7 @@
}, },
"share" : { "share" : {
"weixin" : { "weixin" : {
"appid" : "wx2255a0821859ef43", "appid" : "wx84b02b2ec80715f4",
"UniversalLinks" : "https://verification.ckdzkj.com/uni-universallinks/__UNI__29C3D60/" "UniversalLinks" : "https://verification.ckdzkj.com/uni-universallinks/__UNI__29C3D60/"
} }
}, },
@@ -172,7 +172,7 @@
"setting" : { "setting" : {
"urlCheck" : false "urlCheck" : false
}, },
"navigateToMiniProgramAppIdList" : [ "00004951" ], "navigateToMiniProgramAppIdList" : [ "wxc0189436c58b59cd" ],
"requiredPrivateInfos" : [ "chooseLocation", "getLocation" ], "requiredPrivateInfos" : [ "chooseLocation", "getLocation" ],
"permission" : { "permission" : {
"scope.camera" : { "scope.camera" : {

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

@@ -259,3 +259,13 @@ export const checkAppUpdate = (data) => {
export const postUpdateLog = (data) => { export const postUpdateLog = (data) => {
return post(`/api/app/updateLog`, 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 保持一致） // 服务器地址（与 request.js 保持一致）
const baseUrl = 'http://192.168.1.222:8080'; const baseUrl = 'https://wuyeapi.ckdzkj.com';
/** /**
* 图片上传 Hook * 图片上传 Hook

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

@@ -1,124 +1,240 @@
<template> <template>
<view class="page"> <view class="page">
<scroll-view scroll-y class="scroll"> <view class="status-bar" :style="{ height: statusBarHeight + 'px' }"></view>
<!-- 第一块信息卡片 --> <uni-nav-bar title="巡检详情" backgroundColor="transparent" :border="false" left-icon="left"
<view class="card"> @click-left="goBack" />
<view class="row-title"> <scroll-view scroll-y class="scroll">
<text>幸福苑小区1号楼1单元电梯间</text> <!-- 加载中 -->
<text class="status">已巡检</text> <view class="loading-wrap" v-if="loading">
</view> <uni-load-more status="loading" :content-text="{ contentdown: '上拉加载更多', contentrefresh: '加载中...', contentnomore: '没有更多了' }" />
<view class="text-item">巡检项目：设备巡检</view> </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>
<!-- 第二块巡检结果卡片 --> <template v-if="!loading && detail">
<view class="card"> <!-- 第一块：基本信息 -->
<view class="card-subtitle">巡检结果</view> <view class="card">
<view class="text-item">巡检人：李祥龙</view> <view class="row-title">
<view class="text-item">手机号码：13013001300</view> <text>{{ detail.locationName }}</text>
<view class="text-item">巡检时间：2026-10-25 08:10:10</view> <text class="status">{{ detail.status }}</text>
<view class="text-item">巡检结果：</view> </view>
<view class="result-desc"> <view class="text-item">巡检项目：{{ detail.inspectionType }}</view>
<text>1.设备正常，无任何异动和意向</text> <view class="text-item">巡检时间：{{ detail.taskTime }}</view>
<text>2.电力系统正常、无故障提示</text> <view class="text-item">巡检小区：{{ detail.villageName }}</view>
<text>3.设备使用正常，无异常提示</text> <view class="text-item">巡检路线：{{ detail.routeName }}</view>
</view> <view class="text-item">巡检点：{{ detail.pointNames }}</view>
<view class="text-item">巡检照片：</view> </view>
<!-- 图片区域 flex自动换行 -->
<view class="img-wrap"> <!-- 第二块：巡检结果 -->
<view <view class="card">
class="img-box" <view class="card-subtitle">巡检结果</view>
v-for="(img, idx) in imgList" <view class="text-item">巡检人：{{ detail.inspectorName }}</view>
:key="idx" <view class="text-item">手机号码：{{ detail.phoneNumber }}</view>
> <view class="text-item">巡检时间：{{ detail.inspectTime }}</view>
<image <view class="text-item">巡检结果：</view>
class="img" <view class="result-desc">
:src="img" <text v-for="(r, idx) in detail.results" :key="idx">{{ idx + 1 }}.{{ r }}</text>
mode="aspectFill" </view>
></image> <view class="text-item">巡检照片：</view>
</view> <view class="img-wrap">
</view> <view class="img-box" v-for="(img, idx) in detail.photos" :key="idx" @click="previewImage(img)">
</view> <image class="img" :src="img" mode="aspectFill"></image>
</scroll-view> </view>
</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> </template>
<script setup> <script setup>
import { ref } from 'vue' import { ref } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import { inspectionDetails } from '../api/apiSub.js'
// 图片列表，空图片占位，真实环境替换成接口图片地址 const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
const imgList = ref([ 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> </script>
<style scoped> <style scoped>
page { page {
background-color: #f7f8fa; background-color: #f7f8fa;
} }
.page {
padding: 24rpx; .status-bar {
} width: 100%;
.scroll { flex-shrink: 0;
height: 100vh; }
}
.card { .page {
background: #fff; height: 100vh;
border-radius: 20rpx; display: flex;
padding: 36rpx; flex-direction: column;
margin-bottom: 24rpx; }
}
.row-title { .scroll {
display: flex; flex: 1;
justify-content: space-between; padding: 24rpx;
font-size: 32rpx; box-sizing: border-box;
color: #222; }
margin-bottom: 24rpx;
} .card {
.status { background: #fff;
font-size: 24rpx; border-radius: 20rpx;
color: #555; padding: 36rpx;
} margin-bottom: 24rpx;
.card-subtitle { }
font-size: 32rpx;
font-weight: 500; .row-title {
color: #222; display: flex;
margin-bottom: 24rpx; justify-content: space-between;
} font-size: 32rpx;
.text-item { color: #222;
font-size: 28rpx; margin-bottom: 24rpx;
color: #333; }
line-height: 2;
} .status {
.result-desc { font-size: 24rpx;
font-size: 28rpx; color: #555;
color: #333; }
display: flex;
flex-direction: column; .card-subtitle {
line-height: 1.8; font-size: 32rpx;
margin: 12rpx 0; font-weight: 500;
} color: #222;
/* 图片容器 flex-wrap换行 */ margin-bottom: 24rpx;
.img-wrap { }
margin-top: 16rpx;
display: flex; .text-item {
flex-wrap: wrap; font-size: 28rpx;
gap: 16rpx; color: #333;
} line-height: 2;
.img-box { }
width: 140rpx;
height: 140rpx; .result-desc {
background-color: #d8d9db; font-size: 28rpx;
border-radius: 8rpx; color: #333;
} display: flex;
.img { flex-direction: column;
width: 100%; line-height: 1.8;
height: 100%; 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> </style>

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

@@ -1,6 +1,6 @@
<template> <template>
<view class="contentStyle"> <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" /> <uni-nav-bar title="巡检记录" backgroundColor="transparent" :border="false" left-icon="left" @click-left="goBack" />
<view class="content-wrap"> <view class="content-wrap">
<!-- 时间选择器 --> <!-- 时间选择器 -->
@@ -19,17 +19,22 @@
</view> </view>
<!-- 巡检列表 --> <!-- 巡检列表 -->
<scroll-view scroll-y class="scroll-view"> <scroll-view scroll-y class="scroll-view">
<view class="list-container" @click="goToInspectionDetail"> <view class="list-container" v-if="listData.length > 0">
<view class="card-item" v-for="(item, index) in listData" :key="index"> <view class="card-item" v-for="(item, index) in listData" :key="index" @click="goToInspectionDetail(item)">
<view class="card-head"> <view class="card-head">
<text class="address">{{ item.address }}</text> <text class="address">{{ item.locationName }}</text>
<text class="status">{{ item.status }}</text> <text class="status">{{ item.status }}</text>
</view> </view>
<view class="tag-label">{{ item.type }}</view> <view class="tag-label">{{ item.inspectionType }}</view>
<view class="text-row">巡检时间：{{ item.time }}</view> <view class="text-row">巡检时间：{{ item.executeDate }}</view>
<view class="text-row">巡检人：{{ item.inspector }}</view> <view class="text-row">巡检人：{{ item.inspectorName }}</view>
</view> </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> </scroll-view>
</view> </view>
@@ -37,51 +42,117 @@
</template> </template>
<script setup> <script setup>
import { import {ref} from 'vue'
ref import {onLoad,onReachBottom,onPullDownRefresh} from '@dcloudio/uni-app'
} from 'vue'; import {getInspectionList} from '../api/apiSub.js'
import moment from 'moment' // 新增
// ---------- 基础状态 ----------
const datetime = ref('') const datetime = ref('')
const showDate = ref('选择日期') const showDate = ref('选择日期')
const listData = ref([ const listData = ref([])
{ const statusBarHeight = ref(uni.getSystemInfoSync().statusBarHeight || 0)
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 handleChangeTime = (e) => { // ---------- 分页状态 ----------
if (e) { const pageNum = ref(1)
// e 格式为 YYYY-MM-DD，只取 MM-DD const pageSize = ref(10)
showDate.value = e.slice(5) const total = ref(0)
} else { const loading = ref(false)
showDate.value = '选择日期' 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 = () => { const goBack = () => {
uni.switchTab({ uni.switchTab({
url: '/pages/serviceIndex/serviceIndex' url: '/pages/serviceIndex/serviceIndex'
}) })
} }
// 跳转详情
const goToInspectionDetail = () =>{ // ---------- 跳转详情 ----------
const goToInspectionDetail = (item) => {
uni.navigateTo({ uni.navigateTo({
url: `/pageSubPack/inspection-revenue/inspection-details` url: `/pageSubPack/inspection-revenue/inspection-details?id=${item.id}`
}) })
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@@ -99,8 +170,8 @@
} }
.status-bar { .status-bar {
height: 46px;
width: 100%; width: 100%;
flex-shrink: 0;
} }
.timebox { .timebox {
@@ -214,4 +285,22 @@
color: #333; color: #333;
line-height: 2; 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> </style>

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

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

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

@@ -224,13 +224,13 @@
} else { } else {
uni.showToast({ uni.showToast({
title: '验证码发送失败', title: '验证码发送失败',
icon: 'error' icon: 'none'
}); });
} }
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err.msg || '网络异常', title: err.msg || '网络异常',
icon: 'error' icon: 'none'
}); });
}) })
@@ -309,14 +309,14 @@
} else { } else {
uni.showToast({ uni.showToast({
title: '注册失败', title: '注册失败',
icon: 'error' icon: 'none'
}); });
} }
}).catch((err) => { }).catch((err) => {
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: err.msg || '网络异常', 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 => { getHouseAuthSendSmsCode(params).then(res => {
if (res.code === 200) { if (res.code === 200) {
uni.showToast({ uni.showToast({
title: `发送成功！`, title: '发送成功',
icon: 'error' icon: 'success'
}); });
} else { } else {
uni.showToast({ uni.showToast({
title: `${res.msg}`, title: res.msg,
icon: 'error' icon: 'error'
}); });
} }
@@ -739,7 +739,6 @@
uni.showToast({ uni.showToast({
title: err.msg || '提交失败', title: err.msg || '提交失败',
icon: 'none', icon: 'none',
duration: 2500
}) })
} }
} }
@@ -758,16 +757,16 @@
}, 1500); }, 1500);
} else { } else {
uni.showToast({ uni.showToast({
title: `${res.msg}`, title: res.msg,
icon: 'error' icon: 'none'
}); });
} }
}).catch(err => { }).catch(err => {
console.log(err); console.log(err);
uni.showToast({ uni.showToast({
title: `${err}`, title: err.msg,
icon: 'error' icon: 'none'
}); });
}) })
} }

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

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

16
property-uniapp-project/pages.json
View File

@@ -1,5 +1,13 @@
{ {
"pages": [{ "pages": [{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页",
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#F8F8F8"
}
},
{
"path": "pages/navigation/navigation", "path": "pages/navigation/navigation",
"style": { "style": {
"navigationBarTitleText": "引导页", "navigationBarTitleText": "引导页",
@@ -8,14 +16,6 @@
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页",
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#F8F8F8"
}
},
{ {
"path": "pages/serviceIndex/serviceIndex", "path": "pages/serviceIndex/serviceIndex",
"style": { "style": {

1245
property-uniapp-project/pages/index/index.vue
View File

File diff suppressed because it is too large Load Diff

16
property-uniapp-project/pages/navigation/navigation.vue
View File

@@ -1,5 +1,5 @@
<template> <template>
<view class="guide-page"> <view class="guide-page" v-if="showContent">
<view class="status-bar"></view> <view class="status-bar"></view>
<!-- 引导内容滑动容器 --> <!-- 引导内容滑动容器 -->
<swiper <swiper
@@ -73,12 +73,26 @@
<script setup> <script setup>
import { ref } from 'vue'; import { ref } from 'vue';
// 守卫：已登录或已看过引导页的用户不展示引导页，直接跳转
const hasShowGuide = uni.getStorageSync('hasShowGuide')
const tokenSave = uni.getStorageSync('token')
if (hasShowGuide || tokenSave) {
if (tokenSave) {
uni.reLaunch({ url: '/pages/index/index' })
} else if (hasShowGuide) {
uni.reLaunch({ url: '/pageSubPack/loginSub/pwd-login' })
}
}
// ========== 响应式数据 ========== // ========== 响应式数据 ==========
// 当前引导步骤（0/1/2） // 当前引导步骤（0/1/2）
const currentStep = ref(0); const currentStep = ref(0);
const mode = ref("default") const mode = ref("default")
// 防重复跳转锁 // 防重复跳转锁
const isNavigating = ref(false) const isNavigating = ref(false)
// 控制是否展示引导内容（已登录用户不展示，避免闪烁）
const showContent = ref(!hasShowGuide && !tokenSave)
// ========== 方法 ========== // ========== 方法 ==========
// 滑动swiper切换步骤 // 滑动swiper切换步骤

32
property-uniapp-project/pages/serviceIndex/serviceIndex.vue
View File

@@ -8,7 +8,7 @@
<view class="container"> <view class="container">
<!-- 顶部 Banner 轮播 --> <!-- 顶部 Banner 轮播 -->
<view class="banner-box" style="overflow-y: hidden;"> <view class="banner-box" style="overflow-y: hidden;">
<image class="banner-img" src="http://47.104.199.163:9090/images/propertyImgs/serviceImg2.png" @tap="bannnerClick"/> <image class="banner-img" src="https://wuye.ckdzkj.com/images/propertyImgs/serviceImg2.png" @tap="bannnerClick"/>
</view> </view>
<!-- 常用功能区 --> <!-- 常用功能区 -->
@@ -60,78 +60,78 @@
const commonFuncList = ref([{ const commonFuncList = ref([{
name: "一键开门", name: "一键开门",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-door.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-door.png",
path: "/pageSubPack/notice-list/oneClickOpen" path: "/pageSubPack/notice-list/oneClickOpen"
}, },
{ {
name: "生活缴费", name: "生活缴费",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-pay.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-pay.png",
path: "/pageSubPack/payment-list/paymentIndex" path: "/pageSubPack/payment-list/paymentIndex"
}, },
{ {
name: "在线报修", name: "在线报修",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-repair.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-repair.png",
path: "/pageSubPack/online-repair/onlineRepair" path: "/pageSubPack/online-repair/onlineRepair"
}, },
{ {
name: "访客邀请", name: "访客邀请",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-visitor.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-visitor.png",
path: "/pageSubPack/visitor/visitor-list" path: "/pageSubPack/visitor/visitor-list"
} }
]) ])
const communityFuncList = ref([{ const communityFuncList = ref([{
name: "一键开门", name: "一键开门",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-door.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-door.png",
path: "/pageSubPack/notice-list/oneClickOpen" path: "/pageSubPack/notice-list/oneClickOpen"
}, },
{ {
name: "生活缴费", name: "生活缴费",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-pay.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-pay.png",
path: "/pageSubPack/payment-list/paymentIndex" path: "/pageSubPack/payment-list/paymentIndex"
}, },
{ {
name: "在线报修", name: "在线报修",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-repair.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-repair.png",
path: "/pageSubPack/online-repair/onlineRepair" path: "/pageSubPack/online-repair/onlineRepair"
}, },
{ {
name: "访客邀请", name: "访客邀请",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-visitor.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-visitor.png",
path: "/pageSubPack/visitor/visitor-list" path: "/pageSubPack/visitor/visitor-list"
}, },
{ {
name: "投诉意见", name: "投诉意见",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-complaint.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-complaint.png",
path: "/pageSubPack/service-list/complaintsSuggestionsIndex" path: "/pageSubPack/service-list/complaintsSuggestionsIndex"
}, },
{ {
name: "问卷调查", name: "问卷调查",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-survey.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-survey.png",
path: "/pageSubPack/service-list/questionnaireSurveyIndex" path: "/pageSubPack/service-list/questionnaireSurveyIndex"
}, },
{ {
name: "社区活动", name: "社区活动",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-activity.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-activity.png",
path: "/pageSubPack/activity-list/activityList" path: "/pageSubPack/activity-list/activityList"
}, },
{ {
name: "公告公示", name: "公告公示",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-notice.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-notice.png",
path: "/pageSubPack/notice-list/noticeList" path: "/pageSubPack/notice-list/noticeList"
}, },
{ {
name: "联系物业", name: "联系物业",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-contact.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-contact.png",
path: "/pageSubPack/service-list/contactProperty" path: "/pageSubPack/service-list/contactProperty"
}, },
{ {
name: "巡检记录", name: "巡检记录",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-contact.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-inspection.png",
path: "/pageSubPack/inspection-revenue/inspection" path: "/pageSubPack/inspection-revenue/inspection"
}, },
{ {
name: "公区收益", name: "公区收益",
icon: "http://47.104.199.163:9090/images/propertyImgs/icon-contact.png", icon: "https://wuye.ckdzkj.com/images/propertyImgs/icon-revenue.png",
path: "/pageSubPack/inspection-revenue/public-revenue" path: "/pageSubPack/inspection-revenue/public-revenue"
} }
]) ])