diff --git a/src/pages/mine/MyReports.vue b/src/pages/mine/MyReports.vue
index 44af3ea..609df26 100644
--- a/src/pages/mine/MyReports.vue
+++ b/src/pages/mine/MyReports.vue
@@ -22,8 +22,8 @@
>
diff --git a/src/pages/report-view/reportView.vue b/src/pages/report-view/reportView.vue
index 54be881..0839322 100644
--- a/src/pages/report-view/reportView.vue
+++ b/src/pages/report-view/reportView.vue
@@ -234,12 +234,12 @@ const routeToken = ref('')
const isStaff = computed(() => isLoggedIn())
const beforePhotos = computed(() => {
- if (!reportData.value?.beforePhoto) return []
- return reportData.value.beforePhoto.split(',').filter(Boolean)
+ if (!reportData.value?.beforePhotos) return []
+ return reportData.value.beforePhotos
})
const afterPhotos = computed(() => {
- if (!reportData.value?.afterPhoto) return []
- return reportData.value.afterPhoto.split(',').filter(Boolean)
+ if (!reportData.value?.afterPhotos) return []
+ return reportData.value.afterPhotos
})
const beforePhotoUrls = computed(() => beforePhotos.value.map((item) => imgUrl(item)))
const afterPhotoUrls = computed(() => afterPhotos.value.map((item) => imgUrl(item)))
diff --git a/src/pages/report/Report.vue b/src/pages/report/Report.vue
index d7981c4..4bff6ed 100644
--- a/src/pages/report/Report.vue
+++ b/src/pages/report/Report.vue
@@ -238,15 +238,22 @@ const submitReport = async () => {
if (!report.value.serviceType) return uni.showToast({ title: '请选择服务类型', icon: 'none' })
if (!report.value.appointmentTime) return uni.showToast({ title: '请选择服务时间', icon: 'none' })
submitting.value = true
+ // 构建图片列表
+ const images = []
+ report.value.before.forEach((url, i) => {
+ images.push({ photoUrl: url, photoType: 'before', sortOrder: i })
+ })
+ report.value.after.forEach((url, i) => {
+ images.push({ photoUrl: url, photoType: 'after', sortOrder: i })
+ })
const payload = {
appointmentId: currentAppointmentId.value || null,
userId: userInfo.id,
petName: report.value.petName,
serviceType: report.value.serviceType,
appointmentTime: report.value.appointmentTime || null,
- beforePhoto: report.value.before.join(','),
- afterPhoto: report.value.after.join(','),
- remark: report.value.remark
+ remark: report.value.remark,
+ images
}
const res = await createReport(payload)
submitting.value = false