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

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

src/views/shop/goods/index.vue

@@ -16,7 +16,6 @@
             <search
               @search="reload"
               :selection="selection"
-              :merchantId="merchantId"
               @add="openEdit"
               @remove="removeBatch"
               @batchMove="openMove"
@@ -84,7 +83,6 @@
       <!-- 编辑弹窗 -->
       <GoodsEdit
         v-model:visible="showEdit"
-        :merchantId="merchantId"
         :data="current"
         @done="reload"
       />
@@ -114,6 +112,7 @@
   import router from '@/router';
   import { openSpmUrl, openUrl } from '@/utils/common';
   import { getSiteDomain } from '@/utils/domain';
+  import { getMerchantId } from '@/utils/merchant';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -126,8 +125,6 @@
   const showEdit = ref(false);
   // 是否显示批量移动弹窗
   const showMove = ref(false);
-  // 店铺ID
-  const merchantId = ref<number>();
   // 网站域名
   const domain = getSiteDomain();
 
@@ -142,9 +139,7 @@
     if (filters) {
       where.status = filters.status;
     }
-    if (merchantId.value) {
-      where.merchantId = merchantId.value;
-    }
+    where.merchantId = getMerchantId();
     return pageGoods({
       ...where,
       ...orders,
@@ -404,7 +399,9 @@
   watch(
     () => router.currentRoute.value.params.id,
     (id) => {
-      merchantId.value = Number(id);
+      if (id && Number(id) > 0) {
+        localStorage.setItem('MerchantId', `${id}`);
+      }
       reload();
     },
     { immediate: true }