优化网站导航模块

src/views/shop/order/index.vue

@@ -27,6 +27,7 @@
             </template>
             <template v-if="column.key === 'payType'">
               <template v-if="record.payStatus == 1">
+                <a-tag v-if="record.payType == 0">余额支付</a-tag>
                 <a-tag v-if="record.payType == 1"
                   ><WechatOutlined class="tag-icon" />微信支付</a-tag
                 >
@@ -144,15 +145,14 @@
               {{ record.orderInfoList }}
             </template>
             <template v-if="column.key === 'orderStatus'">
-              <span
-                v-if="record.orderStatus == 0"
-                class="ele-text-primary"
-              ></span>
+              <span v-if="record.orderStatus == 0" class="ele-text-primary"
+                >未使用</span
+              >
               <span v-if="record.orderStatus == 2" class="ele-text-placeholder"
                 >已取消</span
               >
               <span v-if="record.orderStatus == 1" class="ele-text-success"
-                >已付款</span
+                >已完成</span
               >
               <span v-if="record.orderStatus == 3" class="ele-text-placeholder"
                 >已取消</span
@@ -182,8 +182,6 @@
             <template v-if="column.key === 'action'">
               <a-space>
                 <a @click="openEdit(record)">详情</a>
-                <!--                <a-divider type="vertical" />-->
-                <!--                <a @click="openEdit(record)">编辑</a>-->
               </a-space>
             </template>
           </template>
@@ -202,10 +200,6 @@
     ExclamationCircleOutlined,
     CheckOutlined,
     CloseOutlined,
-    ClockCircleOutlined,
-    IdcardOutlined,
-    WechatOutlined,
-    CoffeeOutlined,
     AlipayCircleOutlined
   } from '@ant-design/icons-vue';
   import { EleProTable, toDateString } from 'ele-admin-pro';
@@ -215,14 +209,9 @@
   } from 'ele-admin-pro/es/ele-pro-table/types';
   import Search from './components/search.vue';
   import OrderInfo from './components/orderInfo.vue';
-  import {
-    pageOrder,
-    removeOrder,
-    removeBatchOrder
-  } from '@/api/booking/order';
-  import type { Order, OrderParam } from '@/api/booking/order/model';
+  import { pageOrder, removeOrder, removeBatchOrder } from '@/api/shop/order';
+  import type { Order, OrderParam } from '@/api/shop/order/model';
   import { formatNumber } from 'ele-admin-pro/es';
-  import { getMerchantId } from '@/utils/common';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -249,9 +238,10 @@
     if (filters) {
       where.status = filters.status;
     }
+    // 商城订单
     where.type = 0;
-    // where.sceneType = 'showOrderGoods';
-    where.merchantId = getMerchantId();
+    // where.sceneType = 'showOrderInfo';
+    // where.merchantId = getMerchantId();
     return pageOrder({
       ...where,
       ...orders,