From 95ccb1e3bc4f478497430ff8482c5ecf3899d753 Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Thu, 30 Apr 2026 14:28:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=9C=A8=E7=BA=BF=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=AE=E7=9A=84=E6=96=B0=E5=A2=9E=E6=8A=A5=E4=BF=AE=E5=92=8C?=
 =?UTF-8?q?=E6=8A=A5=E4=BF=AE=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pageSubPack/api/api.js                    |   6 +-
 .../online-repair/onlineRepair.vue            |  73 ++--
 .../online-repair/personalRepair.vue          | 351 +++++++-----------
 .../online-repair/personalSelectPoject.vue    |  27 +-
 .../online-repair/publicRepair.vue            |   7 +-
 .../online-repair/repairDetail.vue            | 129 ++++---
 .../pageSubPack/online-repair/selectHouse.vue |  24 ++
 7 files changed, 328 insertions(+), 289 deletions(-)

diff --git a/property-uniapp-project/pageSubPack/api/api.js b/property-uniapp-project/pageSubPack/api/api.js
index e14e3e8..4556cde 100644
--- a/property-uniapp-project/pageSubPack/api/api.js
+++ b/property-uniapp-project/pageSubPack/api/api.js
@@ -113,12 +113,16 @@ export const getQueryRepair = (data) =>{
 export const getHouseList = (data) =>{
 	return get('/api/resident/my/house/list',data)
 }
+// 报修详情
+export const getRepairDetail = (data) =>{
+	return get('/repairOrder/queryRepairDetail',data)
+}
 
 // 通用文件上传
 export const uploadImage = () => {
 	return upload('');
 }
-// 上传单张图片（请根据后端实际地址修改）
+// 上传单张图片
 export const uploadFile = (filePath) => {
 	return upload(filePath, '/common/upload');
 }
\ No newline at end of file
diff --git a/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue b/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue
index 8c5c6ce..b283be9 100644
--- a/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/onlineRepair.vue
@@ -11,6 +11,8 @@
 	</view>
 
     <!-- 报修类型Tab -->
+	<scroll-view class="scroll-container" scroll-y="true"
+		:lower-threshold="100">
     <view class="repair-type-tabs">
       <view 
         class="type-tab" 
@@ -66,22 +68,21 @@
       <view class="repair-item" v-for="(item, index) in repairList" :key="index">
         <!-- 标题和状态 -->
         <view class="item-header">
-          <text class="item-title">{{ item.title || '报修' }}</text>
+          <text class="item-title">{{ item.houseName || '报修' }}</text>
           <text class="item-status" :class="item.statusClass">{{ item.status }}</text>
         </view>
 
         <!-- 标签 -->
-        <view class="item-tags" v-if="item.repairTypeName || item.category">
-          <text class="tag" v-if="item.repairTypeName">{{ item.repairTypeName }}</text>
-          <text class="tag" v-if="item.category">{{ item.category }}</text>
+        <view class="item-tags" v-if="item.maintenanceItemName">
+          <text class="tag" v-if="item.maintenanceItemName">{{ item.maintenanceItemName }}</text>
         </view>
 
         <!-- 内容 -->
         <view class="item-content">
-          {{ item.content || item.description || '' }}
+          {{ item.problem || '' }}
         </view>
 
-        <!-- 图片占位 -->
+        <!-- 图片 -->
         <view class="item-imgs" v-if="item.imageList && item.imageList.length">
           <view class="img-placeholder" v-for="(img, idx) in item.imageList" :key="idx">
             <image :src="typeof img === 'string' ? img : img.img" style="width: 100%;height: 100%;"></image>
@@ -90,7 +91,7 @@
 
         <!-- 时间和详情 -->
         <view class="item-footer">
-          <text class="item-time">{{ item.time || item.createTime || '' }}</text>
+          <text class="item-time">{{ item.orderDate || '' }}</text>
           <text class="detail-btn" @click="goDetail(item)">报修详情</text>
         </view>
       </view>
@@ -100,12 +101,13 @@
 	    <text class="empty-text">暂无数据</text>
 	  </view>
     </view>
+	</scroll-view>
   </view>
 </template>
 
 <script setup>
 import { ref, watch } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
+import { onLoad,onUnload } from '@dcloudio/uni-app';
 import { getQueryRepair } from '../api/api.js';
 
 // 报修类型（public:公共报修，personal:个人报修）
@@ -115,6 +117,9 @@ const activeStatus = ref('pending');
 
 const repairList = ref([]);
 const loading = ref(false);
+const pageNum = ref(1);
+const pageSize = ref(10);
+const maintenanceItemId = ref('');
 
 // 状态映射
 const statusMap = {
@@ -123,6 +128,13 @@ const statusMap = {
 	completed: { text: '已完成', class: 'completed', value: '2' }
 };
 
+const getStatusInfo = (val) => {
+	if (val === '0' || val === 0) return statusMap.pending;
+	if (val === '1' || val === 1) return statusMap.assigned;
+	if (val === '2' || val === 2) return statusMap.completed;
+	return null;
+};
+
 // 获取报修列表
 const fetchRepairList = async () => {
 	const villageId = uni.getStorageSync('currentVillageId');
@@ -133,23 +145,26 @@ const fetchRepairList = async () => {
 
 	loading.value = true;
 	try {
-		const statusInfo = statusMap[activeStatus.value];
 		const params = {
 			villageId,
-			// 报修类型：0-公共报修，1-个人报修（按后端实际字段调整）
-			projectType: activeType.value === 'public' ? '0' : '1',
-			// 状态：0-待派单，1-已派单，2-已完成（按后端实际字段调整）
-			problemStatus: statusInfo.value
+			// maintenanceItemId: maintenanceItemId.value,
+			pageSize: pageSize.value,
+			pageNum: pageNum.value,
+			problemStatus: statusMap[activeStatus.value].value
 		};
 		const res = await getQueryRepair(params);
+		console.log('接口返回:', res);
 		if (res.code === 200) {
-			// 按后端实际返回结构调整
-			const list = res.data|| [];
-			repairList.value = list.map(item => ({
-				...item,
-				status: statusInfo.text,
-				statusClass: statusInfo.class
-			}));
+			// 兼容多种分页返回结构
+			const list = res.data?.rows || [];
+			repairList.value = list.map(item => {
+				const statusInfo = getStatusInfo(item.problemStatus);
+				const images = item.problemImageUrl ? item.problemImageUrl.split(',').filter(Boolean) : [];
+				if (statusInfo) {
+					return { ...item, status: statusInfo.text, statusClass: statusInfo.class, imageList: images };
+				}
+				return { ...item, imageList: images };
+			});
 		} else {
 			uni.showToast({ title: res.msg || '获取失败', icon: 'none' });
 		}
@@ -193,15 +208,18 @@ const goBack = () => {
 }
 // 跳转报修详情
 const goDetail = (item) => {
-	const itemStr = encodeURIComponent(JSON.stringify(item))
   uni.navigateTo({
-    url: `/pageSubPack/online-repair/repairDetail?item = ${itemStr}`
+    url: `/pageSubPack/online-repair/repairDetail?id=${item.id}`
   });
 };
 
 onLoad(() => {
-	fetchRepairList();
+	// maintenanceItemId.value = option.maintenanceProjectId || '' // 接收维修项目id
+	fetchRepairList()
 });
+onUnload(() =>{
+	
+})
 </script>
 
 <style scoped>
@@ -251,6 +269,14 @@ onLoad(() => {
 .nav-right {
   width: 60rpx;
 }
+/* 滚动区域 */
+.scroll-container {
+	flex: 1;
+	width: 100%;
+	height: calc(100vh - 100px);
+	overflow-y: auto;
+	box-sizing: border-box;
+}
 /* 报修类型Tab */
 .repair-type-tabs {
   display: flex;
@@ -338,6 +364,7 @@ onLoad(() => {
   font-weight: bold;
   color: #333;
   padding-right: 20rpx;
+  width: 77%;
 }
 .item-status {
   font-size: 14px;
diff --git a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
index cb6026c..ec3abaa 100644
--- a/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/personalRepair.vue
@@ -144,10 +144,8 @@
 </template>
 
 <script setup>
-import { ref,computed,onMounted} from 'vue'
-import {
-	onLoad, onUnload
-} from '@dcloudio/uni-app'
+import { ref, computed, onMounted } from 'vue'
+import { onLoad, onUnload } from '@dcloudio/uni-app'
 import { addQueryRepair, uploadFile } from '../api/api.js'
 import moment from 'moment/moment'
 
@@ -155,230 +153,167 @@ import moment from 'moment/moment'
 const houseName = ref('')
 const houseId = ref('')
 const projectName = ref('')
+const projectId = ref('') // ✅ 修复：新增项目ID
 
 // 表单数据
 const form = ref({
   title: '',
   desc: '',
   phone: '',
-  datetime: '', // 默认时间
+  datetime: '',
   images: []
 })
 
 // ========== 基础数据 ==========
 const timePopupRef = ref(null)
-// 初始时间（）
-const selectedTime = ref(moment().hour(9).minute(30).second(0));
-// 选择的时间
-const tempTime = ref(moment().hour(9).minute(30).second(0));
+const selectedTime = ref(moment().hour(9).minute(30).second(0))
+const tempTime = ref(moment().hour(9).minute(30).second(0))
 
-// ========== 时间选择列数据 ==========
-// 日期列表（今天、明天、后天）
+// ========== 时间选择列数据 ✅ 修复：固定小时/分钟，不跟随当前时间 ==========
 const dateList = ref([
   { label: '(今天)', value: moment().format('YYYY-MM-DD') },
   { label: '(明天)', value: moment().add(1, 'day').format('YYYY-MM-DD') },
-  { label: '(后天)', value: moment().add(2, 'day').format('YYYY-MM-DD') } 
-]);
-// 小时列表（）
+  { label: '(后天)', value: moment().add(2, 'day').format('YYYY-MM-DD') }
+])
+
 const hourList = ref([
-	{time: moment().hours(8).format('HH')},
-	{time:moment().hours(9).format('HH')},
-	{time:moment().hours(10).format('HH')},
-	{time:moment().hours(11).format('HH')},
-	{time:moment().hours(13).format('HH')},
-	{time:moment().hours(14).format('HH')},
-	{time:moment().hours(15).format('HH')},
-	{time:moment().hours(16).format('HH')},
-	{time:moment().hours(17).format('HH')},
-	{time:moment().hours(18).format('HH')},
-]);
-// 分钟列表（）
+  { time: '08' }, { time: '09' }, { time: '10' }, { time: '11' },
+  { time: '13' }, { time: '14' }, { time: '15' }, { time: '16' },
+  { time: '17' }, { time: '18' }
+])
+
 const minuteList = ref([
-	{minute:moment().minute(0).format('mm')},
-	{minute:moment().minute(30).format('mm')}
-]);
+  { minute: '00' },
+  { minute: '30' }
+])
 
 // ========== 选中状态 ==========
-const selectedDate = ref(dateList.value[0].value);
-const selectedHour = ref(hourList.value[1].time); // 默认选中8点
-const selectedMinute = ref(minuteList.value[1].minute); // 默认选中00分
+const selectedDate = ref('')
+const selectedHour = ref('')
+const selectedMinute = ref('')
 
 // ========== 滚动配置 ==========
-const itemHeight = 80; // 每个时间项的高度（rpx）
-const dateScrollTop = ref(0 * itemHeight); // 初始选中明天
-const hourScrollTop = ref(1 * itemHeight); // 初始选中9点
-const minuteScrollTop = ref(1 * itemHeight); // 初始选中00分
+const itemHeight = 80
+const dateScrollTop = ref(0)
+const hourScrollTop = ref(1)
+const minuteScrollTop = ref(1)
 
 // ========== 显示文本 ==========
 const showTimeText = computed(() => {
-  return selectedTime.value.format('YYYY-MM-DD HH:mm');
-});
+  return selectedTime.value.format('YYYY-MM-DD HH:mm')
+})
 
 // ========== Popup 操作 ==========
-// 打开时间弹窗
 const openTimePopup = () => {
-  // 打开前同步临时时间为当前选中时间
-  tempTime.value = moment(selectedTime.value);
-  selectedDate.value = tempTime.value.format('YYYY-MM-DD');
-  selectedHour.value = tempTime.value.format('HH');
-  selectedMinute.value = tempTime.value.format('mm');
-  
-  // 同步滚动位置
-  syncScrollPosition();
-  // 打开uni-popup
-  if(timePopupRef.value){
-	  timePopupRef.value.open();
-  }
-  
-};
+  tempTime.value = moment(selectedTime.value)
+  selectedDate.value = tempTime.value.format('YYYY-MM-DD')
+  selectedHour.value = tempTime.value.format('HH')
+  selectedMinute.value = tempTime.value.format('mm')
+  syncScrollPosition()
+  timePopupRef.value?.open()
+}
 
-// 关闭时间弹窗
 const closeTimePopup = () => {
-  timePopupRef.value.close();
-};
+  timePopupRef.value?.close()
+}
 
