继续完善居家服务模块
This commit is contained in:
@@ -39,8 +39,8 @@
|
||||
<text class="stat-label">服务中</text>
|
||||
</view>
|
||||
<view class="stat-item">
|
||||
<text class="stat-value money">{{ incomeText }}</text>
|
||||
<text class="stat-label">预计收入</text>
|
||||
<text class="stat-value">{{ dashboard.completedCount }}</text>
|
||||
<text class="stat-label">已完成</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -89,7 +89,7 @@ import { computed, ref } from 'vue'
|
||||
import { onShow } from '@dcloudio/uni-app'
|
||||
import ServicePageScaffold from '@/components/homeService/ServicePageScaffold.uvue'
|
||||
import type { DeliveryInfoType } from '@/types/delivery.uts'
|
||||
import { acceptServiceOrder, getDeliveryDashboardStats, getDeliveryProfile, markDeparted } from '@/services/deliveryService.uts'
|
||||
import { acceptServiceOrder, getDeliveryDashboardStats, getDeliveryProfile } from '@/services/deliveryService.uts'
|
||||
import { getNextStepText, getPrimaryActionText } from '@/utils/deliveryCareUi.uts'
|
||||
import { requireDeliveryAuth } from '@/utils/deliveryAuth.uts'
|
||||
|
||||
@@ -117,7 +117,6 @@ const onlineText = computed((): string => {
|
||||
if (profile.value.onlineStatus == 'busy') return '忙碌'
|
||||
return '离线'
|
||||
})
|
||||
const incomeText = computed((): string => '¥' + String(dashboard.value.expectedIncome))
|
||||
const nextActionText = computed((): string => dashboard.value.nextOrder == null ? '查看详情' : getPrimaryActionText(dashboard.value.nextOrder!.status))
|
||||
const nextStepText = computed((): string => dashboard.value.nextOrder == null ? '暂无' : getNextStepText(dashboard.value.nextOrder!.status))
|
||||
const nextStatusText = computed((): string => dashboard.value.nextOrder == null ? '' : dashboard.value.nextOrder!.statusText)
|
||||
@@ -172,9 +171,7 @@ async function handleOrderAction(orderId: string) {
|
||||
return
|
||||
}
|
||||
if (order.status == 'accepted' || order.status == 'waiting_departure') {
|
||||
await markDeparted(orderId)
|
||||
uni.showToast({ title: '已标记出发', icon: 'success' })
|
||||
loadData()
|
||||
uni.navigateTo({ url: '/pages/mall/delivery/orders/route?id=' + orderId })
|
||||
return
|
||||
}
|
||||
goDetail(orderId)
|
||||
|
||||
Reference in New Issue
Block a user