feats

src/components/CompoentsOrder/OrderCard/index.jsx

@@ -1,7 +1,7 @@
 import Taro from "@tarojs/taro";
 import { View, Text } from '@tarojs/components'
 import formatTime from "@/utils/formatTime";
-import SlideViewOrder from '@/components/SlideViewOrder';
+import SlideView from '@/components/SlideView';
 import CouponCard from '@/components/CouponCard'
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
 import refund from "@/assets/icons/GuideCheck/refund.png";
@@ -78,8 +78,8 @@ export default (props) => {
         sh != '1' || kkp != '1' ? <view className='OrderNumber'>订单编号：{item.orderId}</view> : null
       }
       {
-        item.status === 0 ? <SlideViewOrder del onDelete={() => handeDelete(item)} >
-          <CouponCard action={PayAction}>
+        item.status === 0 ? <SlideView del onDelete={() => handeDelete(item)} >
+          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })}} action={PayAction}>
             <CouponMedia>
               <CouponMedia.Header
                 cashback={item.cashback}
@@ -111,11 +111,9 @@ export default (props) => {
               </CouponMedia.Body>
             </CouponMedia>
           </CouponCard>
-        </SlideViewOrder>
+        </SlideView>
           :
-          <CouponCard onClick={() => {
-            item.status === 1 && item.isVerified == false ? Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` }) : ''
-          }} action={PayAction} >
+          <CouponCard onClick={() => { Taro.navigateTo({ url: `/pages/details/foodDetails/foodDetails?id=${item.shopId}` })}} action={PayAction} >
             <CouponMedia>
               <CouponMedia.Header
                 cashback={item.cashback}

src/components/CompoentsOrder/complete/index.jsx

@@ -84,7 +84,6 @@ export default (props) => {
     setItem(val)
   }
   const slideButtonTap = (e) => {
-    console.log(e)
     deleteOrder(e.orderId).then(() => {
       Taro.showToast({
         title: '删除订单成功',

src/components/SlideView/index.jsx

@@ -56,7 +56,7 @@ export default (props) => {
             const { height } = res[0]
             if (height && height !== contentHeightRef.current) {
               setActStyle({
-                height: `${height}px`,
+                height: `calc(${height}px - 10px)`,
               })
               contentHeightRef.current = height
             }

src/components/SlideViewOrder/index.jsx

@@ -1,97 +0,0 @@
-
-import React, { useEffect, useMemo, useRef, useState } from 'react'
-import Taro from '@tarojs/taro';
-import { ScrollView, View, Image, Text } from '@tarojs/components';
-import deleteIcon from '@/assets/icons/landlord/delete.png';
-import './style.less'
-
-export default (props) => {
-  const { className, action, del, onDelete } = props;
-
-  const contextRef = useRef()
-  const contentHeightRef = useRef(0)
-  const [actStyle, setActStyle]= useState()
-
-  const uqClass = useMemo(() => `f-${Math.random().toString(36).substring(2)}`, [])
-  const classes = [className, 'slideview-wrapper', uqClass].filter(Boolean).join(' ');
-
-  const handleScrollLeft = () => {
-    if (contextRef.current) {
-      contextRef.current.scrollIntoView('.slideview-content')
-    }
-  }
-
-  const handleScrollRight = () => {
-    if (contextRef.current) {
-      contextRef.current.scrollIntoView('.slideview-actions')
-    }
-  }
-
-  const handleDelete = (e) => {
-    if (onDelete) {
-      onDelete(e)
-    }
-  }
-
-  useEffect(() => {
-    Taro.nextTick(() => {
-      Taro.createSelectorQuery()
-      .select(`.${uqClass}`)
-      .node()
-      .exec((res) => {
-        contextRef.current = res[0].node;
-      })
-    })
-  }, [])
-
-  useEffect(() => {
-    Taro.nextTick(() => {
-      // 不清楚为什么, 此处获取高度一直不准确
-      const t = setTimeout(() => {
-        Taro.createSelectorQuery()
-        .select(`.${uqClass}`)
-        .boundingClientRect()
-        .exec((res) => {
-          if (res && res[0]) {
-            const { height } = res[0]
-            if (height && height !== contentHeightRef.current) {
-              setActStyle({
-                height: `${height}px`,
-              })
-              contentHeightRef.current = height
-            }
-          }
-        })
-        clearTimeout(t)
-      }, 500)
-    })
-  })
-
-  return (
-    <ScrollView
-      className={classes}
-      upperThreshold={20}
-      lowerThreshold={20}
-      scrollX
-      scrollWithAnimation
-      enhanced
-      onScrollToUpper={handleScrollLeft}
-      onScrollToLower={handleScrollRight}
-    >
-      <View className='slideview-content'>{props.children}</View>
-      <View className='slideview-actions' style={actStyle}>
-        <View className='slideview-action'>
-          {
-            del && (
-              <View className='slideview-action_delete' onClick={handleDelete}>
-                <Image src={deleteIcon} />
-                <View>删除</View>
-              </View>
-            )
-          }
-          {action}
-        </View>
-      </View>
-    </ScrollView>
-  )
-}

src/components/SlideViewOrder/style.less

@@ -1,52 +0,0 @@
-.slideview-wrapper {
-  box-sizing: border-box;
-  white-space: nowrap;
-
-  &::-webkit-scrollbar{
-    width: 0;
-    height: 0;
-    color: transparent;
-  }
-
-  .slideview-content {
-    min-width: 100%;
-    display: inline-block;
-    vertical-align: middle;
-  }
-
-  .slideview-actions {
-    display: inline-block;
-    vertical-align: middle;
-    margin: 0 20px;
-    background: #FFFFFF;
-    box-shadow: 0px 8px 38px 0px rgba(0, 0, 0, 0.12);
-    border-radius: 12px;
-
-    .slideview-action {
-      height: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      
-      &_delete {
-        display: block;
-        flex: none;
-        height: 74px;
-        width: 67px;
-        text-align: center;
-        padding: 10px;
-        font-size: 24px;
-        font-weight: bold;
-        color: #FF3434;
-
-        & > image {
-          width: 28px;
-          height: 30px;
-          display: block;
-          margin: 0 auto 20px;
-        }
-      }
-    }
-
-  }
-}

src/pages/MineUserAll/ContactMe/index.jsx

@@ -23,20 +23,18 @@ export default withLayout((props) => {
         personId,
         content
       }).then(() => {
-
         Taro.showToast({
-          title: '反馈成功',
+          title: '我们已经收到亲亲的反馈了哟~',
           icon: 'success',
-          duration: 2000
-
-        }).then(x => {
-
+          duration: 1500
+        }).then(
+          setTimeout(() => {
           Taro.navigateBack({
             delta: 1
           })
           setLoading(false)
-
-        })
+        },1500)
+          )
       })
     }
     else {

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

@@ -92,7 +92,9 @@ export default withLayout((props) => {
       refundReason: explain,
     }).then((res) => {
       Taro.hideLoading();
-      Taro.navigateTo({ url: '/pages/MineUserAll/AllOrder/index?tabJump=0' })
+      Taro.navigateBack({
+        delta: 1
+      })
       Taro.showToast({
         title: "退款成功",
         icon: "none",

src/pages/MineUserAll/RefundMoney/index.jsx

@@ -12,12 +12,21 @@ import "./style.less";
 export default withLayout((props) => {
   const { router, person } = props;
   const [list, setList] = useState([]);
+  const [IsPull, setPull] = useState(false);
   const [pageNum, setNumber] = useState(1);
   const [HasNextPage, setHasNextPage] = useState(true);
+  const [isFirst, setFirst] = useState(true)
+  useDidShow(() => {
+    if (!isFirst) {
+      getList();
+    }
+  })
+
   const [loading, setLoading] = useState(false)
 
   const getList = () => {
     setLoading(true)
+    setFirst(false)
     setHasNextPage(false);
     getOrderSub({
       pageNum,
@@ -29,14 +38,15 @@ export default withLayout((props) => {
         pageNum === 1 ? res.records || [] : list.concat(res.records || [])
       );
       setHasNextPage(res.current < res.pages);
+      setPull(false);
       setLoading(false)
-
     }).catch(e => {
       setLoading(false)
     })
   };
 
 
+
   const pageLoadMore = () => {
     // 页面上拉加载更多
     if (HasNextPage) {
@@ -56,26 +66,22 @@ export default withLayout((props) => {
       <view className='index-navbar'>
         <CustomNav title='售后退款' />
       </view>
-      <scroll-view
-        scrollY
-        style='height: calc(100vh - 176rpx);'
-        onscrolltolower={pageLoadMore}
-      >
-        <SpinBox loading={loading} className='index-container' >
-
+      <SpinBox loading={loading} className='index-container' >
+        <scroll-view
+          scrollY
+          style='height: calc(100vh - 176rpx);'
+          onscrolltolower={pageLoadMore}
+        >
           <view className='View-box-Card'>
-
             {(list || []).map((item) => {
               return (
                 <OrderCard item={item} key={item.orderId} sh='1' />
               )
             })}
             <view className='foot'>这是我的底线</view>
-
           </view>
-        </SpinBox>
-
-      </scroll-view>
+        </scroll-view>
+      </SpinBox>
     </view>
   );
 });

src/pages/TobeShop/index.jsx

@@ -122,15 +122,11 @@ export default withLayout((props) => {
   };
 
   const PerfectionOK = () => {
-    setConsumption(false);
-    if (list?.length > 1) {
-      getList()
-    } else {
-      Taro.redirectTo({
-        url: '/pages/MineUserAll/AllOrder/index?tabJump=3',
-      });
-      // Taro.navigateBack({ delta: 1 })
-    }
+    setConsumption(false);    
+    Taro.redirectTo({
+      url: '/pages/MineUserAll/AllOrder/index?tabJump=3',
+    });
+    // Taro.navigateBack({ delta: 1 })    
   };
 
   const btnText = ['确认核销', checked && checked.length > 0 ? `(${checked.length})` : undefined].filter(Boolean).join(' ')

src/pages/details/foodDetails/foodDetails.jsx

@@ -272,7 +272,7 @@ export default withLayout((props) => {
           }
         </scroll-view>
       </SpinBox>
-      <view className='bottomTab'>
+      <view className='index-tabber bottomTab'>
         <Button openType='share' className='sharebtn'>
           分享
         </Button>

src/pages/details/mjDetails/sceneryDetails.jsx

@@ -176,7 +176,7 @@ export default withLayout((props) => {
           <view className='bottom'>这是我的底线</view>
         </scroll-view>
       </SpinBox>
-      <view className='bottomTab'>
+      <view className='index-tabber bottomTab'>
         <Button openType='share' className='sharebtn'>分享</Button>
         <view className='tab'>
           <image className='share' src={share} />分享