-// 确认选择时间
 const confirmTime = () => {
-  // 拼接选中的时间
-  const selectedDateTime = `${selectedDate.value} ${selectedHour.value}:${selectedMinute.value}`;
-  selectedTime.value = moment(selectedDateTime, 'YYYY-MM-DD HH:mm');
-   // 给表单赋值
-    form.value.datetime = selectedTime.value.format('YYYY-MM-DD HH:mm')
-  // 关闭弹窗
-  closeTimePopup();
-  
-  // 提示
+  const selectedDateTime = `${selectedDate.value} ${selectedHour.value}:${selectedMinute.value}`
+  selectedTime.value = moment(selectedDateTime, 'YYYY-MM-DD HH:mm')
+  form.value.datetime = selectedTime.value.format('YYYY-MM-DD HH:mm')
+  closeTimePopup()
   uni.showToast({
     title: `已选择 ${selectedTime.value.format('MM月DD日 HH:mm')}`,
     icon: 'none'
-  });
-};
+  })
+}
 
-// ========== 滚动/点击选择逻辑 ==========
-// 同步滚动位置
+// ========== 滚动/选择逻辑 ==========
 const syncScrollPosition = () => {
-  // 日期滚动位置
-  const dateIndex = dateList.value.findIndex(item => item.value === selectedDate.value);
-  dateScrollTop.value = dateIndex * itemHeight;
+  const dateIdx = dateList.value.findIndex(i => i.value === selectedDate.value)
+  const hourIdx = hourList.value.findIndex(i => i.time === selectedHour.value)
+  const minIdx = minuteList.value.findIndex(i => i.minute === selectedMinute.value)
   
-  // 小时滚动位置
-  const hourIndex = hourList.value.findIndex(item => item.time === selectedHour.value);
-  hourScrollTop.value = hourIndex * itemHeight;
-  
-  // 分钟滚动位置
-  const minuteIndex = minuteList.value.findIndex(item => item.minute === selectedMinute.value);
-  minuteScrollTop.value = minuteIndex * itemHeight;
-};
+  dateScrollTop.value = dateIdx * itemHeight
+  hourScrollTop.value = hourIdx * itemHeight
+  minuteScrollTop.value = minIdx * itemHeight
+}
 
