flx

src/hotel/components/shareCard/shareCard.jsx

@@ -12,7 +12,7 @@ export default (props) => {
 
   return (
     <View className='c1'>
-      <Popup show={showCutover} onClose={onClose}>
+      <Popup show={showCutover} onClose={onClose} maskClosable={showCutover}>
         <View className='card2'>
           <View className='text'>分享到微信</View>
           <View className='share'>去分享<Button openType='share' className='btn'>去分享</Button></View>

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -10,6 +10,7 @@ import baozan from '@/assets/icons/housemantj/bgood.png'
 import weibaozan from '@/assets/icons/housemantj/unLike.png'
 import zhuandao from "@/assets/icons/housemantj/backTop.png";
 import withLayout from '@/layouts'
+import SpinBox from "@/components/Spin/SpinBox";
 import { useState, useEffect } from 'react'
 import { getTouristDetail, getExtendContent, getRecommendList } from '@/services/home'
 import { Swiper, SwiperItem, Button } from '@tarojs/components';
@@ -26,6 +27,8 @@ export default withLayout((props) => {
   const [detail, setDetail] = useState({})
   const [isSaved, toggleSave] = useSave(detail.isSaved, 'tourist', id)
   const [isLike, toggleLike] = useLike(detail.isLike, 'tourist', id)
+  const [loading, setLoading] = useState(false)
+
   //banner图集数组
   const [imglist, setimglist] = useState([])
   const [index, setIndex] = useState(0)
@@ -42,10 +45,15 @@ export default withLayout((props) => {
   //指南当前页数
   const [epage, setepage] = useState(2)
   const extendMore = () => {
+    setLoading(true)
     setepage(epage + 1)
     getExtendContent('tourist', id, { pageNum: epage }).then((res) => {
       setExtend([...extend, ...res.records])
       setNewextNum(newextNum + res.records.length)
+      setLoading(false)
+    }).catch(e => {
+      setLoading(false)
+
     })
   }
 
@@ -66,6 +74,7 @@ export default withLayout((props) => {
 
   useEffect(() => {
     if (id) {
+      setLoading(true)
       getTouristDetail(id, { location }).then((res) => {
         setDetail(res)
         setimglist(res.imageList || [])
@@ -77,10 +86,15 @@ export default withLayout((props) => {
         setExtend(res.records || [])
         setAllextNum(res.total)
         setNewextNum(res.records.length)
+        setLoading(false)
+
       })
     } else {
       getRecommendList({ location }).then((res2) => {
         setRecommend(res2 || [])
+        setLoading(false)
+      }).catch(e => {
+        setLoading(false)
       })
     }
   }, [id, location])
@@ -98,7 +112,8 @@ export default withLayout((props) => {
       <view className='index-navbar'>
         <CustomNav title='十公里' />
       </view>
-      <view style={{ overflow: 'hidden', padding: '0 30rpx', height: '100%', background: '#F8F8F8' }}>
+
+      <SpinBox loading={loading} style={{ overflow: 'hidden', padding: '0 30rpx', height: '100%', background: '#F8F8F8' }}>
         <scroll-view scrollY style={{ height: '100%' }}>
           <view className='storeDetails'>
             <Swiper
@@ -160,7 +175,7 @@ export default withLayout((props) => {
           </view>
           <view className='bottom'>这是我的底线</view>
         </scroll-view>
-      </view>
+      </SpinBox>
       <view className='bottomTab'>
         <Button openType='share' className='sharebtn'>分享</Button>
         <view className='tab'>