优化店铺商品及分类管理

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

@@ -73,6 +73,7 @@
     isShow: undefined,
     stock: undefined,
     categoryId: undefined,
+    merchantId: undefined,
     keywords: ''
   });
 
@@ -104,7 +105,7 @@
   };
 
   const reload = () => {
-    getCount().then((data: any) => {
+    getCount(where).then((data: any) => {
       goodsCount.value = data;
     });
     emit('search', where);
@@ -138,9 +139,16 @@
   //   () => {}
   // );
   watch(
-    currentRoute,
-    () => {
-      reload();
+    () => props.merchantId,
+    (id) => {
+      if (Number(id) > 0) {
+        where.merchantId = id;
+        reload();
+      }else{
+        where.merchantId = undefined;
+        reload();
+      }
+
     },
     { immediate: true }
   );

src/views/shop/goodsCategory/components/merchant-category-edit.vue

@@ -212,7 +212,8 @@
           // menuType 对应的值与后端不一致在前端处理
           // menuType: form.menuType === 2 ? 1 : 0,
           parentId: form.parentId || 0,
-          merchantId: props.merchantId
+          merchantId: props.merchantId,
+          type: 1
         };
         const saveOrUpdate = isUpdate.value
           ? updateGoodsCategory

src/views/shop/goodsCategory/index.vue

@@ -258,7 +258,9 @@
   // 表格数据源
   const datasource: DatasourceFunction = ({ where }) => {
     where.title = searchText.value;
+    where.type = 0;
     if (merchantId.value) {
+      where.type = 1;
       where.merchantId = merchantId.value;
     }
     return listGoodsCategory({ ...where });