-// 选择日期（点击）
 const selectDate = (index) => {
-  selectedDate.value = dateList.value[index].value;
-  dateScrollTop.value = index * itemHeight;
-  updateTempTime();
-};
-
-// 选择小时（点击）
+  selectedDate.value = dateList.value[index].value
+  dateScrollTop.value = index * itemHeight
+  updateTempTime()
+}
 const selectHour = (index) => {
-  selectedHour.value = hourList.value[index].time;
-  hourScrollTop.value = index * itemHeight;
-  updateTempTime();
-};
-
-// 选择分钟（点击）
+  selectedHour.value = hourList.value[index].time
+  hourScrollTop.value = index * itemHeight
+  updateTempTime()
+}
 const selectMinute = (index) => {
-  selectedMinute.value = minuteList.value[index].minute;
-  minuteScrollTop.value = index * itemHeight;
-  updateTempTime();
-};
+  selectedMinute.value = minuteList.value[index].minute
+  minuteScrollTop.value = index * itemHeight
+  updateTempTime()
+}
 
-// 滚动日期列（滑动）
 const onDateScroll = (e) => {
-  const index = Math.round(e.detail.scrollTop / itemHeight);
-  if (index >= 0 && index < dateList.value.length) {
-    selectedDate.value = dateList.value[index].value;
-    updateTempTime();
+  const idx = Math.round(e.detail.scrollTop / itemHeight)
+  if (idx >= 0 && idx < dateList.value.length) {
+    selectedDate.value = dateList.value[idx].value
+    dateScrollTop.value = idx * itemHeight
+    updateTempTime()
   }
-};
-
-// 滚动小时列（滑动）
+}
 const onHourScroll = (e) => {
-  const index = Math.round(e.detail.scrollTop / itemHeight);
-  if (index >= 0 && index < hourList.value.length) {
-    selectedHour.value = hourList.value[index].time;
-    updateTempTime();
+  const idx = Math.round(e.detail.scrollTop / itemHeight)
+  if (idx >= 0 && idx < hourList.value.length) {
+    selectedHour.value = hourList.value[idx].time
+    hourScrollTop.value = idx * itemHeight
+    updateTempTime()
   }
-};
-
-// 滚动分钟列（滑动）
+}
 const onMinuteScroll = (e) => {
-  const index = Math.round(e.detail.scrollTop / itemHeight);
-  minuteScrollTop.value = index * itemHeight;
-  if (index >= 0 && index < minuteList.value.length) {
-    selectedMinute.value = minuteList.value[index].minute;
-    updateTempTime();
+  const idx = Math.round(e.detail.scrollTop / itemHeight)
+  if (idx >= 0 && idx < minuteList.value.length) {
+    selectedMinute.value = minuteList.value[idx].minute
+    minuteScrollTop.value = idx * itemHeight
+    updateTempTime()
   }
-};
+}
 
