Merge branch 'master' of http://git.ycjcjy.com/shigongli/client-s

src/pages/batchimport/index.jsx

@@ -165,7 +165,7 @@ const batchimport = props => {
             value={["取消", "上传"]}
             onClick={[
               e => {
-                setLabelList([]);
+        
                 setPageState("1");
               },
               e => onSave(e)

src/pages/shop/index.jsx

@@ -19,10 +19,12 @@ const account = props => {
   ]);
 
   console.log(props, radioHouseState);
-  useEffect(() => {}, []);
+  useEffect(() => {
+    getShopList({ pageNum: 1, pageSize: 10 });
+  }, []);
 
   useDidShow(() => {
-    getShopList({ pageNum: 1, pageSize: 10 });
+    
   });
 
   function getShopList(params) {