修改

src/components/choose-image/choose-image.vue

@@ -106,6 +106,9 @@ function chooseImage(type: 'album' | 'camera') {
             console.log(results)
             emits('change', results)
           })
+          .catch(() => {
+            uni.showToast({ icon: 'none', title: t('common.prompt.up-failed') })
+          })
           .finally(() => {
             uni.hideLoading()
           })
@@ -138,6 +141,9 @@ function chooseImage(type: 'album' | 'camera') {
         .then((results) => {
           emits('change', results)
         })
+        .catch(() => {
+          uni.showToast({ icon: 'none', title: t('common.prompt.up-failed') })
+        })
         .finally(() => {
           uni.hideLoading()
         })

src/locale/en.json

@@ -554,6 +554,7 @@
       "cancellationReasonDesc": "30 minutes without processing automatically agreed by the system.",
       "cancellationTime": "Cancellation time",
       "cancellationTitle": "Merchant processing in progress",
+      "cancelSuccess": "Order cancelled successfully",
       "cancelled": "Cancelled",
       "deliveryAddress": "Delivery address",
       "deliveryDate": "Delivery date",
@@ -591,9 +592,15 @@
       "useCode": "Use code",
       "writeOff": "Meal Code",
       "uploadPaidVoucher": "I've paid — upload proof",
-      "voucherSubmitSuccess": "Proof submitted",
+      "voucherSubmitSuccess": "Proof submitted — pending review",
       "voucherSubmitFailed": "Submit failed, please try again",
       "voucherUploadFailed": "Upload failed, please try again",
+      "payMethodZip": "ZIP voucher payment",
+      "zipPayHint": "Scan the QR code to pay, then upload your payment proof",
+      "zipPayAmountLabel": "Amount due",
+      "zipPayAmountInvalid": "Invalid payment amount. Please return to checkout.",
+      "zipPayAmountChanged": "Payment group amount changed. Please upload proof again.",
+      "zipPayPendingReview": "A ZIP payment for this delivery date is pending review.",
       "pleaseBindCreditCard": "No bank card linked. Please add a card before paying."
     },
     "energyMeal": {

src/locale/zh-Hans.json

@@ -554,6 +554,7 @@
       "cancellationReasonDesc": "30分钟不处理，系统自动同意",
       "cancellationTime": "取消时间",
       "cancellationTitle": "商户处理中",
+      "cancelSuccess": "取消订单成功",
       "cancelled": "已取消",
       "deliveryAddress": "配送地址",
       "deliveryDate": "配送日期",
@@ -591,9 +592,15 @@
       "useCode": "核销码",
       "writeOff": "核销",
       "uploadPaidVoucher": "我已支付，上传凭证",
-      "voucherSubmitSuccess": "凭证已提交",
+      "voucherSubmitSuccess": "凭证已提交，待审核",
       "voucherSubmitFailed": "提交失败，请重试",
       "voucherUploadFailed": "上传失败，请重试",
+      "payMethodZip": "ZIP 凭证支付",
+      "zipPayHint": "请扫码完成转账后，上传支付凭证截图",
+      "zipPayAmountLabel": "应付金额",
+      "zipPayAmountInvalid": "支付金额无效，请返回结算页重新确认",
+      "zipPayAmountChanged": "支付组金额已变化，请重新上传凭证",
+      "zipPayPendingReview": "该配送日期已有 ZIP 支付待审核，请等待审核",
       "pleaseBindCreditCard": "未绑定银行卡，请先绑定后再支付"
     },
     "energyMeal": {

src/pages-store/pages/order/checkout.vue

@@ -21,7 +21,8 @@ import {
   appMerchantOrderCalculatePriceCartBatchPost,
   appMerchantCartListMerchantPost,
   appMerchantOrderPayOrderBatchPost,
-  appMerchantOrderZipPayVoucherPost
+  appMerchantOrderZipPayVoucherPost,
+  appMerchantOrderZipPayVoucherBatchPost
 } from "@/service";
 import useEventEmit from "@/hooks/useEventEmit";
 import {EventEnum} from "@/constant/enums";
@@ -46,8 +47,13 @@ import {
   pickCheckoutPaidAmount,
   pickCheckoutTax,
   pickCheckoutTip,
+  pickZipPaymentAmount,
+  resolveRequestErrorMessage,
+  isZipAmountChangedError,
+  isZipPendingReviewError,
   resolveTipAmount,
   stringifyCartIds,
+  stringifyOrderIds,
 } from "./utils/checkout-order";
 
 defineOptions({
@@ -471,11 +477,45 @@ const payMethodOptions = ref({
 const payMethodPopupVisible = ref(false)
 const payMethodSelected = ref(1)
 const zellePopupVisible = ref(false)
-const zelleOrderIdForVoucher = ref('')
+const zipVoucherOrderIds = ref<string[]>([])
+/** 创单后提交 ZIP 凭证使用的应付金额快照（不再依赖购物车算价） */
+const zipVoucherPaymentAmountSnapshot = ref(0)
 const voucherChooseRef = ref<InstanceType<typeof ChooseImage>>()
 const voucherSubmitting = ref(false)
 const zellePayPath = Config.zellePayPath;
 
+const zipVoucherPaymentAmount = computed(() =>
+  pickZipPaymentAmount(priceData.value as any, orderType.value === 'batch'),
+)
+
+const zipVoucherPaymentAmountText = computed(() =>
+  (zipVoucherPaymentAmountSnapshot.value || zipVoucherPaymentAmount.value).toFixed(2),
+)
+
+function snapshotZipPaymentAmount() {
+  const amount = pickZipPaymentAmount(priceData.value as any, orderType.value === 'batch')
+  zipVoucherPaymentAmountSnapshot.value = amount
+  return amount
+}
+
+function setZipVoucherOrderIds(ids: Array<string | number | null | undefined>) {
+  zipVoucherOrderIds.value = stringifyOrderIds(ids)
+}
+
+function openZipVoucherPopup(ids: Array<string | number | null | undefined>) {
+  setZipVoucherOrderIds(ids)
+  const amount = snapshotZipPaymentAmount()
+  if (!zipVoucherOrderIds.value.length) {
+    uni.showToast({ title: t('pages-store.order.voucherUploadFailed'), icon: 'none' })
+    return
+  }
+  if (amount <= 0) {
+    uni.showToast({ title: t('pages-store.order.zipPayAmountInvalid'), icon: 'none' })
+    return
+  }
+  zellePopupVisible.value = true
+}
+
 function openPayMethodPopup() {
   payMethodSelected.value = Number(payMethodOptions.value.payMethod || 1)
   payMethodPopupVisible.value = true
@@ -486,7 +526,7 @@ function confirmPayMethodForSettle() {
   handleGoSettle()
 }
 function openUploadVoucher() {
-  if (!zelleOrderIdForVoucher.value) {
+  if (!zipVoucherOrderIds.value.length) {
     uni.showToast({ title: t('pages-store.order.voucherUploadFailed'), icon: 'none' })
     return
   }
@@ -494,37 +534,91 @@ function openUploadVoucher() {
 }
 function normalizeVoucherUrl(payload: unknown): string {
   if (Array.isArray(payload)) {
-    const first = payload[0]
-    return typeof first === 'string' ? first : ''
+    return normalizeVoucherUrl(payload[0])
   }
-  return typeof payload === 'string' ? payload : ''
+  if (typeof payload === 'string') {
+    return payload.trim()
+  }
+  if (payload && typeof payload === 'object') {
+    const obj = payload as Record<string, unknown>
+    for (const key of ['url', 'fullUrl', 'fileUrl', 'link']) {
+      const val = obj[key]
+      if (typeof val === 'string' && val.trim()) {
+        return val.trim()
+      }
+    }
+  }
+  return ''
 }
+
+async function submitZipPayVoucher(zipPayVoucher: string) {
+  const orderIds = zipVoucherOrderIds.value
+  const paymentAmount = zipVoucherPaymentAmountSnapshot.value
+  if (!orderIds.length || paymentAmount <= 0) {
+    throw new Error(t('pages-store.order.zipPayAmountInvalid'))
+  }
+  if (orderIds.length > 1) {
+    await appMerchantOrderZipPayVoucherBatchPost({
+      body: {
+        orderIds,
+        zipPayVoucher,
+        paymentAmount,
+      },
+      options: { hideErrorToast: true },
+    })
+    return
+  }
+  await appMerchantOrderZipPayVoucherPost({
+    body: {
+      orderId: orderIds[0],
+      zipPayVoucher,
+      paymentAmount,
+    },
+    options: { hideErrorToast: true },
+  })
+}
+
 async function onVoucherImageUploaded(urls: unknown) {
   const zipPayVoucher = normalizeVoucherUrl(urls)
-  if (!zipPayVoucher || !zelleOrderIdForVoucher.value) {
+  if (!zipPayVoucher) {
     uni.showToast({ title: t('pages-store.order.voucherUploadFailed'), icon: 'none' })
     return
   }
+  if (!zipVoucherOrderIds.value.length) {
+    uni.showToast({ title: t('pages-store.order.voucherUploadFailed'), icon: 'none' })
+    return
+  }
+  if (zipVoucherPaymentAmountSnapshot.value <= 0) {
+    uni.showToast({ title: t('pages-store.order.zipPayAmountInvalid'), icon: 'none' })
+    return
+  }
   if (voucherSubmitting.value) return
   voucherSubmitting.value = true
   try {
-    await appMerchantOrderZipPayVoucherPost({
-      body: {
-        orderId: zelleOrderIdForVoucher.value,
-        zipPayVoucher,
-      }
-    })
+    await submitZipPayVoucher(zipPayVoucher)
     uni.showToast({ title: t('pages-store.order.voucherSubmitSuccess'), icon: 'none' })
     zellePopupVisible.value = false
+    const firstOrderId = zipVoucherOrderIds.value[0]
     setTimeout(() => {
-      if (zelleOrderIdForVoucher.value) {
-        uni.reLaunch({
-          url: `/pages-store/pages/order/index?id=${zelleOrderIdForVoucher.value}`
-        })
-      }
+      if (!firstOrderId) return
+      const query = zipVoucherOrderIds.value.length > 1
+        ? `id=${firstOrderId}&orderIds=${zipVoucherOrderIds.value.join(',')}&paymentAmount=${zipVoucherPaymentAmountSnapshot.value}`
+        : `id=${firstOrderId}`
+      uni.reLaunch({
+        url: `/pages-store/pages/order/index?${query}`,
+      })
     }, 500)
-  } catch {
-    uni.showToast({ title: t('pages-store.order.voucherSubmitFailed'), icon: 'none' })
+  } catch (err) {
+    const message = resolveRequestErrorMessage(err, t('pages-store.order.voucherSubmitFailed'))
+    if (isZipAmountChangedError(message)) {
+      uni.showToast({ title: t('pages-store.order.zipPayAmountChanged'), icon: 'none' })
+      return
+    }
+    if (isZipPendingReviewError(message)) {
+      uni.showToast({ title: t('pages-store.order.zipPayPendingReview'), icon: 'none' })
+      return
+    }
+    uni.showToast({ title: message, icon: 'none' })
   } finally {
     voucherSubmitting.value = false
   }
@@ -1024,8 +1118,7 @@ function handleGoSettle() {
         if(payMethodOptions.value.payMethod === 2) {
           passwordInputRef.value?.showPasswordInput()
         } else if (payMethodOptions.value.payMethod === 3) {
-          zelleOrderIdForVoucher.value = resOrderIds.value?.[0] ? String(resOrderIds.value[0]) : ''
-          zellePopupVisible.value = true
+          openZipVoucherPopup(resOrderIds.value)
         } else {
           appMerchantOrderPayOrderBatch()
         }
@@ -1040,8 +1133,7 @@ function handleGoSettle() {
       if(payMethodOptions.value.payMethod === 2) {
         passwordInputRef.value?.showPasswordInput()
       } else if (payMethodOptions.value.payMethod === 3) {
-        zelleOrderIdForVoucher.value = resOrderIds.value?.[0] ? String(resOrderIds.value[0]) : ''
-        zellePopupVisible.value = true
+        openZipVoucherPopup(resOrderIds.value)
       } else {
         appMerchantOrderPayOrderBatch()
       }
@@ -1068,8 +1160,7 @@ function handleGoSettle() {
         if(payMethodOptions.value.payMethod === 2) {
           passwordInputRef.value?.showPasswordInput()
         } else if (payMethodOptions.value.payMethod === 3) {
-          zelleOrderIdForVoucher.value = String(resOrderId.value || '')
-          zellePopupVisible.value = true
+          openZipVoucherPopup([resOrderId.value])
         } else {
           appMerchantOrderPayOrder()
         }
@@ -1079,8 +1170,7 @@ function handleGoSettle() {
       if(payMethodOptions.value.payMethod === 2) {
         passwordInputRef.value?.showPasswordInput()
       } else if (payMethodOptions.value.payMethod === 3) {
-        zelleOrderIdForVoucher.value = String(resOrderId.value || '')
-        zellePopupVisible.value = true
+        openZipVoucherPopup([resOrderId.value])
       } else {
         appMerchantOrderPayOrder()
       }
@@ -2121,8 +2211,8 @@ function handleClose(merchantId?: string) {
               <view class="checkout-paymethod-dot-inner"></view>
             </view>
             <view class="checkout-paymethod-text-wrap">
-              <view class="checkout-paymethod-name">Zelle</view>
-              <view class="checkout-paymethod-desc">Scan QR and upload voucher</view>
+              <view class="checkout-paymethod-name">{{ t('pages-store.order.payMethodZip') }}</view>
+              <view class="checkout-paymethod-desc">{{ t('pages-store.order.zipPayHint') }}</view>
             </view>
           </view>
         </view>
@@ -2135,10 +2225,16 @@ function handleClose(merchantId?: string) {
     </wd-popup>
     <wd-popup v-model="zellePopupVisible" custom-style="background: transparent;" @close="zellePopupVisible = false">
       <view class="w-620rpx rounded-24rpx bg-white p-28rpx">
-        <view class="text-32rpx lh-32rpx text-#333 font-600 text-center mb-24rpx">Zelle</view>
+        <view class="text-32rpx lh-32rpx text-#333 font-600 text-center mb-16rpx">ZIP</view>
+        <view class="text-26rpx lh-36rpx text-#666 text-center mb-20rpx">
+          {{ t('pages-store.order.zipPayAmountLabel') }} ${{ zipVoucherPaymentAmountText }}
+        </view>
+        <view class="text-24rpx lh-34rpx text-#999 text-center mb-20rpx">
+          {{ t('pages-store.order.zipPayHint') }}
+        </view>
         <image v-if="zellePayPath" :src="zellePayPath" mode="aspectFit" class="w-100% h-520rpx rounded-16rpx bg-#F7F7F7" />
         <view v-else class="h-220rpx rounded-16rpx bg-#F7F7F7 center text-#999 text-24rpx">
-          zellePayPath is empty
+          QR
         </view>
         <wd-button
           :loading="voucherSubmitting"

src/pages-store/pages/order/components/cancel-order.vue

@@ -6,7 +6,7 @@ const emit = defineEmits(['confirm']);
 
 const show = ref(false);
 
-const sortOptions = [
+const sortOptions = computed(() => [
   {
     label: t('pages-store.store.cancelOrder.informationError'),
     value: 'time'
@@ -23,26 +23,29 @@ const sortOptions = [
     label: t('pages-store.store.cancelOrder.dontWant'),
     value: 'comment'
   }
-];
+]);
 const currentSort = ref(0);
 function handleClick(index: number) {
-  // show.value = false;
   currentSort.value = index;
 }
 
 function confirmCancel() {
-  console.log('取消订单', sortOptions[currentSort.value].label)
-  emit('confirm', sortOptions[currentSort.value].label);
+  emit('confirm', sortOptions.value[currentSort.value].label);
 }
 
 function onOpen() {
+  currentSort.value = 0;
   show.value = true;
 }
-function handleClose() {
+function onClose() {
   show.value = false;
 }
+function handleClose() {
+  onClose();
+}
 defineExpose({
   onOpen,
+  onClose,
 });
 </script>
 
@@ -59,7 +62,7 @@ defineExpose({
           class="w-28rpx h-28rpx absolute top-30rpx right-30rpx"
           mode="aspectFit"
       />
-      <view class="text-36rpx lh-36rpx text-#333 font-bold text-center mb-68rpx">{{ t('common.cancel') }}</view>
+      <view class="text-36rpx lh-36rpx text-#333 font-bold text-center mb-68rpx">{{ t('pages.order.cancelOrder') }}</view>
       <template v-for="(item, index) in sortOptions">
         <view @click="handleClick(index)" class="flex items-center mb-42rpx last:mb-0">
           <view class="w-48rpx h-48rpx shrink-0 mr-20rpx">

src/pages-store/pages/order/index.vue

@@ -6,8 +6,15 @@ import {
   appMerchantOrderPayOrderPost,
   appMerchantOrderCancelOrderPost,
   appMerchantOrderZipPayVoucherPost,
+  appMerchantOrderZipPayVoucherBatchPost,
 } from "@/service";
 import ChooseImage from '@/components/choose-image/choose-image.vue'
+import {
+  resolveRequestErrorMessage,
+  isZipAmountChangedError,
+  isZipPendingReviewError,
+  stringifyOrderIds,
+} from '@/pages-store/pages/order/utils/checkout-order'
 const { t } = useI18n();
 import OrderProgress from './components/order-progress.vue'
 import OrderDetailSkeleton from './components/order-detail-skeleton.vue'
@@ -38,15 +45,15 @@ const openCancelOrder = () => {
   cancelOrderRef.value?.onOpen();
 };
 function confirmCancel(reason: string) {
-  console.log('取消订单', reason)
   appMerchantOrderCancelOrderPost({
     body: {
       orderId: orderDetail.value.id,
       cancelReason: reason,
     }
   }).then(res=> {
+    cancelOrderRef.value?.onClose()
     uni.showToast({
-      title: '取消订单成功',
+      title: t('pages-store.order.cancelSuccess'),
       icon: 'none',
     })
     setTimeout(() => {
@@ -74,13 +81,23 @@ const orderStepsCancel = ref([
 // 页面加载状态
 const loading = ref(true);
 const orderId = ref('')
+const zipVoucherOrderIds = ref<string[]>([])
+const zipVoucherPaymentAmount = ref(0)
+
 onLoad((options: any)=> {
   if(options.id) {
     orderId.value = options.id;
-    // appMerchantOrderDetail()
-    // 查询用户默认信用卡
-    appUserCardSelectDefault()
   }
+  if (options?.orderIds) {
+    zipVoucherOrderIds.value = stringifyOrderIds(String(options.orderIds).split(','))
+  }
+  if (options?.paymentAmount != null && options?.paymentAmount !== '') {
+    const amount = Number(options.paymentAmount)
+    if (Number.isFinite(amount) && amount > 0) {
+      zipVoucherPaymentAmount.value = amount
+    }
+  }
+  appUserCardSelectDefault()
 })
 
 onShow(()=> {
@@ -92,13 +109,19 @@ onShow(()=> {
 const orderDetail = ref<MerchantOrderVo>()
 function appMerchantOrderDetail() {
   loading.value = true;
-  appMerchantOrderDetailPost({
+  return appMerchantOrderDetailPost({
     params: {
       orderId: orderId.value,
     }
   }).then((res: any)=> {
     console.log('订单详情', res)
     orderDetail.value = res.data
+    if (!zipVoucherOrderIds.value.length && orderDetail.value?.id) {
+      zipVoucherOrderIds.value = stringifyOrderIds([orderDetail.value.id])
+    }
+    if (zipVoucherPaymentAmount.value <= 0 && orderDetail.value?.paidAmount != null) {
+      zipVoucherPaymentAmount.value = Number(orderDetail.value.paidAmount) || 0
+    }
     // 是自取订单还是配送订单 1-派送 2-自取
     if(orderDetail.value) {
       if(+orderDetail.value.receiveMethod === 2) {
@@ -165,10 +188,11 @@ function dishTitle(dishItem: any) {
 }
 
 const payMethodText = computed(() => {
-  // 1-信用卡 2-余额（wallet）
-  return orderDetail.value?.payMethod === 1
-      ? t('pages-user.choosePaymethod.creditCard')
-      : t('pages-user.choosePaymethod.wallet')
+  const method = orderDetail.value?.payMethod
+  if (method === 1) return t('pages-user.choosePaymethod.creditCard')
+  if (method === 2) return t('pages-user.choosePaymethod.wallet')
+  if (method === 3) return t('pages-store.order.payMethodZip')
+  return '--'
 })
 
 // 复制订单号
@@ -337,6 +361,37 @@ function normalizeVoucherUrl(payload: unknown): string {
   return typeof payload === 'string' ? payload : ''
 }
 
+async function submitZipPayVoucher(zipPayVoucher: string) {
+  const orderIds = zipVoucherOrderIds.value.length
+    ? zipVoucherOrderIds.value
+    : stringifyOrderIds([orderDetail.value?.id])
+  const paymentAmount = zipVoucherPaymentAmount.value > 0
+    ? zipVoucherPaymentAmount.value
+    : Number(orderDetail.value?.paidAmount ?? 0)
+  if (!orderIds.length || paymentAmount <= 0) {
+    throw new Error(t('pages-store.order.zipPayAmountInvalid'))
+  }
+  if (orderIds.length > 1) {
+    await appMerchantOrderZipPayVoucherBatchPost({
+      body: {
+        orderIds,
+        zipPayVoucher,
+        paymentAmount,
+      },
+      options: { hideErrorToast: true },
+    })
+    return
+  }
+  await appMerchantOrderZipPayVoucherPost({
+    body: {
+      orderId: orderIds[0],
+      zipPayVoucher,
+      paymentAmount,
+    },
+    options: { hideErrorToast: true },
+  })
+}
+
 async function onVoucherImageUploaded(urls: unknown) {
   const zipPayVoucher = normalizeVoucherUrl(urls)
   if (!zipPayVoucher) {
@@ -351,22 +406,27 @@ async function onVoucherImageUploaded(urls: unknown) {
   if (voucherSubmitting.value) return
   voucherSubmitting.value = true
   try {
-    await appMerchantOrderZipPayVoucherPost({
-      body: {
-        orderId: id,
-        zipPayVoucher,
-      },
-      options: { hideErrorToast: true },
-    })
+    await submitZipPayVoucher(zipPayVoucher)
     uni.showToast({ title: t('pages-store.order.voucherSubmitSuccess'), icon: 'none' })
     setTimeout(() => {
       appMerchantOrderDetail()
     }, 500)
-  }
-  catch {
-    uni.showToast({ title: t('pages-store.order.voucherSubmitFailed'), icon: 'none' })
-  }
-  finally {
+  } catch (err) {
+    const message = resolveRequestErrorMessage(err, t('pages-store.order.voucherSubmitFailed'))
+    if (isZipAmountChangedError(message)) {
+      await appMerchantOrderDetail()
+      if (zipVoucherPaymentAmount.value <= 0) {
+        zipVoucherPaymentAmount.value = Number(orderDetail.value?.paidAmount ?? 0)
+      }
+      uni.showToast({ title: t('pages-store.order.zipPayAmountChanged'), icon: 'none' })
+      return
+    }
+    if (isZipPendingReviewError(message)) {
+      uni.showToast({ title: t('pages-store.order.zipPayPendingReview'), icon: 'none' })
+      return
+    }
+    uni.showToast({ title: message, icon: 'none' })
+  } finally {
     voucherSubmitting.value = false
   }
 }

src/pages-store/pages/order/utils/checkout-order.ts

@@ -182,3 +182,28 @@ export function pickCheckoutTax(price: Record<string, any> | null | undefined, i
   }
   return Number(price.tax ?? 0) || 0
 }
+
+export function stringifyOrderIds(ids: Array<string | number | null | undefined>): string[] {
+  return ids.map((id) => String(id ?? '').trim()).filter(Boolean)
+}
+
+/** ZIP 凭证提交应付总额（支付组维度） */
+export function pickZipPaymentAmount(
+  price: Record<string, any> | null | undefined,
+  isBatch: boolean,
+): number {
+  return pickCheckoutPaidAmount(price, isBatch)
+}
+
+export function resolveRequestErrorMessage(err: unknown, fallback: string): string {
+  const e = err as { msg?: string; message?: string; data?: { msg?: string } }
+  return String(e?.msg || e?.data?.msg || e?.message || fallback).trim() || fallback
+}
+
+export function isZipPendingReviewError(message: string): boolean {
+  return /ZIP.*待审核|待审核.*ZIP/i.test(message)
+}
+
+export function isZipAmountChangedError(message: string): boolean {
+  return /支付组金额已变化|金额已变化.*凭证/i.test(message)
+}

src/pages/home/components/tabbar-order/components/order-swiper-list/order-swiper-list.vue

@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import {
   appMerchantOrderOrderListPost,
+  appMerchantOrderCancelOrderPost,
   type MerchantOrderVo
 } from "@/service";
+import CancelOrder from '@/pages-store/pages/order/components/cancel-order.vue'
 import {callPhone} from "@/utils/utils";
 import {OrderCancelStatus, OrderStatus} from "@/constant/enums";
 import {useUserStore} from "@/store";
@@ -141,9 +143,32 @@ function handleClick(item: MerchantOrderVo) {
   })
 }
 
+const cancelOrderRef = ref<InstanceType<typeof CancelOrder>>()
+const pendingCancelOrder = ref<MerchantOrderVo | null>(null)
+
 function handleCancelClick(item: MerchantOrderVo) {
-  uni.navigateTo({
-    url: '/pages-store/pages/order/index?id=' + item.id
+  pendingCancelOrder.value = item
+  cancelOrderRef.value?.onOpen()
+}
+
+function confirmCancel(reason: string) {
+  const order = pendingCancelOrder.value
+  if (!order?.id) return
+  appMerchantOrderCancelOrderPost({
+    body: {
+      orderId: order.id,
+      cancelReason: reason,
+    },
+  }).then(() => {
+    cancelOrderRef.value?.onClose()
+    pendingCancelOrder.value = null
+    uni.showToast({
+      title: t('pages-store.order.cancelSuccess'),
+      icon: 'none',
+    })
+    setTimeout(() => {
+      paging.value?.refresh()
+    }, 500)
   })
 }
 
@@ -295,6 +320,7 @@ defineExpose({
         </view>
       </view>
     </z-paging>
+    <cancel-order ref="cancelOrderRef" @confirm="confirmCancel" />
   </view>
 </template>
 

src/service/merchantOrder.ts

@@ -500,13 +500,19 @@ export async function appMerchantOrderPayOrderBatchPost({
   });
 }
 
-/** 提交 Zip 支付凭证 POST /app/merchantOrder/zipPayVoucher */
+/** 提交 Zip 支付凭证 POST /app/merchantOrder/zipPayVoucher（单订单兼容） */
+export interface ZipPayVoucherBo {
+  orderId: string | number
+  zipPayVoucher: string
+  paymentAmount?: number
+}
+
 export async function appMerchantOrderZipPayVoucherPost({
   body,
   options,
 }: {
-  body: { orderId: number; zipPayVoucher: string };
-  options?: CustomRequestOptions;
+  body: ZipPayVoucherBo
+  options?: CustomRequestOptions
 }) {
   return request<API.R>('/app/merchantOrder/zipPayVoucher', {
     method: 'POST',
@@ -518,6 +524,30 @@ export async function appMerchantOrderZipPayVoucherPost({
   });
 }
 
+/** 批量提交 Zip 支付凭证 POST /app/merchantOrder/zipPayVoucherBatch */
+export interface ZipPayVoucherBatchBo {
+  orderIds: Array<string | number>
+  zipPayVoucher: string
+  paymentAmount: number
+}
+
+export async function appMerchantOrderZipPayVoucherBatchPost({
+  body,
+  options,
+}: {
+  body: ZipPayVoucherBatchBo
+  options?: CustomRequestOptions
+}) {
+  return request<API.R>('/app/merchantOrder/zipPayVoucherBatch', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
 /**
  * PayOrderBatchBo - 批量订单支付参数
  */