Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.env
#	.env.development
#	.env.production
#	src/api/shop/shopGoods/index.ts
#	src/views/shop/shopGoods/components/search.vue
#	src/views/shop/shopGoods/index.vue

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

@@ -25,11 +25,11 @@
       </template>
       <span>导入</span>
     </a-button>
-    <a-button type="dashed" class="ele-btn-icon" @click="openCollect">
+    <a-button type="dashed" class="ele-btn-icon" @click="openImageImport">
       <template #icon>
-        <LinkOutlined />
+        <UploadOutlined />
       </template>
-      <span>采集</span>
+      <span>导入图片</span>
     </a-button>
     <a-button type="dashed" class="ele-btn-icon" @click="handleExport">
       导出xls
@@ -70,10 +70,10 @@
 </template>
 
 <script lang="ts" setup>
-  import { PlusOutlined, DeleteOutlined, UploadOutlined, LinkOutlined } from '@ant-design/icons-vue';
+  import { PlusOutlined, DeleteOutlined, UploadOutlined } from '@ant-design/icons-vue';
   import { ref, watch } from 'vue';
   import { getCount } from '@/api/shop/shopGoods';
-  import type { GoodsCount, ShopGoods, ShopGoodsParam } from '@/api/shop/shopGoods/model';
+  import type { GoodsCount, ShopGoodsParam } from '@/api/shop/shopGoods/model';
   import useSearch from '@/utils/use-search';
   import { getMerchantId } from '@/utils/merchant';
   import { ShopGoodsCategory } from '@/api/shop/shopGoodsCategory/model';
@@ -81,7 +81,7 @@
   const props = withDefaults(
     defineProps<{
       // 选中的角色
-      selection?: ShopGoods[];
+      selection?: [];
       merchantId?: number;
       navigationList?: ShopGoodsCategory[];
     }>(),
@@ -111,7 +111,7 @@
     (e: 'remove'): void;
     (e: 'batchMove'): void;
     (e: 'import'): void;
-    (e: 'collect'): void;
+    (e: 'imageImport'): void;
     (e: 'export'): void;
   }>();
 
@@ -130,9 +130,8 @@
     emit('import');
   };
 
-  // 打开链接采集
-  const openCollect = () => {
-    emit('collect');
+  const openImageImport = () => {
+    emit('imageImport');
   };
 
   // 导出
@@ -140,7 +139,7 @@
     emit('export');
   };
 
-  const handleSearch = (e: any) => {
+  const handleSearch = (e) => {
     const text = e.target.value;
     resetFields();
     if (text === '出售中') {