feats

config/dev.js

@@ -4,7 +4,7 @@ module.exports = {
   },
   defineConstants: {
     // HOST: '"https://machine.njyunzhi.com"',
-    HOST: '"http://192.168.89.25:7080"',
+    HOST: '"http://127.0.0.1:7080"',
     OSS: '""',
     // VERSION: '"2.0.33"',
   },

src/components/CarsListContent/index.jsx

@@ -60,7 +60,7 @@ export default withLayout((props) => {
               <View className='carsListImga-bottom-box-flaxBox'>
                 <View className='carsListImga-bottom-box-flaxBox-liftText'>
                   <View className='carsListImga-bottom-box-flaxBox-liftText-Titles'>{item.name}</View>
-                  <View className='carsListImga-bottom-box-flaxBox-liftText-price'>{formatPrice(item.price)}/<Text>公顷</Text></View>
+                  <View className='carsListImga-bottom-box-flaxBox-liftText-price'>{formatPrice(item.price)}/<Text>亩</Text></View>
                 </View>
                 <View className='carsListImga-bottom-box-flaxBox-rightBut'>
                   <ButtontWX onClick={() => startReserve(item.machineryId)} butText='预约' butWidth={80} butHeight={34} butFontSize={19} butBorderRadius={0} />

src/pages/CheckDetails/index.jsx

@@ -78,7 +78,7 @@ export default withLayout((props) => {
           <View className='CarsContent-TextBox'>
             <View className='CheckDetails-bottom-box-flaxBox-liftText'>
               <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>{carsInfo?.name}</View>
-              <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>{formatPrice(carsInfo.price)}/<Text>公顷</Text></View>
+              <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>{formatPrice(carsInfo.price)}/<Text>亩</Text></View>
             </View>
             <View className='content-header-box-map-Info' onClick={() => goMapInfo('222888')}>
               <View className='content-header-box-map-Info-liftCentent'>

src/pages/CheckMap/index.jsx

@@ -89,7 +89,7 @@ export default withLayout((props) => {
             <View className='CarsContent-TextBox'>
               <View className='CheckDetails-bottom-box-flaxBox-liftText'>
                 <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>{carsInfo.name}</View>
-                <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>{(carsInfo.price / 100).toFixed(2)}/<Text>公顷</Text></View>
+                <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>{(carsInfo.price / 100).toFixed(2)}/<Text>亩</Text></View>
               </View>
               <View className='content-header-box-map-Info'>
                 <View className='content-header-box-map-Info-liftCentent'>

src/pages/MoreCars/CarTypeList.jsx

@@ -53,7 +53,7 @@ export default withLayout((props) => {
               <View className='carsListImga-bottom-box-flaxBox'>
                 <View className='carsListImga-bottom-box-flaxBox-liftText'>
                   <View className='carsListImga-bottom-box-flaxBox-liftText-Titles'>{item.name}</View>
-                  <View className='carsListImga-bottom-box-flaxBox-liftText-price'>{formatPrice(item.price)}/<Text>公顷</Text></View>
+                  <View className='carsListImga-bottom-box-flaxBox-liftText-price'>{formatPrice(item.price)}/<Text>亩</Text></View>
                 </View>
                 <View className='carsListImga-bottom-box-flaxBox-rightBut'>
                   <ButtontWX onClick={() => startReserve(item.machineryId)} butText='预约' butWidth={80} butHeight={34} butFontSize={19} butBorderRadius={0} />

src/pages/OrderConfirmation/index.jsx

@@ -136,8 +136,8 @@ export default withLayout((props) => {
       <View className='pagesBox'>
         <Form onSubmit={formSubmit} >
           <View className='example-body-WorkingArea'>
-            <View>作业面积/公顷</View>
-            <Input name='amount' type='number' maxlength={6} className='aTextareaCentent' placeholder='请输入作业面积/公顷' />
+            <View>作业面积/亩</View>
+            <Input name='amount' type='number' maxlength={6} className='aTextareaCentent' placeholder='请输入作业面积/亩' />
           </View>
           <View className='example-body-WorkingTime'>
             <View>作业时间：</View>

src/pages/OrderInfo/index.jsx

@@ -1,5 +1,5 @@
 import { View, Text } from "@tarojs/components"
-import { useEffect, useState } from "react"
+import { useEffect, useState, useMemo } from "react"
 import Taro, { useDidShow } from "@tarojs/taro"
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
@@ -7,27 +7,24 @@ import formatTimes from "@/utils/codeSegment"
 import withLayout from '@/layouts'
 import formatPrice from "@/utils/formatPrice"
 import AssessModel from "@/components/AssessModel"
-
+import useProcessStatus, { getProcessSignBy } from "@/utils/hooks/useProcessStatus"
 import { orderPrepay, orderDelete, orderInfo, orderRefund } from "@/services/order"
 // import BottomMoadl from '@/components/BottomMoadl/index'
 
 
-
-
-
-
 import './style.less'
 
 export default withLayout((props) => {
   // const { stateType } = props
 
   const $instance = Taro.getCurrentInstance()
-  const { orderId, stateType, stateStyle } = $instance.router.params
+  const { orderId } = $instance.router.params
 
   const [orderInfos, setOrderInfos] = useState()
-  console.log("🚀 ~ file: index.jsx ~ line 27 ~ stateType ~ stateType", stateType)
+
   const [isAssessVisible, setIsAssessVisible] = useState(false)
 
+  const { processStatus } = useProcessStatus(orderInfos)
 
   //底部弹窗
   // const [showFrame, setShowFrame] = useState(false)
@@ -117,10 +114,6 @@ export default withLayout((props) => {
     })
   }
 
-
-
-
-
   const pay = () => {
 
     orderPrepay(orderId, {
@@ -179,6 +172,32 @@ export default withLayout((props) => {
 
   }
 
+  const { processLabel, stateStyle, action : Actions } = useMemo(() => {
+    const { label, color } = getProcessSignBy(processStatus)
+    let action = <></>;
+
+    switch (processStatus) {
+      case 1:
+      case 2:
+        action = <ButtontWX butText='取消' styleType onClick={cancelPay} butWidth={150} butHeight={39} butFontSize={16} butBorderRadius={49} />;
+        break;
+      case 4:
+        action = <ButtontWX butText='支付' onClick={pay} butWidth={150} butHeight={39} butFontSize={16} butBorderRadius={49} />;
+        break;
+      case 5:
+        action = <ButtontWX butText='评价' onClick={startModle} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />;
+        break;
+      case 3:
+      case 6:
+      default:
+        break;
+    }
+    return  {
+      processLabel: label,
+      stateStyle: color,
+      action
+    }
+  }, [processStatus])
 
   return (
     <View className='page-index'>
@@ -193,37 +212,14 @@ 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 style={{ color: `${stateStyle}` }}  >{stateType === '已付款' ? '已付款,待调度' : stateType}</Text></View>
+        <View>订单状态：<Text style={{ color: `${stateStyle}` }}  >{processLabel}</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' >{orderInfos?.payStatus === 1 ? '已付款' : '待付款'}</Text></View>
         </View>
       </View>
       <View className='BottomtBut' >
-        <>
-          {
-            stateType == '已完成' ? <></>
-              : stateType == '进行中' ? <></>
-                : stateType == '待评价' ? <ButtontWX butText='评价' onClick={startModle} 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={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} />
-
-                            : <></>
-          }
-        </>
-
-
-
-
+        {Actions}
       </View>
     </View>
   )

src/pages/index/tabs/Orders.jsx

@@ -11,6 +11,7 @@ import { getOrder } from "@/services/order"
 import formatTimes from "@/utils/codeSegment"
 import { useModel } from "@/store"
 import formatPrice from "@/utils/formatPrice"
+import { getProcessStatus, getProcessSignBy } from "@/utils/hooks/useProcessStatus"
 
 import './OrdersCss/style.less'
 
@@ -60,53 +61,9 @@ export default withLayout((props) => {
   console.log(ourderList, 'ourderList');
 
   const orderStates = (item) => {
-    if (item.payStatus === 0) {
-      return {
-        title: '待付款',
-        styleColor: '#51D4FF'
-      }
-    } else if (item.payStatus === 1 && item.workStatus === 0 && item.dispatchStatus === 0) {
-      return {
-        title: '已付款',
-        styleColor: '#FF703B'
-      }
-    } else if (item.payStatus == 1 && item.dispatchStatus === 1 && item.workStatus === 0) {
-      return {
-        title: '待作业',
-        styleColor: '#FF703B'
-      }
-
-    } else if (item.payStatus === 1 && (item.workStatus === 1 || item.workStatus === 2)) {
-      return {
-        title: '进行中',
-        styleColor: '#44F68B'
-      }
-    } else if (item.workStatus === 3 && item.isEvaluated === 0) {
-      return {
-        title: '待评价',
-        styleColor: '#51D4FF'
-      }
-    } if (item.workStatus === 3 && item.isEvaluated === 1 && item.dispatchStatus == 1) {
-      return {
-        title: '已完成',
-        styleColor: '#FF703B'
-      }
-    } else if (item.payStatus === -1 && item.workStatus === 0 && item.isRefund === 1) {
-      return {
-        title: '已退单',
-        styleColor: '#FF703B'
-      }
-    } else if (item.payStatus === 3 && (item.dispatchStatus == 1 || item.dispatchStatus == 0)) {
-      return {
-        title: '退单申请中',
-        styleColor: '#FF703B'
-      }
-    } else {
-      return {
-        title: '异常',
-        styleColor: '#FF0000'
-      }
-    }
+    const processStatus = getProcessStatus(item)
+    const { label: title, color: styleColor } = getProcessSignBy(processStatus)
+    return { title, styleColor }
   }
 
   const handleTobePaid = (id, stateType, stateStyle) => {
@@ -135,7 +92,7 @@ export default withLayout((props) => {
               <Image src={ordersLeft} />
               <View className='orders-listBox-RihtboxBoxOrderViewText'>
                 <View className='View-LiftTextTop' onClick={() => handleTobePaid(item.orderId, orderStates(item)?.title, orderStates(item)?.styleColor)} >
-                  订单编号：<Text>{item.orderNo}</Text><Text className='View-LiftTextTop-nextText'>详情&gt;&gt;</Text></View>
+                  编号：<Text>{item.orderNo}</Text><Text className='View-LiftTextTop-nextText'>详情&gt;&gt;</Text></View>
                 <View>农机名称：<Text>{item.machineryName}</Text></View>
                 <View>作业面积：<Text>{item.amount}</Text></View>
                 <View>需求时间：<Text>{formatTimes(item.appointmentDate, 'yyyy-MM-dd')}</Text></View>

src/utils/hooks/useProcessStatus.js

@@ -0,0 +1,102 @@
+import { useState, useEffect } from "react";
+
+export default function useProcessStatus(orderInfo) {
+/**
+ * 业务流程如下:
+ * 1、农户下单 - 未支付 (管理端待分配订单)
+ * 2、农机手待接单
+ * 3、农机手接单干活
+ * 4、农机手结单 - 确定亩数 (农户待支付)
+ * 5、农户待评价
+ * 6、结单(订单完成)
+ */
+
+  const [processStatus, setProcessStatus] = useState()
+
+  useEffect(() => {
+    if (!orderInfo || !orderInfo.orderId) return;
+
+    setProcessStatus(getProcessStatus(orderInfo));
+  }, [orderInfo])
+
+  return { processStatus }
+}
+
+export function getProcessStatus(orderInfo) {
+  
+  if (!orderInfo || !orderInfo.orderId) return;
+
+  // 订单完成
+  if (orderInfo.isEvaluated) {
+    return 6
+  }
+  
+  // 待支付
+  if (orderInfo.workStatus === 3 && orderInfo.charges > 0 && orderInfo.payStatus !== 1) {
+    return 4
+  }
+
+  // 待评价
+  if (orderInfo.workStatus === 3 && !orderInfo.isEvaluated) {
+    return 5
+  }
+
+  // 工作中
+  if (orderInfo.workStatus !== 3 && orderInfo.dispatchStatus) {
+    return 3
+  }
+
+  // 待接单
+  if (!orderInfo.workStatus && orderInfo.dispatchStatus) {
+    return 2
+  }
+
+  // 待分配
+  if (orderInfo.status === 1 && !orderInfo.dispatchStatus) {
+    return 1
+  }
+  
+  return -1
+}
+
+export function getProcessSignBy(status) {
+  if (status === undefined || status === null) return {}
+  
+  switch (status) {
+    case 1:
+      return {
+        label: '待分配',
+        color: '#FF703B'
+      }
+    case 2:
+      return {
+        label: '待作业',
+        color: '#FF703B'
+      }
+    case 3:
+      return {
+        label: '进行中',
+        color: '#44F68B'
+      }
+    case 4:
+      return {
+        label: '待付款',
+        color: '#51D4FF'
+      }
+    case 5:
+      return {
+        label: '待评价',
+        color: '#51D4FF'
+      }
+    case 6:
+      return {
+        label: '已完成',
+        color: '#FF703B'
+      }
+    default:
+      return {
+        label: '异常',
+        color: '#FF0000'
+      }
+  }
+}