241019

src/views/shop/order/index.vue

@@ -82,6 +82,7 @@
                 <a-tag v-if="record.payType == 17"
                   ><IdcardOutlined class="tag-icon" />IC季卡</a-tag
                 >
+                <a-tag v-if="record.payType == 18">代付</a-tag>
               </template>
               <template v-else>
                 <span></span>
@@ -154,7 +155,7 @@
                 >未使用</span
               >
               <span v-if="record.orderStatus == 2" class="ele-text-placeholder"
-                >已取消</span
+                >已完成</span
               >
               <span v-if="record.orderStatus == 1" class="ele-text-success"
                 >已完成</span
@@ -186,11 +187,11 @@
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
-                <a @click="openEdit(record)">详情</a>
-                <template v-if="record.deliveryStatus === 10">
-                  <a-divider type="vertical" />
+                <template v-if="record.type === 0 && record.deliveryStatus === 10 && record.deliveryType === 0 && record.payStatus === 1">
                   <a @click="openDelivery(record)">发货</a>
+                  <a-divider type="vertical" />
                 </template>
+                <a @click="openEdit(record)">详情</a>
                 <a-divider type="vertical" />
                 <a-dropdown>
                   <a class="ant-dropdown-link" @click.prevent>
@@ -232,7 +233,6 @@
     CheckOutlined,
     CloseOutlined,
     AlipayCircleOutlined,
-    EllipsisOutlined,
     DownOutlined
   } from '@ant-design/icons-vue';
 
@@ -356,24 +356,19 @@
       align: 'center'
     },
     {
-      title: '优惠类型',
-      dataIndex: 'couponType',
-      key: 'couponType',
-      align: 'center'
-    },
-    {
-      title: '是否已开票',
-      dataIndex: 'isInvoice',
-      key: 'isInvoice',
-      align: 'center'
-    },
-    {
-      title: '类型',
+      title: '订单类型',
       dataIndex: 'type',
       key: 'type',
       align: 'center',
       customRender: ({ text }) =>
-        ['商城订单', '客户预定', '俱乐部训练场', '活动订场'][text]
+        ['商品', '外卖'][text]
+    },
+    {
+      title: '物流类型',
+      dataIndex: 'deliveryType',
+      align: 'center',
+      customRender: ({ text }) =>
+        ['快递/配送', '自提'][text]
     },
     // {
     //   title: '申请退款时间',