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

src/components/loadingCard/index.tsx

@@ -1,26 +1,26 @@
-import { View, Image } from "@tarojs/components"
-import Loading from "@/components/loading"
-import style from "./index.module.scss"
-import { memo } from "react";
+import { View, Image } from '@tarojs/components'
+import Loading from '@/components/loading'
+import style from './index.module.scss'
+import { memo } from 'react'
 
 type Params = {
-    title?: string,
-    loadingIcon?: false | true
+  title?: string
+  loadingIcon?: boolean
 }
-export default memo(({
-    title = "加载中...", //显示的文字
-    loadingIcon = true //是否显示加载图标
-}: Params) => {
-    console.log('loadingCard:::')
-    return (
-        <>
-            <View className={style.loadingCard_main}>
-                {loadingIcon && <Loading />}
-                {
-                    !loadingIcon && <Image className={style.pic} mode='aspectFill' lazyLoad src={'https://cdn.zzfzyc.com/empty.png'}></Image>
-                }
-                <View className={style.loading_text}>{title}</View>
-            </View>
-        </>
-    )
+export default memo((props: Params) => {
+  console.log(props)
+  const {
+    title = '加载中...', //显示的文字
+    loadingIcon = true, //是否显示加载图标
+  } = props
+  console.log('loadingCard:::', props)
+  return (
+    <>
+      <View className={style.loadingCard_main}>
+        {loadingIcon && <Loading />}
+        {!loadingIcon && <Image className={style.pic} mode='aspectFill' lazyLoad src={'https://cdn.zzfzyc.com/empty.png'}></Image>}
+        <View className={style.loading_text}>{title}</View>
+      </View>
+    </>
+  )
 })

src/components/shoppingCart/index.tsx

@@ -9,6 +9,7 @@ import BottomCustomer from "@/components/BottomCustomer"
 import VirtualList from '@tarojs/components/virtual-list'
 import DotLoading from "@/components/dotLoading"
 import Divider from '../divider';
+
 interface prosObj {
     showPopup?: false | true,
     closePopup?: () => void,