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

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>
   );
 });