diff --git a/property-uniapp-project/pageSubPack/activity-list/activityList.vue b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
index c4b716f..de55109 100644
--- a/property-uniapp-project/pageSubPack/activity-list/activityList.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
@@ -5,7 +5,7 @@
-
+
diff --git a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
index 3607e0c..b6eb2c0 100644
--- a/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityListDetails.vue
@@ -107,7 +107,7 @@
+
+
+ 加载中...
+ 没有更多通知了
+
+
+ 暂无数据
+
@@ -174,4 +182,25 @@ page {
justify-content: space-between;
align-items: center;
}
+.load-more, .no-more {
+ text-align: center;
+ padding: 20rpx;
+ color: #999;
+ font-size: 24rpx;
+}
+.empty-state {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 100rpx 0;
+ color: #ccc;
+}
+
+.empty-text {
+ font-size: 28rpx;
+ color: #999;
+ margin-top: 20rpx;
+ margin-bottom: 10rpx;
+}
diff --git a/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue b/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue
index 90dd5ac..c69ae2f 100644
--- a/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/forget-pwd.vue
@@ -3,7 +3,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
-
+
@@ -19,7 +19,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
@@ -44,7 +44,7 @@
-
+
diff --git a/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue b/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
index e5528df..49d7b86 100644
--- a/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
+++ b/property-uniapp-project/pageSubPack/loginSub/register-new-user.vue
@@ -8,7 +8,7 @@
-
-
+
-
-
-
+
暂无数据
diff --git a/property-uniapp-project/pageSubPack/my/myParkingSpaceIndex.vue b/property-uniapp-project/pageSubPack/my/myParkingSpaceIndex.vue
index c6f7925..c5993d9 100644
--- a/property-uniapp-project/pageSubPack/my/myParkingSpaceIndex.vue
+++ b/property-uniapp-project/pageSubPack/my/myParkingSpaceIndex.vue
@@ -5,7 +5,7 @@
-->
-
+
暂无数据
diff --git a/property-uniapp-project/pageSubPack/my/myPointsMall.vue b/property-uniapp-project/pageSubPack/my/myPointsMall.vue
index 1f4dc4f..7a27a25 100644
--- a/property-uniapp-project/pageSubPack/my/myPointsMall.vue
+++ b/property-uniapp-project/pageSubPack/my/myPointsMall.vue
@@ -39,7 +39,7 @@
import { getPointsMallList, postPointsExchange } from '/pageSubPack/api/apiSub.js'
import PullRefreshScroll from '/components/pull-refresh-scroll/pull-refresh-scroll.vue'
- const defaultImg = 'https://wuyeadmin.bugtc.com/images/propertyImgs/points.png'
+ const defaultImg = 'https://wuye.ckdzkj.com/images/propertyImgs/points.png'
const list = ref([])
const pageNum = ref(1)
diff --git a/property-uniapp-project/pageSubPack/notice-list/oneClickOpen.vue b/property-uniapp-project/pageSubPack/notice-list/oneClickOpen.vue
index d4904bc..22a24b0 100644
--- a/property-uniapp-project/pageSubPack/notice-list/oneClickOpen.vue
+++ b/property-uniapp-project/pageSubPack/notice-list/oneClickOpen.vue
@@ -3,7 +3,7 @@
-
+
@@ -80,7 +80,7 @@ const getAccessControl = async () =>{
doorList.value = []
uni.showToast({
title:'门禁查询失败',
- icon:"error"
+ icon:"none"
})
}
diff --git a/property-uniapp-project/pageSubPack/notice-list/selectHome.vue b/property-uniapp-project/pageSubPack/notice-list/selectHome.vue
index 176804f..664b7d7 100644
--- a/property-uniapp-project/pageSubPack/notice-list/selectHome.vue
+++ b/property-uniapp-project/pageSubPack/notice-list/selectHome.vue
@@ -29,7 +29,7 @@
@tap="selectCommunity(item)"
>
@@ -19,7 +19,7 @@
:class="{ active: activeType === 'personal' }"
@click="personalClick"
>
-
+
@@ -168,7 +168,7 @@ const fetchRepairList = async (reset = false) => {
total.value = Number(res.total) || 0;
const mapped = list.map(item => {
const statusInfo = getStatusInfo(item.problemStatus);
- const images = item.problemImageUrl ? item.problemImageUrl.split(',').filter(Boolean) : [];
+ const images = item.problemImageUrl ? item.problemImageUrl.split(',').filter(Boolean).slice(0, 3) : [];
if (statusInfo) {
return { ...item, status: statusInfo.text, statusClass: statusInfo.class, imageList: images };
}
diff --git a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
index 704c53a..b57c0bf 100644
--- a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
@@ -64,7 +64,7 @@
-
+
diff --git a/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue b/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue
index 2ef6c7d..089eff6 100644
--- a/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue
@@ -47,7 +47,7 @@
-
+
diff --git a/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue b/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
index 19c2776..971e3ef 100644
--- a/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
@@ -23,7 +23,7 @@
报修信息
-
+
报修房屋
{{repairInfo.house}}
@@ -65,9 +65,9 @@
-
+
@@ -87,7 +87,8 @@ const repairInfo = ref({
phone: '',
orderDate:'',
time: '',
- images: []
+ images: [],
+ isPublic: false
})
// 步骤状态
@@ -118,7 +119,9 @@ const mapData = (data) => {
phone: data.phone || '',
orderDate: data.orderDate || '',
time: data.createTime || '',
- images
+ images,
+ // 公共报修不展示报修房屋
+ isPublic: data.projectTypeStr === '公共报修'
}
setStep(data.problemStatus)
// 三个步骤时间赋值
@@ -162,16 +165,17 @@ const previewImage = (url) => {
}
// 联系物业按钮点击事件
-// const contactProperty = () => {
-// uni.makePhoneCall({
-// phoneNumber: '物业电话' // 换成真实电话
-// })
-// }
+const contactProperty = () => {
+ uni.navigateTo({
+ url: '/pageSubPack/service-list/contactProperty'
+ })
+}
\ No newline at end of file
diff --git a/property-uniapp-project/pageSubPack/service-list/complaintsDetail.vue b/property-uniapp-project/pageSubPack/service-list/complaintsDetail.vue
index 10c0589..8a2fdfe 100644
--- a/property-uniapp-project/pageSubPack/service-list/complaintsDetail.vue
+++ b/property-uniapp-project/pageSubPack/service-list/complaintsDetail.vue
@@ -49,7 +49,7 @@
问题照片
-
diff --git a/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue b/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue
index e04701d..9a7d48a 100644
--- a/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue
+++ b/property-uniapp-project/pageSubPack/service-list/complaintsSuggestionsIndex.vue
@@ -31,7 +31,7 @@
-
+
@@ -74,10 +74,10 @@ const statusMap = {
}
// 接口数据映射为模板所需格式
const mapItem = (item) => {
- // 图片：单 URL 转数组
+ //列表默认只展示前三张
let imgList = []
if (item.problemImageUrl) {
- imgList = [item.problemImageUrl]
+ imgList = item.problemImageUrl.split(',').filter(url => url.trim()).slice(0, 3)
}
return {
id: item.id,
@@ -285,7 +285,7 @@ const addComplaintsSuggestions = () => {
display: flex;
flex-wrap: wrap;
gap: 20rpx;
- margin: 10rpx 0px 20rpx 0px;
+ margin: 10rpx 0px 40rpx 0px;
}
.img-item {
diff --git a/property-uniapp-project/pageSubPack/service-list/contactProperty.vue b/property-uniapp-project/pageSubPack/service-list/contactProperty.vue
index 005d423..612abd6 100644
--- a/property-uniapp-project/pageSubPack/service-list/contactProperty.vue
+++ b/property-uniapp-project/pageSubPack/service-list/contactProperty.vue
@@ -5,7 +5,7 @@
- {{ '暂无数据'}}
+ 暂无数据
@@ -80,7 +80,7 @@ import { getManagePhoneData } from '../api/apiSub.js'
if (res.code === 200 && res.data) {
const d = res.data
dataList.value = [{
- src: d.villageImageUrl || 'http://47.104.199.163:9090/images/propertyImgs/community1.png',
+ src: d.villageImageUrl || 'http://wuye.ckdzkj.com/images/propertyImgs/community1.png',
propertyName: d.villageName || '',
propertyAddress: d.address || '',
phoneList: d.managePhone ? [{ phoneNum: d.managePhone }] : []
@@ -152,6 +152,7 @@ import { getManagePhoneData } from '../api/apiSub.js'
height: 60px;
border-radius: 8rpx;
margin-right: 24rpx;
+ margin-top: 20rpx;
flex-shrink: 0;
}
@@ -173,7 +174,8 @@ import { getManagePhoneData } from '../api/apiSub.js'
.property-address {
font-size: 28rpx;
color: #666666;
- line-height: 24rpx;
+ line-height: 35rpx;
+
}
.phone-item {
diff --git a/property-uniapp-project/pageSubPack/visitor/visitor-add.vue b/property-uniapp-project/pageSubPack/visitor/visitor-add.vue
index f39d40d..9b09d7b 100644
--- a/property-uniapp-project/pageSubPack/visitor/visitor-add.vue
+++ b/property-uniapp-project/pageSubPack/visitor/visitor-add.vue
@@ -107,7 +107,7 @@
-
+
选择来访地址
@@ -121,13 +121,13 @@
-
+
{{ item }}
-
+
@@ -333,6 +333,16 @@ const pageFixed = ref(false);
return false;
}
+ // 离开时间与来访时间间隔不能少于30分钟
+ const diffMinutes = leaveMoment.diff(visitMoment, 'minutes');
+ if (diffMinutes < 30) {
+ uni.showToast({
+ title: '离开时间与来访时间间隔不能少于30分钟',
+ icon: 'none'
+ });
+ return false;
+ }
+
// 不能超过24小时
const diffHours = leaveMoment.diff(visitMoment, 'hours', true);
if (diffHours > 24) {
diff --git a/property-uniapp-project/pageSubPack/visitor/visitor-detail.vue b/property-uniapp-project/pageSubPack/visitor/visitor-detail.vue
index 4b498bd..c6035f8 100644
--- a/property-uniapp-project/pageSubPack/visitor/visitor-detail.vue
+++ b/property-uniapp-project/pageSubPack/visitor/visitor-detail.vue
@@ -46,7 +46,7 @@
- 预计来访时间盒预计离开时间间隔不能超过24小时
+ 预计来访时间和离开时间间隔不能超过24小时
车辆停留请勿超出有效期，需及时驶出小区
diff --git a/property-uniapp-project/pages.json b/property-uniapp-project/pages.json
index ebd56db..ac95236 100644
--- a/property-uniapp-project/pages.json
+++ b/property-uniapp-project/pages.json
@@ -6,6 +6,13 @@
"navigationBarTitleText": "",
"navigationStyle": "custom",
"enablePullDownRefresh": true
+ // "app-plus": {
+ // "pullToRefresh": {
+ // "support": true,
+ // "style": "circle",
+ // "offset": "70px"
+ // }
+ // }
}
},
{
@@ -470,8 +477,7 @@
}, {
"path": "addComplaints",
"style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
+ "navigationBarTitleText": "投诉建议"
}
}, {
"path": "questionnaireSurveyIndex",
diff --git a/property-uniapp-project/pages/index/index.vue b/property-uniapp-project/pages/index/index.vue
index e8be32b..d9b4e23 100644
--- a/property-uniapp-project/pages/index/index.vue
+++ b/property-uniapp-project/pages/index/index.vue
@@ -17,7 +17,7 @@