fixl

src/pages/MyAddressList/AddressInfos/index.jsx

@@ -10,6 +10,7 @@ import './style.less'
 
 
 
+
 export default withLayout((props) => {
   console.log("🚀 ~ file: index.jsx ~ line 14 ~ props", props)
 
@@ -20,7 +21,9 @@ export default withLayout((props) => {
 
     const value = e?.detail?.value
     console.log(value)
+
     if (addressId) {
+
       addressUpdate(addressId, { address: value.address }).then((res) => {
         console.log('地址修改成功', res);
         Taro.showToast({

src/pages/OrderInfo/index.jsx

@@ -8,7 +8,7 @@ import withLayout from '@/layouts'
 import formatPrice from "@/utils/formatPrice"
 import AssessModel from "@/components/AssessModel"
 
-import { generateOrder, orderDelete, orderInfo } from "@/services/order"
+import { orderPrepay, orderDelete, orderInfo, orderRefund } from "@/services/order"
 // import BottomMoadl from '@/components/BottomMoadl/index'
 
 
@@ -84,10 +84,88 @@ export default withLayout((props) => {
 
   }, [orderId])
 
+  const requestPayment = (params) => {
+    Taro.hideLoading()
+    console.log("🚀 ~ file: index.jsx ~ line 92 ~ requestPayment ~ params", params)
+    Taro.requestPayment({
+      ...params,
+
+      package: params.packageValue,
+      success: () => {
+        Taro.showToast({
+          title: "支付成功",
+          icon: "success",
+          duration: 1000,
+        }).then(() => {
+          setTimeout(() => {
+            Taro.reLaunch({
+              url: `/pages/index/index?tab=1`
+            })
+          }, 400)
+        })
+      },
+      fail: (e) => {
+        Taro.showToast({
+          title: "支付失败",
+          icon: "none",
+          duration: 2000,
+        });
+        Taro.reLaunch({
+          // url: `/pages/MineUserAll/AllOrder/index?tabJump=1`
+        })
+      },
+    })
+  }
+
+
+
+
+
   const pay = () => {
+    orderPrepay(orderId, {
+      payType: 'wx',
+
+    }).then((e) => {
+      console.log('订单返回', e);
+      Taro.showLoading({
+        title: '支付中',
+      })
+      requestPayment(e)
+
+    })
     //支付逻辑
   }
 
+  //退单
+  const orderRefunds = () => {
+    Taro.showLoading({
+      title: '退单申请中',
+    })
+    orderRefund(orderId).then(() => {
+      Taro.showLoading()
+
+      Taro.showToast({
+        title: "退单成功",
+        icon: "none",
+        duration: 2000,
+      }).then(() => {
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          })
+        }, 400)
+
+
+      })
+    }).catch(() => {
+      Taro.showLoading()
+      Taro.showToast({
+        title: "请重试",
+        icon: "error",
+        duration: 2000,
+      });
+    })
+  }
   const startModle = () => {
     setIsAssessVisible(true)
 
@@ -114,10 +192,10 @@ export default withLayout((props) => {
         <View>作业面积：<Text>{orderInfos?.amount}</Text></View>
         <View>需求时间：<Text>{formatTimes(orderInfos?.appointmentDate, 'yyyy-MM-dd')}</Text></View>
         <View>下单时间：<Text>{formatTimes(orderInfos?.createDate, 'yyyy-MM-dd')}</Text></View>
-        <View>订单状态：<Text  >{orderInfos?.payStatus}</Text></View>
+        <View>订单状态：<Text style={{ color: `${stateStyle}` }}  >{stateType}</Text></View>
         <View className='View-LiftTextBotton'>
           <View className='feiyongStyle'>费用：<Text className='feiyongStyle-charges' >{formatPrice(orderInfos?.charges)}</Text></View>
-          <View className='feiyongStyle'>状态：<Text style={{ color: `${stateStyle}` }} className='feiyongStyle-stateStyle' >{stateType}</Text></View>
+          <View className='feiyongStyle'>状态：<Text style={{ color: `${stateStyle}` }} className='feiyongStyle-stateStyle' >{orderInfos?.payStatus === 1 ? '已付款' : '待付款'}</Text></View>
         </View>
       </View>
       <View className='BottomtBut' >
@@ -126,13 +204,20 @@ export default withLayout((props) => {
             stateType == '已完成' ? <></>
               : stateType == '进行中' ? <></>
                 : stateType == '待评价' ? <ButtontWX butText='评价' onClick={startModle} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
-                  : stateType == '待作业' ? <ButtontWX butText='退单' onClick={cancelPay} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
+                  : stateType == '待作业' ? <ButtontWX butText='退单' onClick={orderRefunds} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
                     : stateType == '待付款' ? <>
                       <ButtontWX butText='取消' styleType onClick={cancelPay} butWidth={150} butHeight={39} butFontSize={16} butBorderRadius={49} />
                       <ButtontWX butText='支付' onClick={pay} butWidth={150} butHeight={39} butFontSize={16} butBorderRadius={49} />
                     </> : stateType == '已付款' ?
-                      <ButtontWX butText='退单' onClick={cancelPay} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
-                      : stateType == '已退单' ? <></> : <></>
+                      <ButtontWX butText='退单' onClick={orderRefunds} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
+
+                      // <ButtontWX butText={`${orderInfos?.payStatus == 3 ? '退单申请中' : '退单'}`} disabled={orderInfos?.payStatus == 3 ? true : false} onClick={orderInfos?.payStatus == 3 ? '' : orderRefunds} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
+                      : stateType == '待作业' ? <ButtontWX butText={`${orderInfos?.payStatus == 3 ? '退单申请中' : '退单'}`} disabled={orderInfos?.payStatus == 3 ? true : false} onClick={orderInfos?.payStatus == 3 ? '' : orderRefunds} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
+
+                        : stateType == '已退单' ? <></>
+                          : stateType == '退单申请中' ? <ButtontWX butText={`${orderInfos?.payStatus == 3 ? '退单申请中' : '退单'}`} disabled={orderInfos?.payStatus == 3 ? true : false} onClick={orderInfos?.payStatus == 3 ? '' : orderRefunds} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
+
+                            : <></>
           }
         </>
 

src/pages/index/tabs/Mine.jsx

@@ -40,7 +40,7 @@ export default withLayout((props) => {
   useDidShow(() => {
     getAddress().then((e) => {
       let abccList = e.records.sort((a, b) => b.isDefault - a.isDefault)
-      if (abccList.length!=0) {        
+      if (abccList.length != 0) {
         setAddresInfo(abccList[0].address)
       }
     })

src/pages/index/tabs/Orders.jsx

@@ -20,22 +20,43 @@ export default withLayout((props) => {
 
   const [ourderList, setOrderList] = useState([])
 
+  const [currentPage, setCurrentPage] = useState(1)
+
+  const [isMore, setIsMore] = useState(false)
 
   const { person, setPerson } = useModel('userData')
 
 
   useDidShow(() => {
-    getOrder({ pageSize: 30 }).then((e) => {
+    getOrder({ pageNum: currentPage || 1, mine: true }).then((e) => {
       const { records } = e
       setOrderList(records)
     })
   })
+
+  const handleScrollToLower = () => {
+    if (ourderList.length < 9) {
+      return;
+    } else {
+      setCurrentPage(currentPage + 1)
+
+    }
+  }
   useEffect(() => {
-    getOrder({ pageSize: 31 }).then((e) => {
-      const { records } = e
+    getOrder({ pageNum: currentPage, mine: true }).then((e) => {
+      const records = currentPage === 1 ? e.records || [] : ourderList.concat(e.records || [])
+      console.log("🚀 ~ file: Orders.jsx ~ line 41 ~ getOrder ~ records", records)
+      if (e.records.length == 0 && currentPage != 1) {
+        setIsMore(true)
+        return
+      }
+      // setJobList(lst)
       setOrderList(records)
+
+
+
     })
-  }, [])
+  }, [currentPage])
   console.log(ourderList, 'ourderList');
 
   const orderStates = (item) => {
@@ -70,11 +91,16 @@ export default withLayout((props) => {
         title: '已完成',
         styleColor: '#FF703B'
       }
-    } else if (item.payStatus === 1 && item.workStatus === 0 && item.isRefund === 1) {
+    } else if (item.payStatus === -1 && item.workStatus === 0 && item.isRefund === 1) {
       return {
         title: '已退单',
         styleColor: '#FF703B'
       }
+    } else if (item.payStatus === 3) {
+      return {
+        title: '退单申请中',
+        styleColor: '#FF703B'
+      }
     } else {
       return {
         title: '异常',
@@ -89,7 +115,11 @@ export default withLayout((props) => {
 
 
   return (
-    <scroll-view scrollY style='height: 100%;' >
+    <scroll-view
+      scrollY
+      style='height: 100%;'
+      onScrollToLower={isMore ? '' : handleScrollToLower}
+    >
 
       <View className='content-header-box-orders'>
         <View className='content-header-box-orders-liftCentent'>

src/services/order.js

@@ -38,3 +38,23 @@ export const orderDelete = (id, data) => request(`/order/${id}`, { data, method:
  */
 export const orderEvaluation = (data) => request(`/evaluation`, { data, method: 'POST' })
 
+
+
+
+/**
+ * --------------订单支付-----------------
+ * @param {*} data 
+ * @returns 
+ */
+export const orderPrepay = (id, data) => request(`/order/${id}/prepay`, { data, method: 'POST' })
+
+
+
+/**
+ * --------------订单退款-----------------
+ * @param {*} data 
+ * @returns 
+ */
+export const orderRefund = (id, data) => request(`/order/${id}/refund`, { data, method: 'PUT' })
+
+