合并

src/components/infiniteScroll/index.tsx

@@ -1,5 +1,5 @@
 import { ScrollView, View } from "@tarojs/components"
-import { memo, ReactNode, useState } from "react"
+import { memo, ReactNode, useMemo, useState } from "react"
 import style from "./index.module.scss"
 import DotLoading from "@/components/dotLoading"
 import LoadingCard from "../loadingCard"
@@ -64,6 +64,13 @@ export default memo(({
         selfOnRefresherAbort?.()
     }
 
+    //返回顶部
+    const scrollTop = useMemo(() => {
+        if(statusMore == 0) {
+            return 0.1
+        }
+    },[statusMore])
+
     return (
         <>
             <ScrollView 
@@ -81,6 +88,7 @@ export default memo(({
                 onRefresherRestore = {() => refresherRestore()}
                 onRefresherAbort = {() => refresherAbort()}
                 refresherBackground ='#F8F8F8'
+                scrollTop={scrollTop}
             >
                 {!moreStatus&&<>
                     <View style={{paddingBottom:paddingBottom + 'rpx'}} className={style.scrollViewCon}>

src/components/orderBtns/index.module.scss

@@ -1,7 +1,7 @@
 .btns_list{
     display: flex;
     justify-content: flex-end;
-    margin-top: 30px;
+    // margin-top: 30px;
     .btns_item{
         width: 152px;
         height: 72px;

src/components/shopCart/index.tsx

@@ -202,6 +202,7 @@ export default ({show = false, onClose}: param) => {
         } else {
             let ids = selectIds.current.join('-')
             setParam({ids, sale_mode:selectIndex})
+            closePopup()
             goLink('/pages/order/comfirm')
         }
     }, 500)