From bb5da5d9634e2da97630ca4fad8769ec363a641d Mon Sep 17 00:00:00 2001
From: ISFP_T <68358856@qq.com>
Date: Tue, 17 Mar 2026 12:05:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order-item/order-item.vue      | 10 +++++-----
 src/locale/en.json                            |  1 +
 src/locale/zh-Hans.json                       |  1 +
 src/pages-user/pages/order/index.vue          | 20 +++++--------------
 .../pages/store-management/index.vue          | 16 +++++----------
 .../order-swiper-list/order-swiper-list.vue   |  7 +++----
 src/service/types.ts                          | 14 ++++++-------
 7 files changed, 27 insertions(+), 42 deletions(-)

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') }}
         </view>
-        <view v-if="+item.receiveMethod === 2"
+        <!-- 自取已隐藏 -->
+        <view v-if="false"
               class="bg-#00A76D rounded-6rpx h-32rpx text-#fff text-22rpx center px-10rpx ml-20rpx">
           {{ t('pages.order.PU') }}
         </view>
@@ -102,14 +103,13 @@ function navigateTo(url: string) {
         >{{ t('pages-user.order.delivered') }}
         </wd-button>
 
-        <!--自取订单 未接单-->
+        <!-- 自取已隐藏：自取订单 未接单/已接单按钮 -->
         <wd-button
-            v-if="+item.receiveMethod === 2 && +item.orderStatus === OrderStatus.HAS_PENDING_PAYMENT"
+            v-if="false"
             class="!h-56rpx !rounded-56rpx !text-28rpx text-#fff"
         >{{ t('pages-user.order.receiving') }}
         </wd-button>
-        <!--自取订单 已经接单-->
-        <view v-if="+item.receiveMethod === 2 && +item.orderStatus === OrderStatus.MERCHANT_ACCEPTED"
+        <view v-if="false"
               @click.stop="navigateTo('/pages-user/pages/scan-code/index')">
           <wd-button class="!h-56rpx !rounded-56rpx !text-28rpx text-#fff">
             {{ 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() {
         </view>
       </template>
 
-      <!-- 自取订单 -->
-      <template v-if="orderDetail?.receiveMethod === 2">
+      <!-- 自取已隐藏：自取订单信息卡片 -->
+      <template v-if="false">
         <view class="bg-white rounded-16rpx p-24rpx mb-20rpx flex-center-sb">
           <view class="flex items-center text-28rpx text-#333">
             <text>{{ t('pages-user.order.pickUp') }}:</text>
@@ -413,14 +413,7 @@ function rejectStartOrder() {
       <!-- 送达时间 -->
       <view
           class="mb-20rpx bg-white px-24rpx h-160rpx rounded-16rpx flex flex-col items-start justify-center text-28rpx text-#333333">
-        <text class="mb-32rpx">
-          <template v-if="orderDetail?.receiveMethod === 1">
-            {{ t('pages-user.order.deliveryTime') }}
-          </template>
-          <template v-else>
-            {{ t('pages-user.order.mealPickupTime:') }}:
-          </template>
-        </text>
+        <text class="mb-32rpx">{{ t('pages-user.order.deliveryTime') }}</text>
         <text class="">{{ formatDateTimeRange(orderDetail?.startScheduledTime, orderDetail?.endScheduledTime) }}</text>
       </view>
 
@@ -644,10 +637,8 @@ function rejectStartOrder() {
           </view>
         </template>
       </template>
-      <!-- ------------------------------------------------------ -->
-      <!-- 自取订单 -->
-      <template v-if="orderDetail?.receiveMethod === 2">
-        <!-- 待接单 -->
+      <!-- 自取已隐藏：自取订单底部操作按钮 -->
+      <template v-if="false">
         <template v-if="orderStatus === OrderStatus.HAS_PENDING_PAYMENT">
           <view class="">
             <view :style="[configStore.iosSafeBottomPlaceholder]" class="h-118rpx"></view>
@@ -674,7 +665,6 @@ function rejectStartOrder() {
             </view>
           </view>
         </template>
-        <!-- 已接单 -->
         <template v-if="orderStatus === OrderStatus.MERCHANT_ACCEPTED">
           <fixed-bottom-large-btn
               :text="t('pages-user.order.writeOff')"
diff --git a/src/pages-user/pages/store-management/index.vue b/src/pages-user/pages/store-management/index.vue
index 1a8967e..14cf297 100644
--- a/src/pages-user/pages/store-management/index.vue
+++ b/src/pages-user/pages/store-management/index.vue
@@ -23,7 +23,7 @@ const formData = ref({
   selfPickup: true, // 是否支持自取(1-支持 2-不支持)
   pickupTime: '', // 自取时长(如"30分钟")
   deliveryService: true, // 是否支持配送(1-支持 2-不支持)
-  deliveryTime: '2400', // 配送时长(如"30分钟")
+  deliveryTime: '1', // 配送时长(单位：天，如"1")
   deliveryFee: '7', // 配送费
   shopImages: [], // 店铺图片URL(多张逗号分隔)
   stateName: '', // 店铺所在州名称
@@ -206,7 +206,7 @@ function init() {
     // 2. 特殊处理：配送时长 (deliveryTime)
     // 处理配送时长：排除 0, "0", "0.00", null, "" 等情况
     const rawDeliveryTime = parseFloat(res.data.deliveryTime);
-    formData.value.deliveryTime = (rawDeliveryTime > 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() {
         </view>
       </view>
 
-      <!--Is it self pickup?-->
-      <view class="mt-44rpx">
+      <!-- 自取已隐藏 -->
+      <view v-if="false" class="mt-44rpx">
         <view class="flex-center-sb h-44rpx">
           <view class="text-36rpx lh-36rpx text-#333 font-500">{{
               t('pages-user.store-management.index.isSelfPickup')
             }}
           </view>
-          <!-- <l-switch v-model="formData.selfPickup"
-                    :placeholder="[t('pages-user.store-management.index.on'), t('pages-user.store-management.index.off')]"
-                    dotSize="14px" height="22px"
-                    width="53px"></l-switch> -->
-
           <ca-switch
               v-model="formData.selfPickup"
               :offText="t('pages-user.store-management.index.off')"
@@ -513,7 +508,6 @@ function handleClickStatePicker() {
               chuteSelColor="#00A76D"
           />
         </view>
-        <!--Meal Pickup Time:-->
         <view v-if="formData.selfPickup" class="animate-in fade-in animate-ease-out animate-duration-300 mt-44rpx">
           <view class="text-36rpx lh-36rpx text-#333 font-500 mb-20rpx">
             {{ t('pages-user.store-management.index.mealPickupTime') }}
@@ -561,7 +555,7 @@ function handleClickStatePicker() {
         <view v-if="formData.deliveryService" class="animate-in fade-in animate-ease-out animate-duration-300 mt-44rpx">
           <view class="text-36rpx lh-36rpx text-#333 font-500 mb-20rpx">
             {{ t('pages-user.store-management.index.deliveryTime') }}
-            <text class="text-24rpx text-#999 ml-10rpx font-400">{{ t('common.minutes') }}</text>
+            <text class="text-24rpx text-#999 ml-10rpx font-400">{{ t('common.days') }}</text>
           </view>
           <view class="flex-center-sb h-98rpx px-24rpx rounded-16rpx bg-#F6F6F6">
             <wd-input
diff --git a/src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue b/src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue
index 0bc2bf5..be3b8f7 100644
--- a/src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue
+++ b/src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue
@@ -124,15 +124,14 @@ defineExpose({
                   >{{ t('pages-user.order.delivered') }}
                   </wd-button>
 
-                  <!--自取订单 未接单-->
+                  <!-- 自取已隐藏 -->
                   <wd-button
-                      v-if="+item.receiveMethod === 2 && +item.orderStatus === OrderStatus.HAS_PENDING_PAYMENT"
+                      v-if="false"
                       class="!h-56rpx !rounded-56rpx !text-28rpx text-#fff"
                   >{{ t('pages-user.order.receiving') }}
                   </wd-button>
-                  <!--自取订单 已经接单-->
                   <wd-button
-                      v-if="+item.receiveMethod === 2 && +item.orderStatus === OrderStatus.MERCHANT_ACCEPTED"
+                      v-if="false"
                       class="!h-56rpx !rounded-56rpx !text-28rpx text-#fff"
                       @click.stop="navigateTo('/pages-user/pages/scan-code/index')">
                     {{ 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;