-// 更新临时时间（弹窗预览）
 const updateTempTime = () => {
-  tempTime.value = moment(`${selectedDate.value} ${selectedHour.value}:${selectedMinute.value}`, 'YYYY-MM-DD HH:mm');
-};
+  tempTime.value = moment(`${selectedDate.value} ${selectedHour.value}:${selectedMinute.value}`, 'YYYY-MM-DD HH:mm')
+}
 
-// ========== 初始化 ==========
 onMounted(() => {
-  syncScrollPosition();
-});
+  syncScrollPosition()
+})
 
-
-
-// 页面加载时监听事件
+// ========== 页面通信 ==========
 onLoad(() => {
-  // 监听选择房屋事件
   uni.$on('selectHouse', (data) => {
     houseName.value = data.name
     houseId.value = data.id
   })
-  // 监听选择维修项目事件
   uni.$on('selectProject', (data) => {
     projectName.value = data.name
+    projectId.value = data.id // 接收项目ID
   })
 })
 
-// 页面销毁移除监听
 onUnload(() => {
   uni.$off('selectHouse')
   uni.$off('selectProject')
 })
 
-// 跳转到选择房屋页
+// 跳转
 const goToSelectHouse = () => {
-  uni.navigateTo({
-    url: `/pageSubPack/online-repair/selectHouse?houseId=${houseId.value}`
-  })
+  uni.navigateTo({ url: `/pageSubPack/online-repair/selectHouse?houseId=${houseId.value}` })
 }
