From a472af35939c1d809959b0d1b3341752d5069d1e Mon Sep 17 00:00:00 2001
From: xuan <w1359774872@gmail.com>
Date: Wed, 26 Oct 2022 11:55:46 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E8=B4=AD=E7=89=A9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2):=20=E4=BF=AE=E5=A4=8Dloading=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=B6=E5=80=99=E9=97=AA=E7=8E=B0?=
 =?UTF-8?q?=E7=A9=BA=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/loadingCard/index.tsx          | 44 +++++++++----------
 src/components/shoppingCart/index.tsx         |  1 +
 .../shoppingCartItem/index.module.scss        |  4 +-
 src/pages/shopping/index.tsx                  | 17 +++----
 src/use/useHttp.ts                            |  4 +-
 5 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/src/components/loadingCard/index.tsx b/src/components/loadingCard/index.tsx
index 79efa2f..9ca0b31 100644
--- a/src/components/loadingCard/index.tsx
+++ b/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>
+    </>
+  )
 })
diff --git a/src/components/shoppingCart/index.tsx b/src/components/shoppingCart/index.tsx
index 1a4711f..b33a8ca 100644
--- a/src/components/shoppingCart/index.tsx
+++ b/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,
diff --git a/src/pages/shopping/components/shoppingCartItem/index.module.scss b/src/pages/shopping/components/shoppingCartItem/index.module.scss
index c4be662..b95ed11 100644
--- a/src/pages/shopping/components/shoppingCartItem/index.module.scss
+++ b/src/pages/shopping/components/shoppingCartItem/index.module.scss
@@ -18,7 +18,8 @@
 }
 
 .line {
-  margin: 16px 0;
+  margin-top: 32px;
+  margin-bottom: 12px;
 }
 
 .topItem {
@@ -46,7 +47,6 @@
   box-sizing: border-box;
   overflow: hidden;
   .orderTitle {
-    padding: 0 24px;
     display: flex;
     align-items: center;
     color: $color_font_one;
diff --git a/src/pages/shopping/index.tsx b/src/pages/shopping/index.tsx
index 07cd63b..3d8bee4 100644
--- a/src/pages/shopping/index.tsx
+++ b/src/pages/shopping/index.tsx
@@ -15,7 +15,6 @@ import { dataLoadingStatus, debounce, getFilterData } from '@/common/util'
 import { ShoppingProvider } from './components/shoppingCart/index'
 import { Goods, ShoppingDispatchType, useShoppingDispatch, useShoppingState } from './context'
 import { alert, goLink, isEmptyObject } from '@/common/common'
-import LoadingCard from '@/components/loadingCard'
 
 export const Shopping: FC = memo(() => {
   // 计算总的预估金额
@@ -91,6 +90,7 @@ const ShoppingCartContainer: FC<InternalContainer> = () => {
 
   //数据加载状态
   const statusMore = useMemo(() => {
+    console.log('shoppingCartData==>', shoppingCartData, state)
     const status = dataLoadingStatus({
       list: shoppingCartData.list,
       total: shoppingCartData.total,
@@ -122,12 +122,11 @@ const ShoppingCartContainer: FC<InternalContainer> = () => {
     })()
   }, [])
 
-  const [isPending, startTransition] = useTransition()
 
   useEffect(() => {
-    startTransition(() => {
+    if (state.success) {
       setShoppingCartData({ list: state.data, total: state.data.length })
-    })
+    }
   }, [state])
 
   // 结算
@@ -209,8 +208,6 @@ const ShoppingCartContainer: FC<InternalContainer> = () => {
     }
   }
 
-  
-
   return (
     <View className={classnames('flex-col', styles.shopping)} id='shoppingContainer'>
       <View className={styles['shopping--topBar']} id='topBar'>
@@ -227,14 +224,10 @@ const ShoppingCartContainer: FC<InternalContainer> = () => {
       <View className={classnames('flex-item', 'flex-col', styles['shopping--context'])}>
         <View id='shoppingListContainer' className={classnames(styles.shopping__list__container, 'flex-item')} style={{ height: listHeightRef.current }}>
           <InfiniteScroll statusMore={statusMore} refresherEnabled={true} selfOnRefresherRefresh={handleRefresh} refresherTriggered={refreshStatus}>
-            {isPending ? (
-              <LoadingCard />
-            ) : (
-              !!shoppingCartData?.list?.length &&
+            {!!shoppingCartData?.list?.length &&
               shoppingCartData?.list?.map((item, index) => {
                 return <ItemList itemData={item} key={index}></ItemList>
-              })
-            )}
+              })}
           </InfiniteScroll>
         </View>
       </View>
diff --git a/src/use/useHttp.ts b/src/use/useHttp.ts
index 5dd7418..3373d8e 100644
--- a/src/use/useHttp.ts
+++ b/src/use/useHttp.ts
@@ -23,12 +23,12 @@ type Params = {
   page?: number
   pageSize?: number
 }
-
+type OptionData = Record<string,any> | any[] | null
 type option = {
   url?: string
   method?: 'get' | 'post' | 'put' | 'delete'
   type?: string
-  data?: any
+  data?: OptionData
   page?: number
   pageSize?: number
   pagination?: true | false