Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui...

Merge branch 'feature/goods-list' of git.quantgroup.cn:ui/merchant-manage-ui into feature/20230327_public_takeaway

src/pages/GoodsManage/Takeaway/components/GoodsGroup.jsx

@@ -21,13 +21,14 @@ const GoodsGroup = options => {
     const json = JSON.parse(user);
     const res = await apiSupplierShopList(json.id);
     if (res && res.data && res.data.length > 0) {
-      setShops(
-        res.data.map(item => ({
-          label: item.name,
-          value: +item.id,
-        })),
-      );
-      options.changeShop(+res.data[0].id);
+      // setShops(
+      //   res.data.map(item => ({
+      //     label: item.name,
+      //     value: +item.id,
+      //   })),
+      // );
+      // options.changeShop(+res.data[0].id);
+      options.changeShop(0);
     } else {
       options.changeShop(0);
     }
@@ -111,6 +112,7 @@ const GoodsGroup = options => {
   return (
     <div className={styles.groupBox}>
       {(shops && shops.length && (
+        <>
           <div className={styles['groupBox-title']}>
             <div className={styles['groupBox-title--name']}>所属门店</div>
             <Select
@@ -124,11 +126,11 @@ const GoodsGroup = options => {
               options={shops}
             />
           </div>
-      )) ||
-        ''}
           <div className={styles['groupBox-title']}>
             <div className={styles['groupBox-title--name']}>商品分组</div>
-        <Button onClick={() => setGroupEdit(!groupEdit)}>{groupEdit ? '完成' : '编辑分组'}</Button>
+            <Button onClick={() => setGroupEdit(!groupEdit)}>
+              {groupEdit ? '完成' : '编辑分组'}
+            </Button>
           </div>
           <div className={styles['groupBox-body']}>
             {groupEdit ? (
@@ -167,6 +169,9 @@ const GoodsGroup = options => {
               </div>
             )}
           </div>
+        </>
+      )) ||
+        ''}
       <GroupInfo
         isModalOpen={isModalOpen}
         id={storageId}

src/pages/GoodsManage/Takeaway/components/GroupInfo.jsx

@@ -50,12 +50,7 @@ const GroupInfo = options => {
     }
   }, [options.id, options.isModalOpen]);
 
-  const extra = (
-    <Alert
-      message="选中后，顾客下单需至少选择1个“下单必选分组”商品每店仅可设置1个必点分组"
-      type="error"
-    />
-  );
+  const extra = <Alert message="选中后，顾客下单需至少选择1个“下单必选分组”" type="error" />;
 
   return (
     <Modal
@@ -63,6 +58,7 @@ const GroupInfo = options => {
       visible={options.isModalOpen}
       destroyOnClose
       maskClosable={false}
+      width="600px"
       onOk={handleConfirm}
       onCancel={handleCancel}
     >

src/pages/GoodsManage/Takeaway/index.jsx

@@ -177,6 +177,7 @@ const Takeaway = options => {
     <div className={styles.takeawayBox}>
       <Spin spinning={loading}>
         <GoodsGroup shopId={shopId} changeShop={setShopId} changeGroup={setGroupId} />
+        {(shopId && (
           <ActionBar
             selectedRowKeys={selectedRowKeys}
             shopId={shopId}
@@ -184,6 +185,8 @@ const Takeaway = options => {
             openModal={openModal}
             newGoods={onNew}
           />
+        )) ||
+          ''}
         <Table
           dataSource={tableData}
           bordered

src/pages/GoodsManage/index.jsx

@@ -307,6 +307,9 @@ class goodsManage extends Component {
       productType: e || 1,
     });
     this.categoryListByType(e);
+    if (e !== 5) {
+      this.handleSearch(1);
+    }
   };
 
   getVirtualCategory = async () => {