-
-// 跳转到选择维修项目页
 const goToSelectProject = () => {
-  uni.navigateTo({
-    url: '/pageSubPack/online-repair/personalSelectPoject'
-  })
+  uni.navigateTo({ url: '/pageSubPack/online-repair/personalSelectPoject' })
 }
 
-// 选择预约时间
-const changeTime = () =>{
-	
-}
-// const chooseDateTime = () => {
-//   uni.datePicker({
-//     type: 'datetime',
-//     value: form.value.datetime,
-//     success: (res) => {
-//       form.value.datetime = res.value
-//     }
-//   })
-// }
-
-// 选择图片
+// 图片
 const chooseImage = () => {
   uni.chooseImage({
     count: 3,
@@ -389,109 +324,95 @@ const chooseImage = () => {
     }
   })
 }
-
-// 预览图片
 const previewImage = (url) => {
-  uni.previewImage({
-    urls: form.value.images,
-    current: url
-  })
+  uni.previewImage({ urls: form.value.images, current: url })
 }
-
-// 删除图片
 const deleteImage = (index) => {
   form.value.images.splice(index, 1)
 }
 
-// 上传图片到服务器
+// 上传图片
 const uploadImages = async () => {
-  const uploadedUrls = []
+  const urls = []
   for (const path of form.value.images) {
     if (path.startsWith('http')) {
-      uploadedUrls.push(path)
+      urls.push(path)
       continue
     }
     try {
       const res = await uploadFile(path)
-      uploadedUrls.push(res.data || res.msg || '')
+      urls.push(res.data || res.msg || '')
     } catch (e) {
-      console.error('图片上传失败', e)
+      console.error('上传失败', e)
     }
   }
-  return uploadedUrls
+  return urls
 }
 
