From 3989c755e8636afc7614fb393dac1c30d5a67809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 14 Jul 2026 19:26:24 +0800
Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E6=94=AF=E6=8C=81=E8=B4=A7?=
 =?UTF-8?q?=E5=88=B0=E4=BB=98=E6=AC=BE=E6=94=AF=E4=BB=98=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=8F=8A=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单状态中新增货到付款标签区分
- 已付款状态中增加针对货到付款的待收货付款标签
- 订单支付类型展示中添加货到付款蓝色标签
- 更新支付类型列表，新增货到付款及调整相关标签名称
- 修复支付类型获取函数安全性，防止索引异常失败
---
 src/utils/shop.ts                  | 75 ++++++------------------------
 src/views/shop/shopOrder/index.vue | 37 +++++++++++----
 2 files changed, 43 insertions(+), 69 deletions(-)

diff --git a/src/utils/shop.ts b/src/utils/shop.ts
index 3d06db9..d0f281c 100644
--- a/src/utils/shop.ts
+++ b/src/utils/shop.ts
@@ -11,15 +11,15 @@ export function getPayType(index?: number): any {
     },
     {
       value: 2,
-      label: '积分'
-    },
-    {
-      value: 3,
       label: '支付宝'
     },
+    {
+      value: 3,
+      label: '银联支付'
+    },
     {
       value: 4,
-      label: '现金'
+      label: '现金支付'
     },
     {
       value: 5,
@@ -27,64 +27,19 @@ export function getPayType(index?: number): any {
     },
     {
       value: 6,
-      label: '会员卡'
+      label: '免费'
+    },
+    {
+      value: 7,
+      label: '积分支付'
+    },
+    {
+      value: 8,
+      label: '货到付款'
     }
-    // {
-    //   value: 7,
-    //   label: 'VIP年卡',
-    // },
-    // {
-    //   value: 8,
-    //   label: 'VIP次卡',
-    // },
-    // {
-    //   value: 9,
-    //   icon: 'IdcardOutlined',
-    //   label: 'IC月卡',
-    // },
-    // {
-    //  value: 10,
-    //   icon: 'IdcardOutlined',
-    //   label: 'IC年卡',
-    // },
-    // {
-    //   value: 11,
-    //   icon: 'IdcardOutlined',
-    //   label: 'IC次卡',
-    // },
-    // {
-    //   value: 12,
-    //   icon: '',
-    //   label: '免费',
-    // },
-    // {
-    //   value: 13,
-    //   icon: 'IdcardOutlined',
-    //   label: 'VIP充值卡',
-    // },
-    // {
-    //   value: 14,
-    //   icon: 'IdcardOutlined',
-    //   label: 'IC充值卡',
-    // },
-    // {
-    //   value: 15,
-    //   icon: '',
-    //   label: '积分支付',
-    // },
-    // {
-    //   value: 16,
-    //   icon: 'IdcardOutlined',
-    //   label: 'VIP季卡',
-    // },
-    // {
-    //   value: 17,
-    //   icon: 'IdcardOutlined',
-    //   label: 'IC季卡',
-    // },
   ];
   if (index) {
-    return payType[index].label || '';
+    return payType[index]?.label || '';
   }
   return payType;
 }
diff --git a/src/views/shop/shopOrder/index.vue b/src/views/shop/shopOrder/index.vue
index becf541..805de9e 100644
--- a/src/views/shop/shopOrder/index.vue
+++ b/src/views/shop/shopOrder/index.vue
@@ -88,14 +88,27 @@
           <template v-if="column.key === 'statusInfo'">
             <div class="py-1">
               <a-space :size="6" wrap>
+                <!-- 货到付款标识 -->
+                <a-tag
+                  v-if="record.payType === 8"
+                  color="blue"
+                >货到付款</a-tag>
+
                 <!-- 支付状态 -->
                 <a-tag
-                  v-if="record.payStatus == 1"
+                  v-if="record.payStatus == 1 && record.payType !== 8"
                   color="green"
                   @click.stop="updatePayStatus(record)"
                   class="cursor-pointer"
                   >已付款</a-tag
                 >
+                <a-tag
+                  v-else-if="record.payStatus == 1 && record.payType === 8"
+                  color="green"
+                  @click.stop="updatePayStatus(record)"
+                  class="cursor-pointer"
+                  >待收货付款</a-tag
+                >
                 <a-tag
                   v-else-if="record.payStatus == 0 || record.payStatus == null"
                   @click.stop="updatePayStatus(record)"
@@ -169,14 +182,20 @@
             </template>
           </template>
           <template v-if="column.key === 'payType'">
-            <template v-for="item in getPayType()">
-              <template v-if="record.payStatus == 1">
-                <span v-if="item.value == record.payType">{{
-                  item.label
-                }}</span>
-              </template>
-              <template v-else>
-                <span></span>
+            <!-- 货到付款特殊标识 -->
+            <template v-if="record.payType === 8">
+              <a-tag color="blue">货到付款</a-tag>
+            </template>
+            <template v-else>
+              <template v-for="item in getPayType()">
+                <template v-if="record.payStatus == 1">
+                  <span v-if="item.value == record.payType">{{
+                    item.label
+                  }}</span>
+                </template>
+                <template v-else>
+                  <span></span>
+                </template>
               </template>
             </template>
           </template>