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,62 +112,66 @@ const GoodsGroup = options => {
   return (
     <div className={styles.groupBox}>
       {(shops && shops.length && (
-        <div className={styles['groupBox-title']}>
-          <div className={styles['groupBox-title--name']}>所属门店</div>
-          <Select
-            showSearch
-            value={options.shopId}
-            placeholder="请选择所属门店"
-            onChange={options.changeShop}
-            filterOption={(input, option) =>
-              (option?.label ?? '').toLowerCase().includes(input.toLowerCase())
-            }
-            options={shops}
-          />
-        </div>
+        <>
+          <div className={styles['groupBox-title']}>
+            <div className={styles['groupBox-title--name']}>所属门店</div>
+            <Select
+              showSearch
+              value={options.shopId}
+              placeholder="请选择所属门店"
+              onChange={options.changeShop}
+              filterOption={(input, option) =>
+                (option?.label ?? '').toLowerCase().includes(input.toLowerCase())
+              }
+              options={shops}
+            />
+          </div>
+          <div className={styles['groupBox-title']}>
+            <div className={styles['groupBox-title--name']}>商品分组</div>
+            <Button onClick={() => setGroupEdit(!groupEdit)}>
+              {groupEdit ? '完成' : '编辑分组'}
+            </Button>
+          </div>
+          <div className={styles['groupBox-body']}>
+            {groupEdit ? (
+              <DndProvider backend={HTML5Backend}>
+                <div className={styles['groupBox-body--dragbox']}>
+                  {tags.map((item, index) => (
+                    <DragTag
+                      changePosition={changePosition}
+                      endChangePosition={endChangePosition}
+                      index={index}
+                      {...item}
+                      selected={selected}
+                      edit={handleEdit}
+                      del={handleDelete}
+                      key={item.id}
+                    />
+                  ))}
+                  <InsertTag handleOpen={handleEdit} />
+                </div>
+              </DndProvider>
+            ) : (
+              <div className={styles['groupBox-body--dragbox']}>
+                {tags.map(item => (
+                  <Tag
+                    key={item.id}
+                    onClick={() => onSelect(item.id)}
+                    className={[
+                      styles['groupBox-body--tag-normal'],
+                      selected === item.id ? styles['groupBox-body--tag__cur'] : '',
+                    ]}
+                  >
+                    <span className={styles['groupBox-body--tag__text']}>{item.text}</span>
+                  </Tag>
+                ))}
+                <InsertTag key="insert" handleOpen={handleEdit} />
+              </div>
+            )}
+          </div>
+        </>
       )) ||
         ''}
-      <div className={styles['groupBox-title']}>
-        <div className={styles['groupBox-title--name']}>商品分组</div>
-        <Button onClick={() => setGroupEdit(!groupEdit)}>{groupEdit ? '完成' : '编辑分组'}</Button>
-      </div>
-      <div className={styles['groupBox-body']}>
-        {groupEdit ? (
-          <DndProvider backend={HTML5Backend}>
-            <div className={styles['groupBox-body--dragbox']}>
-              {tags.map((item, index) => (
-                <DragTag
-                  changePosition={changePosition}
-                  endChangePosition={endChangePosition}
-                  index={index}
-                  {...item}
-                  selected={selected}
-                  edit={handleEdit}
-                  del={handleDelete}
-                  key={item.id}
-                />
-              ))}
-              <InsertTag handleOpen={handleEdit} />
-            </div>
-          </DndProvider>
-        ) : (
-          <div className={styles['groupBox-body--dragbox']}>
-            {tags.map(item => (
-              <Tag
-                key={item.id}
-                onClick={() => onSelect(item.id)}
-                className={[
-                  styles['groupBox-body--tag-normal'],
-                  selected === item.id ? styles['groupBox-body--tag__cur'] : '',
-                ]}
-              >
-                <span className={styles['groupBox-body--tag__text']}>{item.text}</span>
-              </Tag>
-            ))}
-            <InsertTag key="insert" handleOpen={handleEdit} />
-          </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,13 +177,16 @@ const Takeaway = options => {
     <div className={styles.takeawayBox}>
       <Spin spinning={loading}>
         <GoodsGroup shopId={shopId} changeShop={setShopId} changeGroup={setGroupId} />
-        <ActionBar
-          selectedRowKeys={selectedRowKeys}
-          shopId={shopId}
-          handleSearch={getDataList}
-          openModal={openModal}
-          newGoods={onNew}
-        />
+        {(shopId && (
+          <ActionBar
+            selectedRowKeys={selectedRowKeys}
+            shopId={shopId}
+            handleSearch={getDataList}
+            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 () => {