fix(添加无规格数据): 无规格时被驳回编辑重新创建数据

config/env.config.js

 const isProduction = process.env.NODE_ENV === 'production';
 
 let envAPi = {
-  api: '//backstms-gyl2.liangkebang.net',
-  kdspOpApi: 'https://kdsp-operation-gyl2.liangkebang.net',
+  api: '//backstms-test1.liangkebang.net',
+  kdspOpApi: 'https://kdsp-operation-test1.liangkebang.net',
   // kdspApi: 'http://192.168.28.107:7000',
-  kdspApi: 'https://sc-op-api-gyl2.liangkebang.net',
-  prologueDomain: 'https://prologue-gyl2.liangkebang.net',
+  kdspApi: 'https://sc-op-api-test1.liangkebang.net',
+  prologueDomain: 'https://prologue-test1.liangkebang.net',
   qiniuHost: 'https://appsync.lkbang.net',
-  opapiHost: 'https://opapi-gyl2.liangkebang.net',
+  opapiHost: 'https://opapi-test1.liangkebang.net',
   // opapiHost: 'http://192.168.29.45:7000',
 };
 

src/pages/GoodsManage/createModal/batchSetting.jsx

@@ -157,17 +157,19 @@ class goodsManage extends Component {
             />,
           )}
         </FormItem>
-        <FormItem>
-          {getFieldDecorator('productStockWarning', {})(
-            <InputNumber
-              placeholder="库存预警"
-              maxLength={5}
-              min={0}
-              precision={0}
-              style={{ width: 100 }}
-            />,
-          )}
-        </FormItem>
+        {productType === 1 && (
+          <FormItem>
+            {getFieldDecorator('productStockWarning', {})(
+              <InputNumber
+                placeholder="库存预警"
+                maxLength={5}
+                min={0}
+                precision={0}
+                style={{ width: 100 }}
+              />,
+            )}
+          </FormItem>
+        )}
         <FormItem>
           <Button type="primary" htmlType="submit" onClick={this.batchSetting}>
             批量设置

src/pages/GoodsManage/createModal/index.jsx

@@ -71,9 +71,13 @@ class goodsManage extends Component {
 
   // 获取规格列表
   getSpecData = async () => {
-    const { data } = await getSpecList();
-    if (data) {
-      this.setState({ specList: data });
+    try {
+      const { data } = await getSpecList();
+      if (data) {
+        this.setState({ specList: data });
+      }
+    } catch (e) {
+      console.log(e);
     }
   };
 
@@ -139,9 +143,13 @@ class goodsManage extends Component {
   };
 
   getBrandData = async () => {
-    const { data } = await getBrandList();
-    const list = data && data.filter(item => item.name === '虚拟商品');
-    this.setState({ normalBrandList: data, brandList: list });
+    try {
+      const { data } = await getBrandList();
+      const list = data && data.filter(item => item.name === '虚拟商品');
+      this.setState({ normalBrandList: data, brandList: list });
+    } catch (e) {
+      console.log(e);
+    }
   };
 
   changeStep = () => {
@@ -266,7 +274,7 @@ class goodsManage extends Component {
     });
   };
 
-  createShopInfo = () => {
+  createShopInfo = isEdit => {
     const {
       form: { getFieldsValue },
       initData,
@@ -724,7 +732,7 @@ class goodsManage extends Component {
               <Button
                 type="primary"
                 className={styles.logBtn}
-                onClick={() => this.createShopInfo()}
+                onClick={() => this.createShopInfo(isEdit)}
               >
                 生成商品信息
               </Button>

src/pages/GoodsManage/createModal/mixin.jsx

@@ -118,7 +118,17 @@ export function createEditData(values, initData) {
       const list2 = second.length
         ? createNewList(newFirst, second, values.firstSpecId, values.secondSpecId)
         : [];
-      list = sortBy(initData.editData.concat(list1.concat(list2)), item => item.firstSpecValue);
+
+      // 初次添加规格时没有选择规格，添加一条没有规格的商品，被驳回之后编辑时选择规格之后需要重新创建
+      // 编辑时回显时的id需要给重新创建的数据第一条加上 回显的id
+      if (!initData.editData[0]?.firstSpec && !initData.editData[0]?.secondSpec) {
+        list = createNewList(first, second, values.firstSpecId, values.secondSpecId);
+        // 这种情况出现时items中只有一条数据
+        // 第一次无规格时，重新生成的数据，必须保留第一条数据的id是items里面第一条数据的id
+        list[0].id = initData.editData[0].id;
+      } else {
+        list = sortBy(initData.editData.concat(list1.concat(list2)), item => item.firstSpecValue);
+      }
     }
   }
   return list;

src/pages/GoodsManage/index.jsx

@@ -13,7 +13,6 @@ import {
   update,
   spuDetail,
   detail,
-  getSupplierList,
   batchPushedOrOffline,
   categoryList,
   getVirtualCategory,
@@ -275,15 +274,23 @@ class goodsManage extends Component {
   };
 
   categoryList = async () => {
-    const { data: treeData } = await categoryList();
-    if (!treeData) return;
-    this.setState({ treeData });
+    try {
+      const { data: treeData } = await categoryList();
+      if (!treeData) return;
+      this.setState({ treeData });
+    } catch (e) {
+      console.log(e);
+    }
   };
 
   getVirtualCategory = async () => {
-    const { data: virtualTreeData } = await getVirtualCategory();
-    if (!virtualTreeData) return;
-    this.setState({ virtualTreeData });
+    try {
+      const { data: virtualTreeData } = await getVirtualCategory();
+      if (!virtualTreeData) return;
+      this.setState({ virtualTreeData });
+    } catch (e) {
+      console.log(e);
+    }
   };
 
   render() {
@@ -357,11 +364,12 @@ class goodsManage extends Component {
               this.setState({ previewVisible: false });
             }}
             title="商品预览"
+            bodyStyle={{ height: '90%' }}
           >
             <iframe
               src={this.state.src}
               frameBorder="0"
-              height="600"
+              height="100%"
               width="375"
               title="商品预览"
             ></iframe>