修复了没有商品时商品列表加载动画不能结束的问题

xuweigegithub · Apr 7, 2020 · b4cb0d7 · b4cb0d7
1 parent 2c9fcd0
commit b4cb0d7
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/client/src/views/Home/Main/warehouse/Commodity/index.jsx b/client/src/views/Home/Main/warehouse/Commodity/index.jsx
@@ -62,29 +62,30 @@ export function Commodity() {
             setOriginList(data);
 
 
-            if (data.length === 0) return;
-            // 切换需要展示的商品
-            if (id) {
-                dispatch(createWareCommodityAction(id));
-            } else if (newCommodityIdFlag) {
-                dispatch(createWareCommodityAction(newCommodityIdFlag));
-            } else if (queryCommodityIdFlag) {
-
+            if (data.length !== 0) {
+                // 切换需要展示的商品
+                if (id) {
+                    dispatch(createWareCommodityAction(id));
+                } else if (newCommodityIdFlag) {
+                    dispatch(createWareCommodityAction(newCommodityIdFlag));
+                } else if (queryCommodityIdFlag) {
+
+
+                    let selectId = queryCommodityIdFlag;
+                    setTimeout(() => {
+                        setSelect({
+                            selectId,
+                            selectType: "down"
+                        });
+                    });
 
-                let selectId = queryCommodityIdFlag;
-                setTimeout(() => {
+                    queryCommodityIdFlag = null;
+                } else {
                     setSelect({
-                        selectId,
-                        selectType: "down"
+                        selectId: data[0] && data[0].id || -1,
+                        selectType: "origin"
                     });
-                });
-
-                queryCommodityIdFlag = null;
-            } else {
-                setSelect({
-                    selectId: data[0] && data[0].id || -1,
-                    selectType: "origin"
-                });
+                }
             }
 
             setSpinStatus(false);