diff --git a/property-uniapp-project/manifest.json b/property-uniapp-project/manifest.json
index 1efa631..e867998 100644
--- a/property-uniapp-project/manifest.json
+++ b/property-uniapp-project/manifest.json
@@ -54,9 +54,16 @@
"setting" : {
"urlCheck" : false
},
+ "requiredPrivateInfos": [
+ "chooseLocation",
+ "getLocation"
+ ],
"permission": {
"scope.camera": {
"desc": "用于扫码"
+ },
+ "scope.userLocation": {
+ "desc": "你的位置信息将用于定位选择"
}
},
"usingComponents" : true
diff --git a/property-uniapp-project/pageSubPack/activity-list/activityList.vue b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
index c7c00ff..6b128a4 100644
--- a/property-uniapp-project/pageSubPack/activity-list/activityList.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/activityList.vue
@@ -526,11 +526,11 @@ watch(() => myFilter.value, () => {
}
.action-btn {
- padding: 0 40rpx;
- height: 60rpx;
- line-height: 60rpx;
- font-size: 24rpx;
- border-radius: 35rpx;
+ padding: 0px 26rpx;
+ height: 50rpx;
+ line-height: 50rpx;
+ font-size: 22rpx;
+ border-radius: 10rpx;
margin: 0;
}
diff --git a/property-uniapp-project/pageSubPack/activity-list/live-add.vue b/property-uniapp-project/pageSubPack/activity-list/live-add.vue
index af4206a..e122c1c 100644
--- a/property-uniapp-project/pageSubPack/activity-list/live-add.vue
+++ b/property-uniapp-project/pageSubPack/activity-list/live-add.vue
@@ -66,7 +66,7 @@ const currentLength = ref(0);
// 图片列表(本地临时路径)
const imgList = ref([]);
// 定位信息
-const location = ref('山东省日照市东港区学院路');
+const location = ref('');
// 经纬度
const longitude = ref('');
const latitude = ref('');
@@ -158,10 +158,10 @@ const submitStatus = async () => {
uni.showToast({ title: '请输入实况描述', icon: 'none' });
return;
}
- if (!activityId.value) {
- uni.showToast({ title: '活动ID缺失', icon: 'none' });
- return;
- }
+ // if (!activityId.value) {
+ // uni.showToast({ title: '活动ID缺失', icon: 'none' });
+ // return;
+ // }
uni.showLoading({ title: '提交中...', mask: true });
diff --git a/property-uniapp-project/pageSubPack/notice-list/oneClickOpen.vue b/property-uniapp-project/pageSubPack/notice-list/oneClickOpen.vue
index 4c3a246..a56dccd 100644
--- a/property-uniapp-project/pageSubPack/notice-list/oneClickOpen.vue
+++ b/property-uniapp-project/pageSubPack/notice-list/oneClickOpen.vue
@@ -107,10 +107,10 @@ const getAccessControl = async () =>{
})
}
- }catch{
+ }catch(err){
doorList.value = []
uni.showToast({
- title:res.msg,
+ title:err.msg || '查询失败',
icon:"error"
})
}
@@ -136,26 +136,19 @@ const getAccessOpenData = async () =>{
let params = {deviceId:selectedDoor.value}
const res = await getAccessOpen(params)
if(res.code === 200){
- if(res.data){
- uni.showToast({
- title:'开门成功',
- icon:"success"
- })
- }else{
- uni.showToast({
- title:'开门失败',
- icon:"error"
- })
- }
+ uni.showToast({
+ title:'开门成功',
+ icon:'success'
+ })
}else{
uni.showToast({
title:'开门失败',
icon:"error"
})
}
- }catch{
+ }catch(err){
uni.showToast({
- title: res.msg,
+ title: err.msg || '开门失败',
icon:"error"
})
}
diff --git a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
index c28413c..a3dca2d 100644
--- a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
@@ -40,7 +40,7 @@
预约时间
- {{ showTimeText }}
+ {{ showTimeText || '请选择预约时间' }}
@@ -142,7 +142,6 @@
-
+
\ No newline at end of file
diff --git a/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue b/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
index 5cdc103..dba7a8b 100644
--- a/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
@@ -13,9 +13,9 @@
- 2026-03-26 09:30:38
- 2026-03-26 09:30:38
- 2026-03-28 09:30:38
+ {{timeData.createTime}}
+ {{timeData.dispatchTime}}
+ {{timeData.finishTime}}
@@ -61,9 +61,9 @@
-
+
@@ -87,6 +87,13 @@ const repairInfo = ref({
// 步骤状态
const currentStep = ref(0)
+// 三个步骤对应的时间
+const timeData = ref({
+ createTime: '', // 待处理/提交时间
+ dispatchTime: '', // 已派单时间
+ finishTime: '' // 已完成时间
+})
+
const setStep = (status) => {
if (status === '0' || status === 0) currentStep.value = 0
@@ -108,6 +115,10 @@ const mapData = (data) => {
images
}
setStep(data.problemStatus)
+ // 三个步骤时间赋值
+ timeData.value.createTime = data.updateTime || ''
+ timeData.value.dispatchTime = data.updateTime || ''
+ timeData.value.finishTime = data.updateTime || ''
}
// 获取详情接口
@@ -145,11 +156,11 @@ const previewImage = (url) => {
}
// 联系物业按钮点击事件
-const contactProperty = () => {
- uni.makePhoneCall({
- phoneNumber: '物业电话' // 换成真实电话
- })
-}
+// const contactProperty = () => {
+// uni.makePhoneCall({
+// phoneNumber: '物业电话' // 换成真实电话
+// })
+// }