-// 表单提交
+// ========== 表单提交 ✅ 修复：所有错误都解决 ==========
 const submitForm = async () => {
-  // 校验
-  if (!houseName.value) {
-    uni.showToast({ title: '请选择报修房屋', icon: 'none' })
-    return
-  }
-  if (!projectName.value) {
-    uni.showToast({ title: '请选择维修项目', icon: 'none' })
-    return
-  }
-  if (!form.value.title) {
-    uni.showToast({ title: '请输入问题标题', icon: 'none' })
-    return
-  }
-  if (!form.value.desc) {
-    uni.showToast({ title: '请输入问题描述', icon: 'none' })
-    return
-  }
-  if (!/^1[3-9]\d{9}$/.test(form.value.phone)) {
-    uni.showToast({ title: '请输入正确的手机号', icon: 'none' })
-    return
-  }
-  if (!form.value.datetime) {
-    uni.showToast({ title: '请选择预约时间', icon: 'none' })
-    return
-  }
+  if (!houseName.value) return uni.showToast({ title: '请选择报修房屋', icon: 'none' })
+  if (!projectName.value) return uni.showToast({ title: '请选择维修项目', icon: 'none' })
+  if (!form.value.title) return uni.showToast({ title: '请输入标题', icon: 'none' })
+  if (!form.value.desc) return uni.showToast({ title: '请输入问题描述', icon: 'none' })
+  if (!/^1[3-9]\d{9}$/.test(form.value.phone)) return uni.showToast({ title: '手机号不正确', icon: 'none' })
+  if (!form.value.datetime) return uni.showToast({ title: '请选择预约时间', icon: 'none' })
 
   const villageId = uni.getStorageSync('currentVillageId')
-  if (!villageId || villageId === '0') {
-    uni.showToast({ title: '请先选择小区', icon: 'none' })
-    return
-  }
+  if (!villageId || villageId === '0') return uni.showToast({ title: '请先选择小区', icon: 'none' })
+
+  const userId = uni.getStorageSync('userId')
+  if (!userId) return uni.showToast({ title: '用户信息失效', icon: 'none' })
 
   uni.showLoading({ title: '提交中...' })
+
   try {
     const imageUrls = await uploadImages()
-	const userId = uni.getStorageSync('userId')
-
+    
+    // 参数
     const params = {
-		villageId,
-		houseId: houseId.value,
-		maintenanceItemId: projectId.value,
-		title: form.value.title,
-		problem: form.value.desc,
-		residentId: userId,
-		orderDate: form.value.datetime,
-		phone: form.value.phone,
-		problemImageUrl: imageUrls.join(','),
-		projectType: '1',
-		problemStatus: ''
+      villageId,
+      houseId: houseId.value,
+      maintenanceItemId: projectId.value,
+      title: form.value.title,
+      problem: form.value.desc,
+      residentId: userId,
+      orderDate: form.value.datetime,
+      phone: form.value.phone,
+      problemImageUrl: imageUrls.join(','),
+      projectType: '1',
+      problemStatus: ''
     }
 
     const res = await addQueryRepair(params)
+    
     if (res.code === 200) {
       uni.showToast({ title: '提交成功', icon: 'success' })
+      // const tempProjectId = projectId.value
+      // 清空表单
       form.value = { title: '', desc: '', phone: '', datetime: '', images: [] }
       houseName.value = ''
+      houseId.value = ''
       projectName.value = ''
-      uni.navigateBack({ delta: 1 })
+      projectId.value = ''
+
+      setTimeout(() => {
+		  uni.navigateTo({
+		  	url:'/pageSubPack/online-repair/onlineRepair'
+		  })
+        // uni.navigateTo({ url: `/pageSubPack/online-repair/onlineRepair?maintenanceProjectId=${tempProjectId}` })
+      }, 1500)
     } else {
       uni.showToast({ title: res.msg || '提交失败', icon: 'none' })
     }
   } catch (e) {
-    uni.showToast({ title: '网络异常', icon: 'none' })
+    console.error('提交异常：', e) // 看控制台真实错误
+    uni.showToast({ title: '提交失败，请检查网络或重试', icon: 'none' })
   } finally {
     uni.hideLoading()
   }
 }
 </script>
