修复：图形验证码大写不识别

修复：按商户ID查询订单、商品、分类等

src/views/shop/order/components/search.vue

@@ -7,6 +7,11 @@
         <a-radio-button :value="0">未付款</a-radio-button>
         <a-radio-button :value="1">已付款</a-radio-button>
       </a-radio-group>
+      <span class="text-gray-400">订单类型</span>
+      <a-radio-group v-model:value="where.type" @change="search">
+        <a-radio-button :value="0">商城订单</a-radio-button>
+        <a-radio-button :value="1">外面订单</a-radio-button>
+      </a-radio-group>
       <span class="text-gray-400">付款方式</span>
       <a-radio-group v-model:value="where.payType" @change="search">
         <a-radio-button :value="4">现金</a-radio-button>
@@ -34,6 +39,7 @@
       <SelectMerchant
         :placeholder="`选择场馆`"
         class="input-item"
+        v-if="!merchantId"
         v-model:value="where.merchantName"
         @done="chooseMerchantId"
       />
@@ -70,6 +76,7 @@
   import { Merchant } from '@/api/shop/merchant/model';
   import { listOrder } from '@/api/shop/order';
   import { Order, OrderParam } from '@/api/shop/order/model';
+  import { getMerchantId } from "@/utils/merchant";
 
   const props = withDefaults(
     defineProps<{
@@ -88,10 +95,13 @@
 
   // 表单数据
   const { where, resetFields } = useSearch<OrderParam>({
-    type: 1,
+    type: undefined,
+    payStatus: undefined,
     createTimeStart: undefined,
     createTimeEnd: undefined,
     categoryId: undefined,
+    payType: undefined,
+    isInvoice: undefined,
     week: undefined,
     keywords: undefined
   });
@@ -101,6 +111,7 @@
   const dateRange = ref<[string, string]>(['', '']);
   const orders = ref<Order[] | any[]>();
   const xlsFileName = ref<string>();
+  const merchantId = getMerchantId();
 
   /* 搜索 */
   const search = () => {

src/views/shop/order/index.vue

@@ -1,7 +1,20 @@
 <template>
   <div class="page">
+    <a-card>
+      <search
+        @search="reload"
+        :selection="selection"
+        @add="openEdit"
+        @remove="removeBatch"
+        @batchMove="openMove"
+      />
+    </a-card>
     <div class="ele-body">
-      <a-card :bordered="false" :body-style="{ padding: '16px' }">
+      <a-card
+        title="订单列表"
+        :bordered="false"
+        :body-style="{ padding: '16px' }"
+      >
         <ele-pro-table
           ref="tableRef"
           row-key="orderId"
@@ -9,18 +22,10 @@
           :datasource="datasource"
           :customRow="customRow"
           :scroll="{ x: 800 }"
+          :toolbar="false"
           tool-class="ele-toolbar-form"
           class="sys-org-table"
         >
-          <template #toolbar>
-            <search
-              @search="reload"
-              :selection="selection"
-              @add="openEdit"
-              @remove="removeBatch"
-              @batchMove="openMove"
-            />
-          </template>
           <template #bodyCell="{ column, record }">
             <template v-if="column.key === 'image'">
               <a-image :src="record.image" :width="50" />
@@ -212,6 +217,7 @@
   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/merchant";
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -239,9 +245,9 @@
       where.status = filters.status;
     }
     // 商城订单
-    where.type = 0;
+    // where.type = 0;
     // where.sceneType = 'showOrderInfo';
-    // where.merchantId = getMerchantId();
+    where.merchantId = getMerchantId();
     return pageOrder({
       ...where,
       ...orders,