diff --git a/src/pages/canteen-delivery/detail.vue b/src/pages/canteen-delivery/detail.vue index 8962229..0a6ff7d 100644 --- a/src/pages/canteen-delivery/detail.vue +++ b/src/pages/canteen-delivery/detail.vue @@ -12,8 +12,14 @@ mode="aspectFill" /> {{ state.row.merchantName || "—" }} - - {{ state.row.createTime }} + + 下单时间:{{ formatOrderTimeLabel(state.row.createTime) }} + + + 订单类型:{{ expectDeliveryTypeLabel(state.row.expectDeliveryType) }} + + + {{ deliveryExpectDetailLine(state.row) }} @@ -124,6 +130,11 @@ import { onLoad } from "@dcloudio/uni-app" import { hooks } from "@@/index" import { canteenDeliveryApi } from "@@/api" import { filePath } from "@@/utils/file" +import { + deliveryExpectDetailLine, + expectDeliveryTypeLabel, + formatOrderTimeLabel, +} from "@@/utils/canteen-delivery-display" import { getFileUploadActionUrl, getUploadAuthHeader, parseSysFileUploadResponse } from "@@/utils/upload" const UPLOAD_OK = 2 diff --git a/src/pages/canteen-delivery/list.vue b/src/pages/canteen-delivery/list.vue index 0fb3b29..e5ad71f 100644 --- a/src/pages/canteen-delivery/list.vue +++ b/src/pages/canteen-delivery/list.vue @@ -1,5 +1,5 @@