Merge branch 'dev' of http://git.ycjcjy.com/shigongli/miniapp-v2 into dev

src/components/CompoentsOrder/TobePaid/index.jsx

@@ -17,7 +17,7 @@ export default (props) => {
     Taro.navigateTo({ url: '/pages/PayOrder/index' })
   }
   return (
-    <scroll-view scroll-y style='height:100%;'  >
+    <scroll-view scrollY style='height:100%;'  >
 
       <view className='TobePaid-box'>
         <view className='OrderNumber'>订单编号：ABC123456789</view>

src/components/CompoentsOrder/TobeWritten/index.jsx

@@ -9,7 +9,7 @@ import './style.less'
 export default (props) => {
 
   return (
-    <scroll-view scroll-y style='height:100%;'  >
+    <scroll-view scrollY style='height:100%;'  >
 
 
       <view className='TobeWritten-box'>

src/components/CompoentsOrder/complete/index.jsx

@@ -110,7 +110,7 @@ export default (props) => {
 
   return (
     <scroll-view
-      scroll-y
+      scrollY
       style="height: 90vh;"
       refresher-enabled
       refresher-triggered={IsPull}

src/hotel/components/Income/income.jsx

@@ -86,26 +86,6 @@ export default (props) => {
           )}
         >
         </List>
-        {/*<view className='title' >{accountlog.length==0?'推广收入记录':'暂无推广收入'}</view>
-         <List
-          style={{ height: '50vh' }}
-          request={fetchAPI}
-          params={queryParams}
-          onDataChange={setAccountlog}
-          noData="暂无推广收入"
-        >
-          <view className='waterfall'>
-            {
-              accountlog.map((item,index) => <view className='spreadCard' key={index}>
-                <view className='card'>
-                  <view className='spreadTime'>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间：<text>{formatTime(item.createDate, 'yyyy/MM/dd hh:mm:ss')}</text></view>
-                  <view className='spreadMoney'>收入金额：<text>{parseFloat((item.amount / 100).toFixed(2))}</text>元</view>
-                  <image className='spreadImg' src={sImg} />
-                </view>
-              </view>)
-            }
-          </view>
-        </List> */}
       </view>
     </view>
   )

src/hotel/pages/landlord/roomOrder/roomOrder.jsx

@@ -45,7 +45,7 @@ export default withLayout((props) => {
   return (
     <View style={{ padding: '0 30px' }}>
       <CustomNav title={roomName ? roomName : '房间名'} />
-      <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 65px)' }}>
+      <scroll-view scrollY style={{ height: 'calc(100vh - 65px)' }}>
 
         {
           detail.length==0?<View className='houseCard'>暂无入住人数据</View>

src/pages/MineUserAll/RefundMoney/CheckRefund/index.jsx

@@ -110,141 +110,146 @@ export default withLayout((props) => {
   return (
     <view className='box-content'>
       <CustomNav title='售后退款' />
-      <view className='Refund-Content-box'>
-        <view className='title-image'>
-          <image
-            mode='scaleToFill'
-            className='title-image-cup'
-            src={BlackSpot}
-          />
-          <text className='title-title-boss'>商品信息</text>
+      <scroll-view scroll-y style='height: calc(100vh - 176rpx);' >
+
+        <view className='Refund-Content-box'>
+
+          <view className='title-image'>
+            <image
+              mode='scaleToFill'
+              className='title-image-cup'
+              src={BlackSpot}
+            />
+            <text className='title-title-boss'>商品信息</text>
+          </view>
         </view>
-      </view>
-      {/* 商品信息结束 */}
-      <view>
-        {(list || []).map((item) => {
-          return (
-            <view class='wrapper' key={item.orderId}>
-              <view class='left-complete-one'>
-                <image className='left-image-1' src={ProCard_hot}></image>
-                <view className='left-viewText'>
-                  返现￥{formatPrice(item.cashback)}
-                </view>
-                <view className='title-image'>
-                  <image
-                    className='image-1'
-                    mode='scaleToFill'
-                    src={item.poster}
-                  ></image>
-                  <image className='image-2' src={food}></image>
-                </view>
-                <view className='title-content'>
-                  <view className='Pro-title'>
-                    <view className='title-text'>
-                      {item.packageDescription}
+        {/* 商品信息结束 */}
+        <view>
+          {(list || []).map((item) => {
+            return (
+              <view class='wrapper' key={item.orderId}>
+                <view class='left-complete-one'>
+                  <image className='left-image-1' src={ProCard_hot}></image>
+                  <view className='left-viewText'>
+                    返现￥{formatPrice(item.cashback)}
+                  </view>
+                  <view className='title-image'>
+                    <image
+                      className='image-1'
+                      mode='scaleToFill'
+                      src={item.poster}
+                    ></image>
+                    <image className='image-2' src={food}></image>
+                  </view>
+                  <view className='title-content'>
+                    <view className='Pro-title'>
+                      <view className='title-text'>
+                        {item.packageDescription}
+                        <text className='title-money-2'>
+                          数量：{item.amount}张
+                        </text>
+                      </view>
+                    </view>
+                    <text className='title-money'>
+                      ￥{formatPrice(item.unitPrice)}元
                       <text className='title-money-2'>
-                        数量：{item.amount}张
+                        门市价{formatPrice(item.standardPrice)}元
                       </text>
-                    </view>
-                  </view>
-                  <text className='title-money'>
-                    ￥{formatPrice(item.unitPrice)}元
-                    <text className='title-money-2'>
-                      门市价{formatPrice(item.standardPrice)}元
                     </text>
-                  </text>
-                  <view className='title-time'>
-                    有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
-                    {formatTime(item.endTime, "yyyy/MM/dd")}
+                    <view className='title-time'>
+                      有效期：{formatTime(item?.startTime, "yyyy/MM/dd")}-
+                      {formatTime(item.endTime, "yyyy/MM/dd")}
+                    </view>
                   </view>
                 </view>
+                <view class='right-complete-two'>
+                  <view className='right-content'></view>
+                </view>
               </view>
-              <view class='right-complete-two'>
-                <view className='right-content'></view>
-              </view>
-            </view>
-          );
-        })}
-      </view>
-
-      {/* 卡片结束 */}
-      <view className='Refund-Content-box'>
-        <view className='title-image'>
-          <image
-            mode='scaleToFill'
-            className='title-image-cup'
-            src={BlackSpot}
-          />
-          <text className='title-title-boss'>退款原因</text>
+            );
+          })}
         </view>
-        {/* 退款结束 */}
-      </view>
-      <view className='Refund-content'>
-        {options.map((x) => {
-          return (
-            <text
-              className={`Refund-star-view${x.key} ${checkeds.indexOf(x.key) > -1
-                ? "bg2"
-                : `Refund-star-view${x.key}`
-                }`}
-              key={x.key}
-              onClick={() => viewOK(x)}
-            >
-              {x.title}
-            </text>
-          );
-        })}
-      </view>
-
-      <view className='Refund-Content-box'>
-        <view className='title-image'>
-          <image
-            mode='scaleToFill'
-            className='title-image-cup'
-            src={BlackSpot}
+
+        {/* 卡片结束 */}
+        <view className='Refund-Content-box'>
+          <view className='title-image'>
+            <image
+              mode='scaleToFill'
+              className='title-image-cup'
+              src={BlackSpot}
+            />
+            <text className='title-title-boss'>退款原因</text>
+          </view>
+          {/* 退款结束 */}
+        </view>
+        <view className='Refund-content'>
+          {options.map((x) => {
+            return (
+              <text
+                className={`Refund-star-view${x.key} ${checkeds.indexOf(x.key) > -1
+                  ? "bg2"
+                  : `Refund-star-view${x.key}`
+                  }`}
+                key={x.key}
+                onClick={() => viewOK(x)}
+              >
+                {x.title}
+              </text>
+            );
+          })}
+        </view>
+
+        <view className='Refund-Content-box'>
+          <view className='title-image'>
+            <image
+              mode='scaleToFill'
+              className='title-image-cup'
+              src={BlackSpot}
+            />
+            <text className='title-title-boss'>退款说明</text>
+          </view>
+        </view>
+        <view class='section'>
+          <Textarea
+            placeholder='请补充退款说明（选填）!'
+            onInput={(e) => setExplain(e.detail.value)}
+            confirm-type='done'
           />
-          <text className='title-title-boss'>退款说明</text>
         </view>
-      </view>
-      <view class='section'>
-        <Textarea
-          placeholder='请补充退款说明（选填）!'
-          onInput={(e) => setExplain(e.detail.value)}
-          confirm-type='done'
-        />
-      </view>
-      <view className='money-title'>
-        实付金额:{" "}
-        <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
-      </view>
-      <view className='money-title'>
-        已获返现:{" "}
-        <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
-      </view>
-      <view className='money-title'>
-        退款金额:{" "}
-        <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
-      </view>
-      <view className='ul-li-text'>
-        <view className='ul-li-view'></view>
-        <text className='ul-li-textname'>退款金额不可修改</text>
-      </view>
-      <view className='ul-li-text'>
-        <view className='ul-li-view'></view>
-        <text className='ul-li-textname'>
-          下单获得返现金额，会在退款时被扣除；
-        </text>
-      </view>
-      <view className='ul-li-text'>
-        <view className='ul-li-view'></view>
-        <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
-      </view>
-
-      <view className='button-info'>
-        <Button className='button-box' onClick={() => onRefund()}>
-          提交申请
-        </Button>
-      </view>
-    </view>
+        <view className='money-title'>
+          实付金额:{" "}
+          <text className='money-name'>{formatPrice(totalPrice.charges)}元</text>
+        </view>
+        <view className='money-title'>
+          已获返现:{" "}
+          <text className='money-name'>{formatPrice(totalPrice.cashback)}元</text>
+        </view>
+        <view className='money-title'>
+          退款金额:{" "}
+          <text className='money-name'>{formatPrice(totalPrice.refundPrice)}元</text>
+        </view>
+        <view className='ul-li-text'>
+          <view className='ul-li-view'></view>
+          <text className='ul-li-textname'>退款金额不可修改</text>
+        </view>
+        <view className='ul-li-text'>
+          <view className='ul-li-view'></view>
+          <text className='ul-li-textname'>
+            下单获得返现金额，会在退款时被扣除；
+          </text>
+        </view>
+        <view className='ul-li-text'>
+          <view className='ul-li-view'></view>
+          <text className='ul-li-textname'>退款将在七个工作日内原路退还。</text>
+        </view>
+
+        <view className='button-info'>
+          <Button className='button-box' onClick={() => onRefund()}>
+            提交申请
+          </Button>
+        </view>
+      </scroll-view>
+
+    </view >
   );
 });

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -76,7 +76,7 @@ export default withLayout((props) => {
     <view className="box-content">
       <CustomNav title="售后退款" />
       <scroll-view
-        scroll-y
+        scrollY
         style="height: calc(100vh - 176rpx);"
         refresher-enabled
         refresher-triggered={IsPull}

src/pages/details/foodDetails/foodDetails.jsx

@@ -155,7 +155,7 @@ export default withLayout((props) => {
         style={{ overflow: "hidden", padding: "0 30rpx", height: '100%', background: "#F8F8F8" }}
       >
         <scroll-view
-          scroll-y="true"
+          scrollY
           style={{ height: '100%' }}
         >
           <view className="storeDetails">

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -100,7 +100,7 @@ export default withLayout((props) => {
         <CustomNav title='十公里' />
       </view>
       <view style={{ overflow: 'hidden', padding: '0 30rpx', height: '100%', background: '#F8F8F8' }}>
-        <scroll-view scroll-y="true" style={{ height: '100%' }}>
+        <scroll-view scrollY style={{ height: '100%' }}>
           <view className='storeDetails'>
             <Swiper
               className='.swiper'

src/pages/index/tabs/Guide.jsx

@@ -162,7 +162,7 @@ export default (props) => {
 
 
   return (
-    <scroll-view scroll-y style='height:100%;'  >
+    <scroll-view scrollY style='height:100%;'  >
 
       <view className='Guide-Home-box'>
         {

src/pages/index/tabs/Mine.jsx

@@ -104,7 +104,7 @@ export default (props) => {
 
 
   return !person.phone ? <AuthPage /> : (
-    <scroll-view scroll-y style='height: 100%;' >
+    <scroll-view scrollY style='height: 100%;' >
 
 
       <view className='User-box'>

src/pages/index/tabs/Recommend.jsx

@@ -32,10 +32,11 @@ export default (props) => {
       ...queryParams,
       typeId: tab
     })
+
     if (index == 0) {
       setQueryParams({ location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
-
+    //如果context有的话代表他滚动了   那么切换tab页就置顶
     if (listRef.current?.context) {
       listRef.current.context.scrollTo({ top: 0 })
     }
@@ -47,11 +48,17 @@ export default (props) => {
     })
   }, [])
 
+
+
   const onSearch = () => {
     // 用绝对路径
     Taro.navigateTo({ url: '/pages/search/search' });
   }
 
+
+
+
+
   return (
     <view style={{ height: '100%', overflow: 'hidden' }}>
       <view className='search' onClick={onSearch}>

src/pages/searchResult/searchResult.jsx

@@ -1,4 +1,4 @@
-import { React, useState } from 'react'
+import { React, useState,useRef } from 'react'
 // .就是当前路径
 import iconsearch from '../../assets/icons/housemantj/search.png'
 import CustomNav from '@/components/CustomNav'
@@ -33,6 +33,8 @@ export default withLayout((props) => {
       title: '景点',
     },
   ]
+  const listRef = useRef()
+
   const handleTabChange = (e) => {
     const { index } = e.detail
     setActiveTab(index)
@@ -45,6 +47,10 @@ export default withLayout((props) => {
     else {
       setQueryParams({ q: q, targetType: 'tourist', location: location, pageNum: 1, pageSize: 10, typeId: '' })
     }
+    //如果context有的话代表他滚动了   那么切换tab页就置顶
+    if (listRef.current?.context) {
+      listRef.current.context.scrollTo({ top: 0 })
+    }
   }
 
 

src/shop/components/ShopKeeper/shopKeeper.jsx

@@ -1,4 +1,4 @@
-import { React, useState, useEffect, useMemo } from 'react'
+import { React, useState, useEffect, useMemo,useRef } from 'react'
 import Taro, { useRouter } from '@tarojs/taro'
 import Picker from '@/components/Picker'
 import ShopUsed from '@/components/ShopUsed' //已核销
@@ -50,6 +50,7 @@ export default (props) => {
     onHotelChange(current)
   }
 
+  const listRef = useRef()
 
   const handelSearch = (e) => {
     const val = e.detail.value
@@ -65,7 +66,10 @@ export default (props) => {
     const { index } = e.detail
     setActiveTab(index)
     setisVerified(index)
-
+//如果context有的话代表他滚动了   那么切换tab页就置顶
+if (listRef.current?.context) {
+  listRef.current.context.scrollTo({ top: 0 })
+}
   }
   const tabs = [
     {
@@ -95,7 +99,7 @@ export default (props) => {
       </view>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
-        <scroll-view scroll-y scroll-view='true' bindscrolltoupper='upper' bindscrolltolower='lower' bindscroll='scroll' style={{ height: 'calc(100vh - 120px)' }}>
+        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
             <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder='请选择商铺' value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
             <view onClick={ShowMoldeOn} className='User-info-cutover'>

src/shop/components/Sparead/spreadMoney.jsx

@@ -57,7 +57,7 @@ export default (props) => {
       </view>
       <ToggleRole showCutover={showCutover} maskClosable={showCutover} onClose={onClose} role='shop' />
       <view style={{ padding: '30rpx', height: '100%' }}>
-        <scroll-view scroll-y="true" scroll-view='true' bindscrolltoupper="upper" bindscrolltolower="lower" bindscroll="scroll" style={{ height: 'calc(100vh - 120px)' }}>
+        <scroll-view scrollY style={{ height: 'calc(100vh - 120px)' }}>
           <view className='storexx'>
             <view className='storeName'>店名：<Picker style={{ display: 'inline-block' }} placeholder="请选择商铺" value={shop?.shopId} kv={['shopName', 'shopId']} dicts={shopList} onChange={handleHotelChange} /></view>
             <view onClick={ShowMoldeOn} className='User-info-cutover'>

src/shop/pages/spread/spreadIndex.jsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect,useRef } from 'react'
 import CustomNav from '@/components/CustomNav'
 import { useRouter } from '@tarojs/taro'
 import { getShopList, getShopMoney, getAccount, getVerifiedOrder, setGetVerifiedOrder } from '@/services/shopBoss'
@@ -30,10 +30,15 @@ export default withLayout((props) => {
   const [isVerified, setisVerified] = useState(0)
   const [shopMoney, setShopMoney] = useState([])
   const [verifiedOrder, setVerifiedOrder] = useState([])
+  const listRef = useRef()
 
   const handleTabChange = (e) => {
     const { index } = e.detail
     setCurrentTab(index)
+    //如果context有的话代表他滚动了   那么切换tab页就置顶
+    if (listRef.current?.context) {
+      listRef.current.context.scrollTo({ top: 0 })
+    }
   }
 
   const handelType = () => {