Merge branch 'dev' of ssh://git.online.zzfzyc.com:10022/mp/spider_cloud_warehouse into 订单页

src/components/empty/index.module.scss

@@ -8,7 +8,6 @@
     .pic {
         width: 522px;
         height: 322px; 
-        background: #fff;
         // opacity: 0.3;
         margin-bottom: 24px;
     }

src/components/empty/index.tsx

@@ -16,7 +16,7 @@ export default memo((pros: PropsObj) => {
     return (
         <View className={styles.mainBox}>
             <Image className={styles.pic} mode='aspectFill' lazyLoad src={picUrl}></Image>
-            <View className={styles.fonst}>{text}</View>
+            <View className={styles.text}>{text}</View>
         </View>
     )
 })

src/components/infiniteScroll/index.tsx

@@ -107,7 +107,7 @@ export default memo(
                 </View>
               )}
               {statusMore == 0 && <LoadingCard />}
-              {statusMore == 1 && emptySlot ? emptySlot : <Empty picUrl={SEARCH_EMPTY_IMAGE} text='暂无数据'/>}
+              {statusMore == 1 && (emptySlot ? emptySlot : <Empty picUrl={SEARCH_EMPTY_IMAGE} text='暂无数据'/>)}
             </>
           )
         }