diff --git a/src/components/order-item/order-item.vue b/src/components/order-item/order-item.vue
index c2ff495..2c7fc2a 100644
--- a/src/components/order-item/order-item.vue
+++ b/src/components/order-item/order-item.vue
@@ -35,7 +35,8 @@ function navigateTo(url: string) {
class="bg-#FF6106 rounded-6rpx h-32rpx text-#fff text-22rpx center px-10rpx ml-20rpx">
{{ t('pages.order.DEL') }}
-
+
{{ t('pages.order.PU') }}
@@ -102,14 +103,13 @@ function navigateTo(url: string) {
>{{ t('pages-user.order.delivered') }}
-
+
{{ t('pages-user.order.receiving') }}
-
-
{{ t('pages-user.order.writeOff') }}
diff --git a/src/locale/en.json b/src/locale/en.json
index dceb1cc..854cd85 100644
--- a/src/locale/en.json
+++ b/src/locale/en.json
@@ -41,6 +41,7 @@
"loading": "Loading",
"menus": "Menus",
"minutes": "Minutes",
+ "days": "Days",
"no": "No",
"obtain": "Get",
"operation-success": "Operation successful",
diff --git a/src/locale/zh-Hans.json b/src/locale/zh-Hans.json
index 248c9cf..7274fea 100644
--- a/src/locale/zh-Hans.json
+++ b/src/locale/zh-Hans.json
@@ -37,6 +37,7 @@
"loading": "加载中",
"menus": "菜单",
"minutes": "分钟",
+ "days": "天",
"no": "否",
"obtain": "获取",
"or": "或",
diff --git a/src/pages-user/pages/order/index.vue b/src/pages-user/pages/order/index.vue
index 0da7100..7b503db 100644
--- a/src/pages-user/pages/order/index.vue
+++ b/src/pages-user/pages/order/index.vue
@@ -397,8 +397,8 @@ function rejectStartOrder() {
-
-
+
+
{{ t('pages-user.order.pickUp') }}:
@@ -413,14 +413,7 @@ function rejectStartOrder() {
-
-
- {{ t('pages-user.order.deliveryTime') }}
-
-
- {{ t('pages-user.order.mealPickupTime:') }}:
-
-
+ {{ t('pages-user.order.deliveryTime') }}
{{ formatDateTimeRange(orderDetail?.startScheduledTime, orderDetail?.endScheduledTime) }}
@@ -644,10 +637,8 @@ function rejectStartOrder() {
-
-
-
-
+
+
@@ -674,7 +665,6 @@ function rejectStartOrder() {
-
0) ? res.data.deliveryTime : '2400';
+ formData.value.deliveryTime = (rawDeliveryTime > 0) ? res.data.deliveryTime : '1';
// 处理配送费:排除 0, "0", "0.00", null, "" 等情况
const rawDeliveryFee = parseFloat(res.data.deliveryFee);
@@ -494,18 +494,13 @@ function handleClickStatePicker() {
-
-
+
+
{{
t('pages-user.store-management.index.isSelfPickup')
}}
-
-
-
{{ t('pages-user.store-management.index.mealPickupTime') }}
@@ -561,7 +555,7 @@ function handleClickStatePicker() {
{{ t('pages-user.store-management.index.deliveryTime') }}
- {{ t('common.minutes') }}
+ {{ t('common.days') }}
{{ t('pages-user.order.delivered') }}
-
+
{{ t('pages-user.order.receiving') }}
-
{{ t('pages-user.order.writeOff') }}
diff --git a/src/service/types.ts b/src/service/types.ts
index 1629bc8..31e608b 100644
--- a/src/service/types.ts
+++ b/src/service/types.ts
@@ -2409,7 +2409,7 @@ export type MerchantBo =
'pickupTime'?: string;
/** 是否支持配送(1-支持 2-不支持) */
'deliveryService'?: number;
- /** 配送时长(如"30分钟") */
+ /** 配送时长(单位:天,如"1") */
'deliveryTime'?: string;
/** 配送费 */
'deliveryFee'?: number;
@@ -2482,7 +2482,7 @@ export type MerchantBoAddGroup =
'pickupTime'?: string;
/** 是否支持配送(1-支持 2-不支持) */
'deliveryService': number;
- /** 配送时长(如"30分钟") */
+ /** 配送时长(单位:天,如"1") */
'deliveryTime'?: string;
/** 配送费 */
'deliveryFee': number;
@@ -2553,7 +2553,7 @@ export type MerchantBoEditGroup =
'pickupTime'?: string;
/** 是否支持配送(1-支持 2-不支持) */
'deliveryService': number;
- /** 配送时长(如"30分钟") */
+ /** 配送时长(单位:天,如"1") */
'deliveryTime'?: string;
/** 配送费 */
'deliveryFee': number;
@@ -3315,9 +3315,9 @@ export type MerchantOrderListBo =
/** 退款状态 */
'refundStatusList'?: number[];
/** 开始时间 */
- 'createBeginTime'?: number;
+ 'createBeginTime'?: any;
/** 结束时间 */
- 'createEndTime'?: number;
+ 'createEndTime'?: any;
}
@@ -3746,7 +3746,7 @@ export type MerchantVo =
'pickupTime'?: string;
/** 是否支持配送(1-支持 2-不支持) */
'deliveryService'?: number;
- /** 配送时长(如"30分钟") */
+ /** 配送时长(单位:天,如"1") */
'deliveryTime'?: string;
/** 配送费 */
'deliveryFee'?: number;
@@ -6703,7 +6703,7 @@ export type XjpmjMerchantExportPostParams =
'pickupTime'?: string;
/** 是否支持配送(1-支持 2-不支持) */
'deliveryService'?: number;
- /** 配送时长(如"30分钟") */
+ /** 配送时长(单位:天,如"1") */
'deliveryTime'?: string;
/** 配送费 */
'deliveryFee'?: string;