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

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

src/views/shop/merchant/components/merchantEdit.vue

@@ -456,7 +456,6 @@
         listRoles({ roleCode: 'merchant' }).then((res) => {
           form.roleId = res[0].roleId;
           form.roleName = res[0].roleName;
-          form.tenantId = Number(localStorage.getItem('TenantId'));
         });
       } else {
         resetFields();

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

@@ -1,6 +1,6 @@
 <!-- 搜索表单 -->
 <template>
-  <a-space :size="10" style="flex-wrap: wrap">
+  <a-space :size="10" style="flex-wrap: wrap" v-if="!merchantId">
     <a-button type="primary" class="ele-btn-icon" @click="add">
       <template #icon>
         <PlusOutlined />
@@ -35,6 +35,8 @@
   import { openUrl } from '@/utils/common';
   import router from '@/router';
   import { getMerchant } from '@/api/shop/merchant';
+  import merchant from "@/views/shop/merchant/index.vue";
+  import { getMerchantId } from "@/utils/merchant";
 
   const props = withDefaults(
     defineProps<{
@@ -50,6 +52,7 @@
     (e: 'remove'): void;
     (e: 'batchMove'): void;
   }>();
+  const merchantId = getMerchantId();
 
   // 新增
   const add = () => {