完善下单逻辑及其ui展示，修复支付倒计时显示错误bug

pages/mall/consumer/home-service/apply.uvue

@@ -149,6 +149,13 @@ async function loadData() {
 	bookingDays.value = getBookingDayOptions()
 	bookingSlots.value = getBookingTimeSlots()
 	services.value = await fetchHomeServiceCatalog()
+	if (services.value.length > 0) {
+		selectService(services.value[0].id, services.value[0].name)
+		return
+	}
+	selectedServiceId.value = ''
+	form.serviceId = ''
+	form.serviceName = ''
 }
 
 function selectService(serviceId: string, serviceName: string) {
@@ -192,6 +199,10 @@ function selectSlot(slotId: string, available: boolean) {
 }
 
 async function submitApplication() {
+	if (form.serviceId == '' || form.serviceName == '') {
+		uni.showToast({ title: '当前没有可预约的服务项目', icon: 'none' })
+		return
+	}
 	if (form.applicantName == '' || form.elderName == '' || form.phone == '' || form.address == '' || form.preferredTime == '') {
 		uni.showToast({ title: '请补全申请信息', icon: 'none' })
 		return
@@ -200,6 +211,10 @@ async function submitApplication() {
 	const parsedAge = parseInt(ageText.value)
 	form.age = isNaN(parsedAge) ? 0 : parsedAge
 	const created = await createHomeServiceApplication(form)
+	if (created == null) {
+		uni.showToast({ title: '申请提交失败，请检查登录和预约信息', icon: 'none' })
+		return
+	}
 	uni.showToast({ title: '申请已提交', icon: 'success' })
 	uni.navigateTo({ url: '/pages/mall/consumer/home-service/order-detail?id=' + created.id })
 }

pages/mall/consumer/home-service/feedback.uvue

@@ -53,6 +53,8 @@ import ServicePageScaffold from '@/components/homeService/ServicePageScaffold.uv
 import ServicePanel from '@/components/homeService/ServicePanel.uvue'
 import { fetchConsumerAcceptanceDetail, submitConsumerAcceptance } from '@/services/homeServiceService.uts'
 import { HomeServiceAcceptanceType } from '@/types/home-service.uts'
+import { getCurrentUser, getCurrentUserId } from '@/utils/store.uts'
+import { goToLogin } from '@/utils/utils.uts'
 
 const caseId = ref('')
 const detail = ref<HomeServiceAcceptanceType | null>(null)
@@ -62,17 +64,31 @@ const selectedTags = ref<Array<string>>([])
 const scores = [1, 2, 3, 4, 5]
 const allTags = ['准时上门', '沟通清楚', '动作规范', '记录完整', '需进一步整改']
 
+async function ensureLogin(): Promise<boolean> {
+	const user = await getCurrentUser()
+	if (user == null || getCurrentUserId() == '') {
+		goToLogin('/pages/mall/consumer/home-service/feedback?id=' + caseId.value)
+		return false
+	}
+	return true
+}
+
 onLoad((options) => {
 	const id = options['id']
 	if (id != null) {
 		caseId.value = id as string
-		fetchConsumerAcceptanceDetail(caseId.value).then((res) => {
-			if (res != null) {
-				detail.value = res
-				rating.value = res.rating
-				feedback.value = res.feedback
-				selectedTags.value = res.tags.slice(0)
+		ensureLogin().then((ok) => {
+			if (!ok) {
+				return
 			}
+			fetchConsumerAcceptanceDetail(caseId.value).then((res) => {
+				if (res != null) {
+					detail.value = res
+					rating.value = res.rating
+					feedback.value = res.feedback
+					selectedTags.value = res.tags.slice(0)
+				}
+			})
 		})
 	}
 })
@@ -87,6 +103,9 @@ function toggleTag(tag: string) {
 }
 
 async function submitResult(approved: boolean) {
+	if (!(await ensureLogin())) {
+		return
+	}
 	if (caseId.value == '' || feedback.value == '') {
 		uni.showToast({ title: '请填写反馈说明', icon: 'none' })
 		return

pages/mall/consumer/home-service/index.uvue

@@ -89,6 +89,8 @@ import ServicePanel from '@/components/homeService/ServicePanel.uvue'
 import ServiceStatusTag from '@/components/homeService/ServiceStatusTag.uvue'
 import { fetchConsumerHomeServiceCases, fetchHomeServiceCatalog } from '@/services/homeServiceService.uts'
 import { HomeServiceCatalogType, HomeServiceCaseType } from '@/types/home-service.uts'
+import { getCurrentUser, getCurrentUserId } from '@/utils/store.uts'
+import { goToLogin } from '@/utils/utils.uts'
 import {
 	HomeServiceCategoryType,
 	HomeServiceItemType,
@@ -125,9 +127,23 @@ async function loadData() {
 	categoryGrid.value = getHomeServiceCategories()
 	promoCards.value = getHomeServicePromoCards()
 	services.value = await fetchHomeServiceCatalog()
+	const user = await getCurrentUser()
+	if (user == null || getCurrentUserId() == '') {
+		cases.value = [] as Array<HomeServiceCaseType>
+		return
+	}
 	cases.value = await fetchConsumerHomeServiceCases()
 }
 
+async function ensureLogin(redirectUrl: string): Promise<boolean> {
+	const user = await getCurrentUser()
+	if (user == null || getCurrentUserId() == '') {
+		goToLogin(redirectUrl)
+		return false
+	}
+	return true
+}
+
 function switchCategory(categoryId: string) {
 	selectedCategory.value = categoryId
 }
@@ -141,11 +157,21 @@ function goDetail(serviceId: string) {
 }
 
 function goBooking(serviceId: string) {
-	uni.navigateTo({ url: '/pages/mall/consumer/home-service/service-detail?id=' + serviceId + '&mode=booking' })
+	ensureLogin('/pages/mall/consumer/home-service/service-detail?id=' + serviceId + '&mode=booking').then((ok) => {
+		if (!ok) {
+			return
+		}
+		uni.navigateTo({ url: '/pages/mall/consumer/home-service/service-detail?id=' + serviceId + '&mode=booking' })
+	})
 }
 
 function goOrderDetail(caseId: string) {
-	uni.navigateTo({ url: '/pages/mall/consumer/home-service/order-detail?id=' + caseId })
+	ensureLogin('/pages/mall/consumer/home-service/order-detail?id=' + caseId).then((ok) => {
+		if (!ok) {
+			return
+		}
+		uni.navigateTo({ url: '/pages/mall/consumer/home-service/order-detail?id=' + caseId })
+	})
 }
 
 function goDetailByName(serviceName: string) {

pages/mall/consumer/home-service/order-detail.uvue

@@ -59,7 +59,17 @@
 				</view>
 			</ServicePanel>
 
-			<ServicePanel title="服务过程" subtitle="当前以 mock 时间线展示预约受理、派单和上门过程。">
+			<ServicePanel title="服务过程" subtitle="基于真实状态日志展示预约受理、派单、上门与验收进度。">
+				<ServiceInfoList
+					:items="[
+						{ label: '签到时间：', value: detail.checkinTime != '' ? detail.checkinTime : '暂未签到' },
+						{ label: '签到地点：', value: detail.checkinAddress != '' ? detail.checkinAddress : '暂未记录' },
+						{ label: '开始服务：', value: detail.serviceStartedAt != '' ? detail.serviceStartedAt : '暂未开始' },
+						{ label: '完成服务：', value: detail.serviceFinishedAt != '' ? detail.serviceFinishedAt : '暂未完成' },
+						{ label: '执行摘要：', value: detail.executionSummary != '' ? detail.executionSummary : '服务人员暂未提交执行摘要' },
+						{ label: '证据数量：', value: detail.evidenceCount > 0 ? String(detail.evidenceCount) + ' 份' : '暂未上传' }
+					]"
+				></ServiceInfoList>
 				<ServiceTimeline :items="detail.timeline"></ServiceTimeline>
 			</ServicePanel>
 
@@ -82,14 +92,29 @@ import ServiceStatusTag from '@/components/homeService/ServiceStatusTag.uvue'
 import ServiceTimeline from '@/components/homeService/ServiceTimeline.uvue'
 import { fetchConsumerHomeServiceCaseDetail } from '@/services/homeServiceService.uts'
 import { HomeServiceCaseType } from '@/types/home-service.uts'
+import { getCurrentUser, getCurrentUserId } from '@/utils/store.uts'
+import { goToLogin } from '@/utils/utils.uts'
 
 const caseId = ref('')
 const detail = ref<HomeServiceCaseType | null>(null)
 
+async function ensureLogin(): Promise<boolean> {
+	const user = await getCurrentUser()
+	if (user == null || getCurrentUserId() == '') {
+		goToLogin('/pages/mall/consumer/home-service/order-detail?id=' + caseId.value)
+		return false
+	}
+	return true
+}
+
 async function loadData() {
 	if (caseId.value == '') {
 		return
 	}
+	if (!(await ensureLogin())) {
+		detail.value = null
+		return
+	}
 	detail.value = await fetchConsumerHomeServiceCaseDetail(caseId.value)
 }
 
@@ -97,7 +122,12 @@ function goFeedback() {
 	if (caseId.value == '') {
 		return
 	}
-	uni.navigateTo({ url: '/pages/mall/consumer/home-service/feedback?id=' + caseId.value })
+	ensureLogin().then((ok) => {
+		if (!ok) {
+			return
+		}
+		uni.navigateTo({ url: '/pages/mall/consumer/home-service/feedback?id=' + caseId.value })
+	})
 }
 
 function bookAgain() {

pages/mall/consumer/home-service/service-detail.uvue

@@ -28,12 +28,20 @@
 			</view>
 
 			<ServicePanel title="Step1 服务地址" subtitle="确认上门地址、楼层与入户条件。">
-				<view class="form-item">
-					<text class="label">上门地址</text>
-					<view class="value-card" @click="selectAddress">
-						<text class="value-card-text">{{ addressLineText }}</text>
-						<text class="value-card-action">点击更换</text>
+				<view class="service-address-card" @click="selectAddress">
+					<view class="service-address-main">
+						<text class="service-address-title">服务地址</text>
+						<view v-if="selectedAddress != null" class="service-address-detail">
+							<view class="service-address-contact-row">
+								<text class="service-address-contact">{{ selectedAddress.contactName }}</text>
+								<text class="service-address-phone">{{ getSelectedAddressPhone() }}</text>
+							</view>
+							<text class="service-address-full">{{ selectedAddress.fullAddress }}</text>
+							<text v-if="selectedAddress.remark != ''" class="service-address-remark">备注：{{ selectedAddress.remark }}</text>
+						</view>
+						<text v-else class="service-address-placeholder">请选择服务地址</text>
 					</view>
+					<text class="service-address-arrow">></text>
 				</view>
 				<view class="form-grid">
 					<view class="form-grid-item">
@@ -271,11 +279,13 @@
 
 <script setup lang="uts">
 import { computed, ref } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
+import { onLoad, onShow } from '@dcloudio/uni-app'
 import ServicePageHeader from '@/components/homeService/ServicePageHeader.uvue'
 import ServicePanel from '@/components/homeService/ServicePanel.uvue'
 import { createHomeServiceApplication, fetchHomeServiceCatalog } from '@/services/homeServiceService.uts'
-import { HomeServiceApplicationDraftType, HomeServiceCatalogType } from '@/types/home-service.uts'
+import { HomeServiceApplicationDraftType, HomeServiceCatalogType, HomeServiceSelectedAddressType } from '@/types/home-service.uts'
+import { getCurrentUser, getCurrentUserId } from '@/utils/store.uts'
+import { goToLogin } from '@/utils/utils.uts'
 import {
 	BookingDayOptionType,
 	BookingTimeSlotType,
@@ -390,6 +400,7 @@ const servicePackages = ref<Array<ServicePackageOptionType>>([])
 
 const selectedDayId = ref('day-1')
 const selectedSlotId = ref('slot-1')
+const selectedAddress = ref<HomeServiceSelectedAddressType | null>(null)
 
 const careAddress = ref(defaultCareAddress.address)
 const careDetailAddress = ref(defaultCareAddress.detailAddress)
@@ -499,10 +510,56 @@ function buildDefaultPackages(currentServiceId: string, basePrice: number, durat
 }
 
 const addressLineText = computed((): string => {
+	if (selectedAddress.value != null && selectedAddress.value.fullAddress != '') {
+		return selectedAddress.value.fullAddress
+	}
 	const fullAddress = careAddress.value + ' ' + careDetailAddress.value
-	return fullAddress.trim() != '' ? fullAddress : '请选择上门服务地址'
+	return fullAddress.trim() != '' ? fullAddress : '请选择服务地址'
 })
 
+function applySelectedAddress(address: HomeServiceSelectedAddressType | null): void {
+	selectedAddress.value = address
+	if (address == null) {
+		careAddress.value = ''
+		careDetailAddress.value = ''
+		return
+	}
+	const locationAddress = address.locationAddress != null && address.locationAddress != '' ? address.locationAddress : address.addressDetail
+	const doorNo = address.doorNo != null && address.doorNo != '' ? address.doorNo : address.houseNumber
+	careAddress.value = locationAddress
+	careDetailAddress.value = doorNo
+	if (contactName.value == '') {
+		contactName.value = address.contactName
+	}
+	const phoneText = address.phone != null && address.phone != '' ? address.phone : address.contactPhone
+	if (contactPhone.value == '') {
+		contactPhone.value = phoneText
+	}
+}
+
+function getSelectedAddressPhone(): string {
+	if (selectedAddress.value == null) {
+		return ''
+	}
+	if (selectedAddress.value.phone != null && selectedAddress.value.phone != '') {
+		return selectedAddress.value.phone
+	}
+	return selectedAddress.value.contactPhone
+}
+
+function loadCachedSelectedAddress(): void {
+	try {
+		const cachedAddress = uni.getStorageSync('hss_selected_service_address') as HomeServiceSelectedAddressType | null
+		if (cachedAddress != null && cachedAddress.fullAddress != '') {
+			applySelectedAddress(cachedAddress)
+			return
+		}
+	} catch (error) {
+		console.error('读取服务地址缓存失败', error)
+	}
+	applySelectedAddress(null)
+}
+
 const selectedTimeText = computed((): string => {
 	let selectedDayLabel = ''
 	for (let i = 0; i < bookingDays.value.length; i++) {
@@ -611,9 +668,20 @@ function buildDemandSummary(): string {
 		+ '，服务需求：' + selectedNeeds
 		+ '，详细需求：' + demandDetailText.value
 		+ '，紧急联系人：' + emergencyName.value + ' ' + emergencyPhone.value
+		+ '，服务地址备注：' + (selectedAddress.value != null ? selectedAddress.value.remark : '')
 		+ '，备注：' + remarkText.value
 }
 
+function setUnavailableServiceState() {
+	serviceTitle.value = '服务暂未配置'
+	serviceSubtitle.value = '当前服务目录未找到该项目，请稍后再试。'
+	servicePrice.value = 0
+	serviceDuration.value = '待配置'
+	serviceSuitableFor.value = '请联系管理员初始化服务目录。'
+	serviceImageText.value = '服务'
+	servicePackages.value = [] as Array<ServicePackageOptionType>
+}
+
 async function loadData() {
 	bookingDays.value = getBookingDayOptions()
 	bookingSlots.value = getBookingTimeSlots()
@@ -633,15 +701,7 @@ async function loadData() {
 		}
 	}
 	if (matchedService == null) {
-		const fallbackItems = getHomeServiceItems(catalog)
-		if (fallbackItems.length > 0) {
-			serviceTitle.value = fallbackItems[0].title
-			serviceSubtitle.value = fallbackItems[0].subtitle
-			servicePrice.value = fallbackItems[0].price
-			serviceSuitableFor.value = fallbackItems[0].suitableFor
-			serviceImageText.value = fallbackItems[0].imageText
-		}
-		servicePackages.value = buildDefaultPackages(serviceId.value, servicePrice.value, serviceDuration.value)
+		setUnavailableServiceState()
 		return
 	}
 	serviceTitle.value = matchedService.name
@@ -656,17 +716,22 @@ async function loadData() {
 	servicePackages.value = buildDefaultPackages(serviceId.value, servicePrice.value, serviceDuration.value)
 }
 
-function selectAddress() {
-	if (careAddress.value == '' || careDetailAddress.value == '') {
-		careAddress.value = defaultCareAddress.address
-		careDetailAddress.value = defaultCareAddress.detailAddress
-		careArea.value = defaultCareAddress.area
-		careFloor.value = defaultCareAddress.floor
-		careHasElevator.value = defaultCareAddress.hasElevator
-		uni.showToast({ title: '已填入示例地址', icon: 'none' })
-		return
+async function ensureLogin(): Promise<boolean> {
+	const user = await getCurrentUser()
+	if (user == null || getCurrentUserId() == '') {
+		goToLogin('/pages/mall/consumer/home-service/service-detail?id=' + serviceId.value + '&mode=booking')
+		return false
 	}
-	uni.navigateTo({ url: '/pages/mall/consumer/address-list' })
+	return true
+}
+
+function selectAddress() {
+	ensureLogin().then((ok) => {
+		if (!ok) {
+			return
+		}
+		uni.navigateTo({ url: '/pages/address/address-list' })
+	})
 }
 
 function handleAgencyReplace() {
@@ -746,8 +811,15 @@ function selectServicePackage(packageId: string) {
 }
 
 async function submitBooking() {
-	if (careAddress.value == '' || careDetailAddress.value == '') {
-		uni.showToast({ title: '请选择上门服务地址', icon: 'none' })
+	if (!(await ensureLogin())) {
+		return
+	}
+	if (servicePackages.value.length == 0 || servicePrice.value <= 0) {
+		uni.showToast({ title: '当前服务暂不可预约', icon: 'none' })
+		return
+	}
+	if (selectedAddress.value == null) {
+		uni.showToast({ title: '请选择服务地址', icon: 'none' })
 		return
 	}
 	if (recipientName.value == '') {
@@ -781,10 +853,15 @@ async function submitBooking() {
 		phone: contactPhone.value,
 		address: addressLineText.value,
 		preferredTime: selectedTimeText.value,
-		demandSummary: buildDemandSummary()
+		demandSummary: buildDemandSummary(),
+		serviceAddressSnapshot: selectedAddress.value
 	}
 
 	const created = await createHomeServiceApplication(draft)
+	if (created == null) {
+		uni.showToast({ title: '预约提交失败，请稍后重试', icon: 'none' })
+		return
+	}
 	uni.showToast({ title: '预约已提交', icon: 'success' })
 	uni.navigateTo({ url: '/pages/mall/consumer/home-service/order-detail?id=' + created.id })
 }
@@ -796,12 +873,14 @@ onLoad((options) => {
 	}
 	const mode = options['mode']
 	if (mode != null && mode == 'booking') {
-		careAddress.value = defaultCareAddress.address
-		careDetailAddress.value = defaultCareAddress.detailAddress
 		careArea.value = defaultCareAddress.area
 	}
 	loadData()
 })
+
+onShow(() => {
+	loadCachedSelectedAddress()
+})
 </script>
 
 <style scoped>
@@ -845,6 +924,81 @@ onLoad((options) => {
 	box-shadow: 0 12rpx 24rpx rgba(15, 23, 42, 0.06);
 }
 
+.service-address-card {
+	background: #ffffff;
+	border-radius: 24rpx;
+	padding: 24rpx;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	border: 1rpx solid rgba(255, 125, 151, 0.16);
+	margin-bottom: 24rpx;
+	box-shadow: 0 10rpx 20rpx rgba(15, 23, 42, 0.04);
+}
+
+.service-address-main {
+	flex: 1;
+	margin-right: 20rpx;
+}
+
+.service-address-title {
+	font-size: 28rpx;
+	font-weight: 600;
+	color: #1f2937;
+	margin-bottom: 12rpx;
+}
+
+.service-address-detail {
+	display: flex;
+	flex-direction: column;
+	gap: 8rpx;
+}
+
+.service-address-contact-row {
+	flex-direction: row;
+	align-items: center;
+	flex-wrap: wrap;
+	gap: 16rpx;
+}
+
+.service-address-contact,
+.service-address-phone,
+.service-address-full,
+.service-address-remark,
+.service-address-placeholder,
+.service-address-arrow {
+	font-size: 24rpx;
+}
+
+.service-address-contact {
+	font-weight: 600;
+	color: #111827;
+}
+
+.service-address-phone {
+	color: #4b5563;
+}
+
+.service-address-full {
+	color: #374151;
+	line-height: 1.5;
+}
+
+.service-address-remark {
+	color: #6b7280;
+	line-height: 1.5;
+}
+
+.service-address-placeholder {
+	color: #9ca3af;
+	line-height: 1.5;
+}
+
+.service-address-arrow {
+	color: #c18b95;
+	font-weight: 600;
+}
+
 .summary-top-row,
 .summary-tag-row,
 .summary-price-row,