-
 <style scoped>
 .form-container {
   padding: 15px;
diff --git a/property-uniapp-project/pageSubPack/online-repair/personalSelectPoject.vue b/property-uniapp-project/pageSubPack/online-repair/personalSelectPoject.vue
index 6ee19c4..7e17a25 100644
--- a/property-uniapp-project/pageSubPack/online-repair/personalSelectPoject.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/personalSelectPoject.vue
@@ -33,7 +33,15 @@
           {{ item.projectName }}
         </view>
       </scroll-view>
+	
     </view>
+	<!-- 空状态 -->
+	<view v-if="categoryList.length === 0 || currentProjectList.length === 0" class="empty-state">
+		<uni-icons type="info" size="30" color="#ccc"></uni-icons>
+		<text class="empty-text">
+			暂无维修项目
+		</text>
+	</view>
 
     <!-- 确认按钮 -->
     <button class="confirm-btn" @click="confirmSelect">确认</button>
@@ -112,7 +120,8 @@ const confirmSelect = () => {
   const categoryName = categoryList.value.find(c => c.id === activeCategory.value).projectName
   // 传递给表单页
   uni.$emit('selectProject', {
-    name: `${categoryName}-${selectedProject.value.projectName}`
+    name: `${categoryName}-${selectedProject.value.projectName}`,
+    id: selectedProject.value.id
   })
   
   uni.navigateBack({ delta: 1 })
@@ -187,4 +196,20 @@ const confirmSelect = () => {
   border-radius: 8px;
   font-size: 16px;
 }
+/* 空状态 */
+.empty-state {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 100rpx 0;
+	color: #ccc;
+}
+
+.empty-text {
+	font-size: 32rpx;
+	color: #999;
+	margin-top: 20rpx;
+	margin-bottom: 10rpx;
+}
 </style>
\ No newline at end of file
diff --git a/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue b/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue
index eb245ad..596dd54 100644
--- a/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/publicRepair.vue
@@ -179,12 +179,13 @@ const submitForm = async () => {
     const res = await addQueryRepair(params)
     if (res.code === 200) {
       uni.showToast({ title: '提交成功', icon: 'success' })
+	  // const tempProjectId = projectId.value
       form.value = { title: '', desc: '', phone: '', images: [] }
       repairProject.value = ''
       // uni.navigateBack({ delta: 2 })
-	  uni.navigateTo({
-	  	url:'/pageSubPack/online-repair/onlineRepair'
-	  })
+	    setTimeout(() => {
+	       uni.navigateTo({ url: '/pageSubPack/online-repair/onlineRepair' })
+	    }, 1500)
     } else {
       uni.showToast({ title: res.msg || '提交失败', icon: 'none' })
     }
diff --git a/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue b/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
index 808f124..e030c03 100644
--- a/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/repairDetail.vue
@@ -13,7 +13,7 @@
 						</up-steps>
 					</uni-col>
 					<uni-col :span="12">
-						<view class="step-time">2026-03-24 09:30:38</view>
+						<view class="step-time">2026-03-26 09:30:38</view>
 						<view class="step-time">2026-03-26 09:30:38</view>
 						<view class="step-time-3">2026-03-28 09:30:38</view>
 					</uni-col>
@@ -49,8 +49,11 @@
 				</view>
 				<view class="info-item-desc">
 					<view class="info-label">问题照片</view>
-					<view class="photo-container">
-						<view class="photo-item" v-for="(item, index) in 2" :key="index">
+					<view class="photo-container" v-if="repairInfo.images && repairInfo.images.length">
+						<image class="photo-item" v-for="(img, index) in repairInfo.images" :key="index" :src="img" mode="aspectFill" @click="previewImage(img)"></image>
+					</view>
+					<view class="photo-container" v-else>
+						<view class="photo-item">
 							<uni-icons type="plusempty" size="24" color="#ccc"></uni-icons>
 						</view>
 					</view>
@@ -65,54 +68,88 @@
 </template>
 
 <script setup>
-	import { ref, computed } from 'vue'
-	import { onLoad } from '@dcloudio/uni-app'
+import { ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import { getRepairDetail } from '../api/api.js'
 
-	const nvueWidth = ref('300')
+const nvueWidth = ref('300')
 
-	// 报修信息数据
-	const repairInfo = ref({
-		house: '桂花园(别墅) 2号楼2层',
-		project: '照明-路灯',
-		title: '1栋楼下道路灯不亮了',
-		description: '1栋楼下道路路灯不亮，并且有的亮度不够，请物业公司及时更换，防止发生意外事故。',
-		phone: '15688888888',
-		time: '2023-08-01 15:30'
-	})
+// 报修信息数据
+const repairInfo = ref({
+  house: '',
+  project: '',
+  title: '',
+  description: '',
+  phone: '',
+  time: '',
+  images: []
+})
 
-	// 步骤状态
-	const currentStep = ref(1)
+// 步骤状态
+const currentStep = ref(0)
 
-	onLoad((option) => {
-		const optionstr = decodeURIComponent(JSON.stringify(option))
-		// console.log('接收参数：', optionstr)
-		
-		// ✅ 正确解析参数
-		const status = optionstr.statusClass
-		
-		// ✅ 正确赋值
-		switch (status) {
-			case 'pending': //待处理 
-				currentStep.value = 0
-				break
-			case 'assignde': //已派单
-				currentStep.value = 1
-				break
-			case 'completed': //已完成
-				currentStep.value = 2
-				break
-			default:
-				currentStep.value = 0
-		}
-	})
+const setStep = (status) => {
+  if (status === '0' || status === 0) currentStep.value = 0
+  else if (status === '1' || status === 1) currentStep.value = 1
+  else if (status === '2' || status === 2) currentStep.value = 2
+  else currentStep.value = 0
+}
 
-	// 联系物业按钮点击事件
-	const contactProperty = () => {
-		uni.showToast({
-			title: '正在联系物业...',
-			icon: 'none'
-		})
-	}
+const mapData = (data) => {
+  if (!data) return
+  const images = data.problemImageUrl ? data.problemImageUrl.split(',').filter(Boolean) : []
+  repairInfo.value = {
+    house: data.houseName || '',
+    project: data.maintenanceItemName || '',
+    title: data.title || data.maintenanceItemName || '',
+    description: data.problem || '',
+    phone: data.phone || '',
+    time: data.orderDate || '',
+    images
+  }
+  setStep(data.problemStatus)
+}
+
+// 获取详情接口
+const fetchDetail = async (id) => {
+  if (!id) {
+    return
+  } 
+  try {
+    const res = await getRepairDetail({ id })
+    
+    if (res.code === 200) {
+      mapData(res.data || {})
+    } else {
+      uni.showToast({ title: res.msg || '获取详情失败', icon: 'none' })
+    }
+  } catch (e) {
+    uni.showToast({ title: '网络异常', icon: 'none' })
+  }
+}
+
+onLoad((option) => {
+  console.log("页面打开，路由参数：", option)
+  
+  // 传了 id 才调用接口
+  if (option?.id) {
+    fetchDetail(option.id) // 调用接口
+  } else {
+    uni.showToast({ title: '参数错误', icon: 'none' })
+  }
+})
+
+// 预览图片
+const previewImage = (url) => {
+  uni.previewImage({ urls: repairInfo.value.images, current: url })
+}
+
+// 联系物业按钮点击事件
+const contactProperty = () => {
+  uni.makePhoneCall({
+    phoneNumber: '物业电话' // 换成真实电话
+  })
+}
 </script>
 
 <style scoped>
diff --git a/property-uniapp-project/pageSubPack/online-repair/selectHouse.vue b/property-uniapp-project/pageSubPack/online-repair/selectHouse.vue
index 00deee2..50c3acf 100644
--- a/property-uniapp-project/pageSubPack/online-repair/selectHouse.vue
+++ b/property-uniapp-project/pageSubPack/online-repair/selectHouse.vue
@@ -17,6 +17,14 @@
         
         <uni-icons type="checkbox-filled" size="20" color="#007aff" v-if="selectedHouse.id === item.id"></uni-icons>
       </view>
+	  <!-- 空状态 -->
+	  <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>
+	  
     </view>
 
     <!-- 确认按钮 -->
@@ -146,4 +154,20 @@ const confirmSelect = () => {
   margin-top: 20px;
   margin-bottom: 20rpx;
 }
+/* 空状态 */
+.empty-state {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	padding: 100rpx 0;
+	color: #ccc;
+}
+
+.empty-text {
+	font-size: 32rpx;
+	color: #999;
+	margin-top: 20rpx;
+	margin-bottom: 10rpx;
+}
 </style>
\ No newline at end of file