fixle pages

src/components/AssessModel/index.jsx

@@ -0,0 +1,116 @@
+
+import { useState } from 'react'
+
+import ButtontWX from '@/components/ButtontWX'
+import { Textarea, View } from '@tarojs/components'
+
+import Taro from '@tarojs/taro'
+import starOn from '@/assets/icons/comm/starOn.png'
+import starOff from '@/assets/icons/comm/starOff.png'
+import Popup from '@/components/Popup'
+// import { saveEvaluate } from '@/services/mine'
+import { orderEvaluation } from '@/services/order'
+import './style.less'
+
+
+
+
+
+
+export default (props) => {
+  const { showCutover, maskClosable, orderId, onClose, goBACK } = props
+
+  const scoreList = new Array(5).fill(0)
+
+
+  const [textAreaCentent, setTextAreaCentent] = useState('')
+
+
+
+  const [evaluate, setEvaluate] = useState({
+    sweetScore: 0,
+  })
+
+
+
+  const [kwCollectNub, setkwCollectNub] = useState(0)
+  const kwChange = (e, val) => {
+    e.stopPropagation();
+    setkwCollectNub(val + 1)
+
+    console.log("🚀 ~ file: index.jsx ~ line 49 ~ kwChange ~ val", e, val + 1)
+
+    setEvaluate({ sweetScore: val + 1, })
+  }
+
+
+  const ButtonCancel = () => {
+    onClose()
+  }
+  const ButtonOK = (e) => {
+    if (evaluate.sweetScore == 0) {
+      Taro.showToast({
+        title: '您未评价哦',
+        icon: 'none'
+      })
+      return;
+    }
+    else {
+
+      orderEvaluation({ orderId: orderId, score: kwCollectNub, content: textAreaCentent }).then(() => {
+        Taro.showToast({
+          title: '评价成功',
+          icon: 'success',
+          duration: 2000
+        }).then(() => {
+          setTimeout(() => {
+            onClose()
+          }, 500);
+        })
+      })
+
+    }
+  }
+
+
+
+  return (
+    <>
+
+      {
+        showCutover ? <View className='modelBack' >
+          <View className='assessModel-box'>
+            <view className='item-center-Number' >
+              <view className='card-box-star'>
+                <text className='card-box-star-text'  >满意度：</text>
+                {
+                  scoreList.map((_, index) => {
+
+                    const src = index < kwCollectNub ? starOn : starOff
+                    return (
+                      <image className='card-star-image' key={index} src={src} onClick={(e) => kwChange(e, index)} />
+                    )
+                  })
+                }
+              </view>
+
+            </view>
+            <Textarea placeholder='请输入评价内容' onInput={(e) => setTextAreaCentent(e.detail.value)} />
+            <View className='bottomButtomBox'>
+              <ButtontWX onClick={ButtonOK} butText='提交' butWidth={80} butHeight={34} butFontSize={16} butBorderRadius={0} />
+            </View>
+          </View>
+
+
+
+        </View> : <View></View>
+      }
+    </>
+
+
+
+
+
+  )
+}
+

src/components/AssessModel/style.less

@@ -0,0 +1,55 @@
+.modelBack {
+  width: 100vw;
+  height: 100vh;
+  background-color: rgba(0, 0, 0, 0.2);
+  z-index: 10;
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+
+.assessModel-box {
+  z-index: 8888;
+
+  padding: 60px 30px;
+  width: 80vw;
+  margin: 8em auto;
+  background: #ffffff;
+  border-radius: 40px;
+
+  &-top {
+  }
+  .item-center-Number {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    padding-bottom: 38px;
+    margin-bottom: 41px;
+    .card-box-star {
+      margin: 23px 0 7px 0;
+      display: flex;
+      align-items: center;
+
+      .card-box-star-text {
+        font-size: 34px;
+        font-weight: bold;
+        color: #333333;
+      }
+      .card-star-image {
+        padding-left: 35px;
+        width: 23px;
+        height: 55px;
+      }
+    }
+  }
+  > Textarea {
+    width: 70vw;
+    margin: 0 auto;
+    font-size: 30px;
+    font-weight: 500;
+    padding: 37px 30px;
+    border: 1px solid rgba(0, 0, 0, 0.2);
+  }
+  .bottomButtomBox {
+    position: relative;
+    top: 3vh;
+  }
+}

src/components/CarsListContent/index.jsx

@@ -15,24 +15,25 @@ import { setMorKm } from '@/utils/codeSegment'
 import './style.less'
 
 export default withLayout((props) => {
+
+  const { carsList } = props
   const { sserLocation } = useModel('userData')
   // const { carsList } = props
 
-  const [carsList, setCarsList] = useState([])
-
+  // const [carsList, setCarsList] = useState([])
 
-  useEffect(() => {
-    getMachinery(sserLocation).then((e) => {
-      setCarsList(e.records)
-    })
+  // useEffect(() => {
+  //   getMachinery(sserLocation).then((e) => {
+  //     setCarsList(e.records)
+  //   })
 
-  }, [sserLocation])
+  // }, [sserLocation])
 
 
 
 
   const startReserve = (res) => {
-    Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id=${res}` })
+    Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id=${res}&location=${sserLocation}` })
 
   }
   const goCarsInfo = (res) => {
@@ -40,6 +41,7 @@ export default withLayout((props) => {
 
   }
   const goMapInfo = (res) => {
+    console.log("🚀 ~ file: index.jsx ~ line 43 ~ goMapInfo ~ res", res)
     Taro.navigateTo({ url: `/pages/CheckMap/index?id=${res}&location=${sserLocation}` })
 
 
@@ -51,7 +53,7 @@ export default withLayout((props) => {
 
     <>
       {
-        carsList != [] ? carsList.map((item, index) => {
+        carsList?.length > 0 ? carsList.map((item, index) => {
           return (
             <View key={index} className='carsListImga-bottom-box'>
               <Image src={item.thumb} onClick={() => goCarsInfo(item.machineryId)} />

src/components/LoginModel/index.jsx

@@ -30,8 +30,8 @@ export default (props) => {
 
   const [checkImage, setCheckImage] = useState(false)
 
-  const [InputPhoneValue, setInputPhoneValue] = useState('18082043755')
-  const [InputCodeValue, setInputCodeValue] = useState('375501')
+  const [InputPhoneValue, setInputPhoneValue] = useState('')
+  const [InputCodeValue, setInputCodeValue] = useState('')
 
   const onInputPhone = (r) => {
     setInputPhoneValue(r?.detail?.value)

src/components/Popup/index.jsx

@@ -0,0 +1,11 @@
+
+import './style.less'
+
+export default (props) => {
+  const { show, mask = true, onClose, maskClosable } = props
+  return (
+    <mp-dialog extClass='x-popup' buttons={[]} show={show} mask={mask} maskClosable={maskClosable} onClose={onClose}>
+      {props.children}
+    </mp-dialog>
+  )
+}

src/components/Popup/style.less

@@ -0,0 +1,9 @@
+.x-popup {
+  .weui-dialog {
+    width: auto;
+  }
+  .weui-dialog__hd,
+  .weui-dialog__ft {
+    display: none;
+  }
+}

src/components/orderRater/index.js

@@ -36,27 +36,22 @@ Component({
         {
           light: scoreON,
           gray: scoreOFF,
-          // tips: '极差'
         },
         {
           light: scoreON,
           gray: scoreOFF,
-          // tips: '差'
         },
         {
           light: scoreON,
           gray: scoreOFF,
-          // tips: '一般'
         },
         {
           light: scoreON,
           gray: scoreOFF,
-          // tips: '好'
         },
         {
           light: scoreON,
           gray: scoreOFF,
-          // tips: '极好'
         },
 
       ]
@@ -69,14 +64,19 @@ Component({
 
 
   methods: {
+
     clickStar: function (e) {
       if (this.properties.onlyShow) return
       let index = e.currentTarget.dataset.index
       this.setData({
         initScore: index + 1
       })
+
+      console.log("🚀 ~ file: index.js ~ line 73 ~ index + 1", index + 1)
       this.triggerEvent('raterChange', index + 1)
 
+
+
     }
   },
   ready () {

src/layouts/index.jsx

@@ -3,10 +3,10 @@
 import useRouter from '@/utils/hooks/useRouter'
 import { useEffect, useMemo, useState } from 'react'
 import { useModel } from '@/store'
+import Spin from "@/components/Spin";
 
 import LoginModel from '@/components/LoginModel'
 import useLogin from '@/utils/hooks/useLogin'
-import Spin from "@/components/Spin";
 
 
 

src/pages/CheckDetails/index.jsx

@@ -32,7 +32,7 @@ export default withLayout((props) => {
         setContentList(e.contentList)
         setCarsInfo(e)
 
-        console.log('e', e);
+        console.log('setCarsInfosetCarsInfosetCarsInfo', e);
       })
     }
 
@@ -44,12 +44,12 @@ export default withLayout((props) => {
 
 
   const startReserve = () => {
-    Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
+    Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id=${carsInfo?.machineryId}&location=${location}` })
 
   }
 
   const goMapInfo = (res) => {
-    Taro.navigateTo({ url: `/pages/CheckMap/index?mapId=${res + 111}` })
+    Taro.navigateTo({ url: `/pages/CheckMap/index?id=${carsInfo?.machineryId}&location=${location}` })
 
   }
 

src/pages/CheckMap/index.jsx

@@ -17,6 +17,7 @@ export default withLayout((props) => {
 
   const $instance = Taro.getCurrentInstance()
   const { id, location } = $instance.router.params
+  console.log("🚀 ~ file: index.jsx ~ line 20 ~ withLayout ~ $instance.router.params", $instance.router.params)
 
 
   const { sserLocation } = useModel('userData')
@@ -25,8 +26,6 @@ export default withLayout((props) => {
 
 
   const LocationMap = sserLocation.split(",")
-  console.log("🚀 ~ file: index.jsx ~ line 25 ~ LocationMap", LocationMap)
-
 
   const [carsInfo, setCarsInfo] = useState({})
   const [imagesList, setImagesList] = useState([])
@@ -34,20 +33,24 @@ export default withLayout((props) => {
 
 
   useEffect(() => {
+    if (id) {
+      getMachineryInfo(id, { location: sserLocation, attached: true }).then((e) => {
+        setImagesList(e.imagesList)
+        setContentList(e.contentList)
+        setCarsInfo(e)
+
+        console.log('e', e);
+      })
+    }
 
-    getMachineryInfo(id, { location: location, attached: true }).then((e) => {
-      setImagesList(e.imagesList)
-      setContentList(e.contentList)
-      setCarsInfo(e)
 
-      console.log('e', e);
-    })
 
-  }, [$instance.router.params, id, location])
+  }, [$instance.router.params, id, sserLocation])
 
 
   const startReserve = () => {
-    Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
+    Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id=${id}&location=${location}` })
+
 
   }
 

src/pages/HelpCenterInfo/index.jsx

@@ -1,57 +0,0 @@
-import { View, Image } from "@tarojs/components"
-import CustomNav from "@/components/CustomNav"
-
-import withLayout from '@/layouts'
-
-import './style.less'
-
-
-
-export default withLayout((props) => {
-
-  return (
-    <View className='page-index'>
-      <View className='index-navbar'>
-        <CustomNav title='帮助中心' />
-      </View>
-      <scroll-view scrollY style='height: 100%;' >
-
-        <View className='help-center-cell'>
-          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
-          <View className='help-center-cell-bottom' >
-            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
-            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
-          </View>
-        </View>
-        <View className='help-center-cell'>
-          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
-          <View className='help-center-cell-bottom' >
-            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
-            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
-          </View>
-        </View>
-        <View className='help-center-cell'>
-          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
-          <View className='help-center-cell-bottom' >
-            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
-            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
-          </View>
-        </View>
-        <View className='help-center-cell'>
-          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
-          <View className='help-center-cell-bottom' >
-            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
-            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
-          </View>
-        </View>
-        <View className='help-center-cell'>
-          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
-          <View className='help-center-cell-bottom' >
-            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
-            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
-          </View>
-        </View>
-      </scroll-view>
-    </View>
-  )
-})

src/pages/InformationInfo/InfoImgaText.jsx

@@ -0,0 +1,15 @@
+import { Image } from "@tarojs/components"
+import './infoimgaText.less'
+
+export default (props) => {
+  const { item } = props
+  return (
+    <view className='cardext-box'>
+      {
+        item.contentType == 'image' ?
+          <Image key={item.extId} style={{ width: '100%' }} src={item.content} /> :
+          <view style={{ textIndent: '2em' }} className='storezn'>{item.content}</view>
+      }
+    </view>
+  )
+}

src/pages/HelpCenterInfo/index.config.js → src/pages/InformationInfo/index.config.js

@@ -1,6 +1,6 @@
 
 export default {
-  navigationBarTitleText: '帮助中心',
+  navigationBarTitleText: '农业资讯',
   navigationStyle: 'custom',
   disableScroll: true,
   usingComponents: {

src/pages/InformationInfo/index.jsx

@@ -0,0 +1,61 @@
+import { View, Image } from "@tarojs/components"
+import CustomNav from "@/components/CustomNav"
+import decorate from "@/assets/icons/comm/decorate.png"
+import withLayout from '@/layouts'
+import Taro from "@tarojs/taro"
+
+import { useEffect, useState } from "react"
+import { getNewsInfo } from "@/services/news"
+import InfoImgaText from "./InfoImgaText"
+
+
+
+import './style.less'
+
+
+
+export default withLayout((props) => {
+
+  const $instance = Taro.getCurrentInstance()
+  const { id } = $instance.router.params
+  const [newInfo, setNewInfo] = useState()
+  useEffect(() => {
+    if (id) {
+      getNewsInfo(id).then((res) => {
+        setNewInfo(res)
+
+      })
+    }
+  }, [])
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='农业资讯' />
+      </View>
+      <scroll-view scrollY style='height: 100%;' >
+        <View>
+          <View className='articleTitle-box-sta'>
+            <Image src={decorate} />
+            <View >{newInfo?.title}</View>
+            <Image src={decorate} />
+          </View>
+          <View style={{ margin: '25px auto 6em auto', padding: '1px 15px 0px 15px' }}>
+            {
+              newInfo?.contentList.map((item, index) => {
+                return (
+                  <InfoImgaText item={item} />
+
+                )
+
+              })
+            }
+
+          </View>
+
+
+        </View>
+      </scroll-view>
+    </View>
+  )
+})

src/pages/InformationInfo/style.less

@@ -0,0 +1,15 @@
+.articleTitle-box-sta {
+  width: 100%;
+  display: flex;
+  font-size: 40px;
+  font-weight: bold;
+  color: #222222;
+  align-items: center;
+  justify-content: center;
+  margin-top: 32px;
+  > Image {
+    width: 33px;
+    height: 33px;
+    margin: auto 31px;
+  }
+}

src/pages/MoreCars/CarTypeList.jsx

@@ -40,12 +40,13 @@ export default withLayout((props) => {
   }
 
 
+
   return (
 
 
     <>
       {
-        csrsListType !== [] ? csrsListType.map((item, index) => {
+        csrsListType?.length > 0 ? csrsListType.map((item, index) => {
           return (
             <View key={index} className='carsListImga-bottom-box'>
               <Image src={item.thumb} onClick={() => goCarsInfo(item.machineryId)} />

src/pages/MoreCars/index.jsx

@@ -2,7 +2,8 @@
 
 import { View, Image, Input, Picker, Text } from "@tarojs/components"
 import { useModel } from "@/store"
-
+import Taro from "@tarojs/taro"
+import ListPlaceholder from "@/components/ListPlaceholder"
 import withLayout from '@/layouts'
 import { useState, useEffect } from "react"
 import CustomNav from "@/components/CustomNav"
@@ -12,6 +13,8 @@ import CarTypeList from "./CarTypeList"
 
 
 
+
+
 import './style.less'
 
 
@@ -31,26 +34,6 @@ export default withLayout((props) => {
   const [tabIndex, steTabIndex] = useState(0)
 
 
-  const handleSearch = (e) => {
-  }
-
-
-
-
-  // const ClassificationComparison = () => {
-  //   for (let item1 of tabs) {
-  //     let _index = activeNames.findIndex(c => c.name == item1.title)
-  //     if (_index > -1) {
-  //       item1.count = activeNames[_index].typeId;
-  //       console.log('saleTypes=tempSales //这', activeNames[_index].typeId);
-
-  //       // classId.push({ id: item1.count })
-
-  //     }
-  //   }
-
-
-  // }
 
   useEffect(() => {
     if (tabIndex !== 0) {
@@ -76,6 +59,7 @@ export default withLayout((props) => {
 
 
   useEffect(() => {
+
     getMachineryType().then((e) => {
       const tabList = e.records
       setActiveNames(tabList)
@@ -86,6 +70,11 @@ export default withLayout((props) => {
     })
   }, [])
 
+  const goSearch = () => {
+    Taro.navigateTo({ url: `/pages/Search/index?location=${sserLocation}` })
+
+  }
+
 
   const handleTabChange = (e) => {
     console.log('e', e.detail);
@@ -100,8 +89,8 @@ export default withLayout((props) => {
         <CustomNav title='更多' />
       </View>
       <scroll-view scrollY style='height: 100%;' >
-        <View className='heads-content-searchClass-abcc'>
-          <Input type='text' className='heads-content-searchClass-abcc-searchInput' onBlur={handleSearch} placeholder='搜索关键字查询订单' />
+        <View className='heads-content-searchClass-abcc' onClick={goSearch}>
+          <Input type='text' disabled className='heads-content-searchClass-abcc-searchInput' placeholder='搜索关键字查询农机' />
           <Image src={searchs} className='heads-content-searchClass-abcc-searchInput-searchImg' />
         </View>
         <mp-tabs
@@ -117,7 +106,9 @@ export default withLayout((props) => {
 
         {/* 内容区域 */}
         <View className='cententText'>
-          <CarTypeList csrsListType={csrsListType} />
+          {
+            csrsListType !== [] ? <CarTypeList csrsListType={csrsListType} /> : <ListPlaceholder title='该分类暂无农机！' />
+          }
         </View>
       </scroll-view>
     </View>

src/pages/MyAddressList/index.jsx

@@ -19,7 +19,10 @@ import './style.less'
 export default withLayout((props) => {
   const [addresList, setAddresList] = useState([])
   const $instance = Taro.getCurrentInstance()
-  const { orderAddress } = $instance.router.params
+  const { type } = $instance.router.params
+  console.log("🚀 ~ file: index.jsx ~ line 23 ~ withLayout ~ orderAddress", type)
+
+
   const { setUserOrderAddress, userOrderAddress } = useModel('userData')
 
 
@@ -152,7 +155,7 @@ export default withLayout((props) => {
 
                     <View className='addressList-box-addressBotton-setAddress'>
                       {
-                        orderAddress ? <>
+                        !type ? <>
                           <View>
                             设为默认地址:
                             <RadioGroup className='radio-group' onChange={(res) => handelSwitch(item.addressId, res)} >

src/pages/OrderConfirmation/index.jsx

@@ -26,7 +26,7 @@ export default withLayout((props) => {
   // }
 
   const $instance = Taro.getCurrentInstance()
-  const { id } = $instance.router.params
+  const { id, location } = $instance.router.params
   const { sserLocation, userOrderAddress } = useModel('userData')
 
   const [timeSel, setTimeSel] = useState('')
@@ -79,7 +79,7 @@ export default withLayout((props) => {
   }
   useEffect(() => {
     if (id) {
-      getMachineryInfo(id, { location: sserLocation, attached: true }).then((e) => {
+      getMachineryInfo(id, { location: location, attached: true }).then((e) => {
         setCarsInfo(e)
         console.log('e', e);
       })
@@ -137,8 +137,8 @@ export default withLayout((props) => {
             </View>
           </View>
           <View className='BottomtBut-box'>
-            <ButtontWX onClick={formSubmit} formType='submit' butText='确定' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
-            <ButtontWX onClick={cancelPay} formType='submit' styleType butText='取消' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
+            <ButtontWX onClick={formSubmit} butText='确定' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
+            <ButtontWX onClick={cancelPay} styleType butText='取消' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
           </View>
         </Form>
       </View>

src/pages/OrderInfo/index.config.js

@@ -4,6 +4,8 @@ export default {
   navigationStyle: 'custom',
   disableScroll: true,
   usingComponents: {
+    "mp-orderRater": '../../components/orderRater/index',
+    "mp-dialog": "weui-miniprogram/dialog/dialog",
   }
 
 }

src/pages/OrderInfo/index.jsx

@@ -1,11 +1,12 @@
 import { View, Text } from "@tarojs/components"
 import { useEffect, useState } from "react"
-import Taro from "@tarojs/taro"
+import Taro, { useDidShow } from "@tarojs/taro"
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
 import formatTimes from "@/utils/codeSegment"
 import withLayout from '@/layouts'
 import formatPrice from "@/utils/formatPrice"
+import AssessModel from "@/components/AssessModel"
 
 import { generateOrder, orderDelete, orderInfo } from "@/services/order"
 // import BottomMoadl from '@/components/BottomMoadl/index'
@@ -18,11 +19,16 @@ import { generateOrder, orderDelete, orderInfo } from "@/services/order"
 import './style.less'
 
 export default withLayout((props) => {
+  // const { stateType } = props
 
   const $instance = Taro.getCurrentInstance()
-  const { orderId, } = $instance.router.params
+  const { orderId, stateType, stateStyle } = $instance.router.params
 
   const [orderInfos, setOrderInfos] = useState()
+  console.log("🚀 ~ file: index.jsx ~ line 27 ~ stateType ~ stateType", stateType)
+  const [isAssessVisible, setIsAssessVisible] = useState(false)
+
+
   //底部弹窗
   // const [showFrame, setShowFrame] = useState(false)
   // const setRecommend = () => {
@@ -82,12 +88,25 @@ export default withLayout((props) => {
     //支付逻辑
   }
 
+  const startModle = () => {
+    setIsAssessVisible(true)
+
+  }
+  const onClose = () => {
+    setIsAssessVisible(false)
+    Taro.navigateBack({
+      delta: 1
+    })
+
+  }
+
 
   return (
     <View className='page-index'>
       <View className='index-navbar'>
         <CustomNav title='订单详情' />
       </View>
+      <AssessModel orderId={orderId} showCutover={isAssessVisible} maskClosable={isAssessVisible} onClose={onClose} onFinish={onClose} />
       {/* <BottomMoadl frameTitle='支付方式' flag={showFrame} onRecommend={setRecommend} /> */}
       <View className='orders-listBox-RihtboxBoxOrderViewText'>
         <View className='View-LiftTextTop'>订单编号：<Text>{orderInfos?.orderNo}</Text></View>
@@ -97,13 +116,29 @@ export default withLayout((props) => {
         <View>下单时间：<Text>{formatTimes(orderInfos?.createDate, 'yyyy-MM-dd')}</Text></View>
         <View>订单状态：<Text  >{orderInfos?.payStatus}</Text></View>
         <View className='View-LiftTextBotton'>
-          <View>费用：<Text className='feiyongStyle'>{formatPrice(orderInfos?.charges)}</Text></View>
+          <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>
       </View>
       <View className='BottomtBut' >
-        <ButtontWX butText='取消' onClick={cancelPay} butWidth={123} butHeight={39} butFontSize={16} butBorderRadius={49} />
+        <>
+          {
+            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='取消' 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={pay} butWidth={123} butHeight={39} butFontSize={16} butBorderRadius={49} />
       </View>
     </View>
   )

src/pages/OrderInfo/style.less

@@ -37,7 +37,16 @@
     }
 
     .feiyongStyle {
+      justify-content: space-between;
+      display: flex;
       color: #222222;
+      &-charges {
+        background: linear-gradient(180deg, #fa7878 0%, #b61515 100%);
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+      }
+      &-stateStyle {
+      }
     }
   }
 }

src/pages/Search/index.config.js

@@ -0,0 +1,10 @@
+
+export default {
+  navigationBarTitleText: '搜索',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  usingComponents: {
+
+  }
+
+}

src/pages/Search/index.jsx

@@ -0,0 +1,56 @@
+import Taro from '@tarojs/taro'
+import CustomNav from '@/components/CustomNav'
+import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
+
+import { View, Input, Image } from '@tarojs/components'
+import withLayout from '@/layouts'
+import { useThrottle } from '@/utils/codeSegment'
+import CarsListContent from "@/components/CarsListContent"
+import { getMachinery } from '@/services/homes'
+import { useModel } from '@/store'
+
+
+import './style.less'
+import { useState } from 'react'
+
+
+
+export default withLayout((props) => {
+  const $instance = Taro.getCurrentInstance()
+  const { id, location } = $instance.router.params
+  console.log("🚀 ~ file: index.jsx ~ line 20 ~ withLayout ~ location", location)
+
+  const handleSearch = (e) => {
+    console.log("🚀 ~ file: index.jsx ~ line 14 ~ handleSearch ~ e", e)
+
+  }
+
+  const [carsList, setCarsList] = useState([])
+  //节流 搜索
+  const handlerSearch = useThrottle((e) => {
+    const { value } = e?.detail
+    getMachinery(location, { q: value, location: location }).then((res) => {
+      console.log('根据农机名字查', res);
+      setCarsList(res.records)
+    })
+
+  }, 1000)
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='搜索' />
+      </View>
+      <scroll-view scrollY style='height: 100%;' >
+        <View className='searchClass-jieguoye'>
+          <Input type='text' onInput={handlerSearch} placeholder='搜索关键字查询' />
+          <Image src={searchs} />
+        </View>
+        <CarsListContent carsList={carsList} />
+
+
+      </scroll-view>
+    </View>
+  )
+
+})

src/pages/Search/style.less

@@ -0,0 +1,24 @@
+.searchClass-jieguoye {
+  display: inline-block;
+  position: relative;
+  width: 92%;
+  margin-top: 30px;
+  text-align: center;
+  left: 4vw;
+  > Input {
+    background: #f8f8f8;
+    border-radius: 34px;
+    padding-left: 68px;
+    padding-right: 34px;
+    font-size: 28px;
+    height: 68px;
+    line-height: 68px;
+  }
+  > Image {
+    width: 30px;
+    height: 30px;
+    position: absolute;
+    left: 31px;
+    top: 19px;
+  }
+}

src/pages/index/index.jsx

@@ -9,6 +9,7 @@ import tabList from './tabbar'
 import Homes from './tabs/Homes'
 import Orders from './tabs/Orders'
 import Mine from './tabs/Mine'
+import Information from './tabs/Information'
 
 import './index.less'
 
@@ -65,8 +66,9 @@ export default withLayout((props) => {
       <view className='index-container'>
         {currentTab === 0 && <Homes />}
         {currentTab === 1 && <Orders router={router} />}
-        {/* {currentTab === 2 && <Strategy />} */}
-        {currentTab === 2 && <Mine isDidShow={isDidShow} router={router} />}
+        {currentTab === 2 && <Information router={router} />}
+
+        {currentTab === 3 && <Mine isDidShow={isDidShow} router={router} />}
       </view>
       <view className='index-tabbar'>
         <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>

src/pages/index/tabbar.js

@@ -10,6 +10,11 @@ const tabbar = [
     iconPath: require('@/assets/tabbar/OrdersOFFImgaes.png'),
     selectedIconPath: require('@/assets/tabbar/OrdersNOImgaes.png'),
   },
+  {
+    text: '资讯',
+    iconPath: require('@/assets/tabbar/newsONImages.png'),
+    selectedIconPath: require('@/assets/tabbar/newsOFFImages.png'),
+  },
   {
     text: '我的',
     iconPath: require('@/assets/tabbar/MineOFFImgaes.png'),

src/pages/index/tabs/Homes.jsx

@@ -30,7 +30,7 @@ export default withLayout((props) => {
       setCarsList(e.records)
     })
 
-  }, [])
+  }, [sserLocation])
 
 
 
@@ -42,6 +42,11 @@ export default withLayout((props) => {
     console.log(e?.detail?.value)
   }
 
+  const goSearch = () => {
+    Taro.navigateTo({ url: `/pages/Search/index?location=${sserLocation}` })
+
+  }
+
   const goToCarsList = () => {//更多
     Taro.navigateTo({ url: `/pages/MoreCars/index` })
 
@@ -59,8 +64,8 @@ export default withLayout((props) => {
           <Text>邓州市</Text>
           <View className='heads-top-box-left-addresssImg-DownIcon' />
         </View>
-        <View className='heads-content-searchClass'>
-          <Input type='text' className='heads-content-searchClass-searchInput' onBlur={handleSearch} placeholder='搜索关键字查询订单' />
+        <View className='heads-content-searchClass' onClick={goSearch}>
+          <Input disabled type='text' className='heads-content-searchClass-searchInput' placeholder='搜索关键字查询农机' />
           <Image src={searchs} className='heads-content-searchClass-searchInput-searchImg' />
         </View>
       </View>

src/pages/index/tabs/Information.jsx

@@ -0,0 +1,50 @@
+import { View, Image } from "@tarojs/components"
+import Taro from "@tarojs/taro"
+import { useEffect, useState } from "react"
+import withLayout from '@/layouts'
+import { getNewsList } from "@/services/news"
+import formatTimes from "@/utils/codeSegment"
+import ListPlaceholder from "@/components/ListPlaceholder"
+
+import './InformationCss/style.less'
+
+
+
+
+export default withLayout((props) => {
+  const [newList, setNewList] = useState([])
+
+  const goInfoMationInfo = (res) => {
+    Taro.navigateTo({ url: `/pages/InformationInfo/index?id=${res}` })
+
+  }
+  useEffect(() => {
+    getNewsList().then((res) => {
+      setNewList(res.records)
+    })
+  }, [])
+
+  return (
+
+    <scroll-view scrollY style='height: 100%;' >
+      <View >
+        {
+          newList?.length > 0 ? newList?.map((item, index) => {
+            return (
+              <View key={index} className='help-center-cell' onClick={() => goInfoMationInfo(item?.newsId)} >
+                <Image src={item?.thumb} />
+                <View className='help-center-cell-bottom' >
+                  <View className='help-center-cell-bottom-title'  >{item?.title}</View>
+                  <View className='help-center-cell-bottom-content' >{formatTimes(item?.createDate, 'yyyy-mm-dd')}</View>
+                </View>
+              </View>
+            )
+          }) : <ListPlaceholder title='暂无农业资讯' />
+        }
+
+
+      </View>
+
+    </scroll-view>
+  )
+})

src/pages/HelpCenterInfo/style.less → src/pages/index/tabs/InformationCss/style.less

@@ -18,8 +18,12 @@
       font-size: 34px;
       font-weight: bold;
       color: #222222;
+      text-overflow: ellipsis; //显示...
+      -webkit-line-clamp: 2;
+      overflow: hidden;
     }
     &-content {
+      text-align: right;
       font-size: 28px;
       font-weight: 400;
       color: #121212;

src/pages/index/tabs/Mine.jsx

@@ -28,8 +28,7 @@ export default withLayout((props) => {
   const userList = [
     { userTitle: '关于我们', userImg: aboutUs, pageType: 0 },
     { userTitle: '版本更新', userImg: versionUpdate, pageType: 1 },
-    { userTitle: '帮助中心', userImg: helpCenter, pageType: 2 },
-    { userTitle: '意见反馈', userImg: feedbacks, pageType: 3 },
+    { userTitle: '意见反馈', userImg: feedbacks, pageType: 2 },
   ]
 
   const $instance = Taro.getCurrentInstance()
@@ -62,11 +61,11 @@ export default withLayout((props) => {
   }, [$instance.router.params.userOk, person?.avatar, person?.nickName, person.phone])
 
   const setAddress = (dd) => {
-    Taro.navigateTo({ url: `/pages/MyAddressList/index?id${dd}` })
+    Taro.navigateTo({ url: `/pages/MyAddressList/index?id=${dd}` })
 
   }
   const goUserInfo = (dd) => {
-    Taro.navigateTo({ url: `/pages/userInfo/index?id${dd}` })
+    Taro.navigateTo({ url: `/pages/userInfo/index?id=${dd}` })
 
   }
 
@@ -86,12 +85,7 @@ export default withLayout((props) => {
 
         break;
       case 2:
-        Taro.navigateTo({ url: '/pages/HelpCenterInfo/index' })
-
-        break;
-      case 3:
         Taro.navigateTo({ url: '/pages/FeedbackText/index' })
-
         break;
 
       default:

src/pages/index/tabs/Orders.jsx

@@ -1,6 +1,8 @@
 
 import { View, Image, Text } from "@tarojs/components"
 import Taro, { useDidShow } from '@tarojs/taro'
+import withLayout from '@/layouts'
+import ListPlaceholder from "@/components/ListPlaceholder"
 
 import ordersListImga from '@/assets/ordersImages/ordersListImga.png'
 import ordersLeft from '@/assets/ordersImages/ordersLeft.png'//订单装饰
@@ -8,27 +10,28 @@ import { useEffect, useState } from "react"
 import { getOrder } from "@/services/order"
 import formatTimes from "@/utils/codeSegment"
 import { useModel } from "@/store"
-import withLayout from '@/layouts'
-import ListPlaceholder from "@/components/ListPlaceholder"
+import formatPrice from "@/utils/formatPrice"
+
 import './OrdersCss/style.less'
 
 
+
 export default withLayout((props) => {
 
   const [ourderList, setOrderList] = useState([])
 
-  const { person, setPerson } = useModel('userData')
 
+  const { person, setPerson } = useModel('userData')
 
 
   useDidShow(() => {
-    getOrder().then((e) => {
+    getOrder({ pageSize: 30 }).then((e) => {
       const { records } = e
       setOrderList(records)
     })
   })
   useEffect(() => {
-    getOrder().then((e) => {
+    getOrder({ pageSize: 31 }).then((e) => {
       const { records } = e
       setOrderList(records)
     })
@@ -36,51 +39,52 @@ export default withLayout((props) => {
   console.log(ourderList, 'ourderList');
 
   const orderStates = (item) => {
-    switch (item) {
-      case 0:
-        return {
-          title: '待付款',
-          styleColor: '#51D4FF'
-        }
-      case 1:
-        return {
-          title: '已付款',
-          styleColor: '#FF703B'
-        }
-      case 2:
-        return {
-          title: '进行中',
-          styleColor: '#44F68B'
-        }
-      case 3:
-        return {
-          title: '已完成',
-          styleColor: '#FF703B'
-        }
-      case 4:
-        return {
-          title: '待评价',
-          styleColor: '#51D4FF'
-        }
-      case 5:
-        return {
-          title: '退单待审',
-          styleColor: '#51D4FF'
-        }
-      case 6:
-        return {
-          title: '待付款',
-          styleColor: '#FF703B'
-        }
-      default:
-        return {
-          title: '暂无状态',
-          styleColor: '#000'
-        }
+    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.workStatus == 0 && item.dispatchStatus === 1) {
+      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) {
+      return {
+        title: '已完成',
+        styleColor: '#FF703B'
+      }
+    } else if (item.payStatus === 1 && item.workStatus === 0 && item.isRefund === 1) {
+      return {
+        title: '已退单',
+        styleColor: '#FF703B'
+      }
+    } else {
+      return {
+        title: '异常',
+        styleColor: '#FF0000'
+      }
     }
   }
-  const handleTobePaid = (id) => {
-    Taro.navigateTo({ url: `/pages/OrderInfo/index?orderId=${id}` })
+
+  const handleTobePaid = (id, stateType, stateStyle) => {
+    Taro.navigateTo({ url: `/pages/OrderInfo/index?orderId=${id}&stateType=${stateType}&stateStyle=${stateStyle}` })
   }
 
 
@@ -95,19 +99,20 @@ export default withLayout((props) => {
         {/* <View className='content-header-box-orders-rightCentent'>更多&gt;&gt;</View> */}
       </View>
       {
-        ourderList != [] ? ourderList.map((item, index) => {
+        ourderList?.length > 0 ? ourderList.map((item, index) => {
           return (
             <View key={index} className='orders-listBox'>
               <Image src={ordersLeft} />
               <View className='orders-listBox-RihtboxBoxOrderViewText'>
-                <View className='View-LiftTextTop' onClick={() => handleTobePaid(item.orderId)} >订单编号：<Text>{item.orderNo}</Text><Text className='View-LiftTextTop-nextText'>更多&gt;&gt;</Text></View>
+                <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>
                 <View>农机名称：<Text>{item.machineryName}</Text></View>
                 <View>作业面积：<Text>{item.amount}</Text></View>
                 <View>需求时间：<Text>{formatTimes(item.appointmentDate, 'yyyy-MM-dd')}</Text></View>
                 <View>下单时间：<Text>{formatTimes(item.createDate, 'yyyy-MM-dd')}</Text></View>
                 <View className='View-LiftTextBotton'>
-                  <View>订单状态：<Text style={{ color: orderStates(item.payStatus).styleColor }} >{orderStates(item.orderState).title}</Text></View>
-                  <View>费用：<Text className='feiyongStyle'>{item.charges}</Text></View>
+                  <View>订单状态：<Text style={{ color: orderStates(item)?.styleColor }} >{orderStates(item)?.title}</Text></View>
+                  <View>费用：<Text className='feiyongStyle'>{formatPrice(item.charges)}</Text></View>
                 </View>
               </View>
             </View>

src/routes.js

@@ -6,6 +6,11 @@ const Pages = [
     page: 'pages/index/index',
     isIndex: true,
   },
+  {
+    title: '搜索页',
+    page: 'pages/Search/index',
+  },
+
   {
     title: '订单详情',
     page: 'pages/OrderInfo/index',
@@ -39,9 +44,14 @@ const Pages = [
     title: '版本更新',
     page: 'pages/NewVersionUpdatePage/index',
   },
+  // {
+  //   title: '帮助中心',
+  //   page: 'pages/HelpCenterInfo/index',
+  // },
+
   {
-    title: '帮助中心',
-    page: 'pages/HelpCenterInfo/index',
+    title: '农业资讯详情页',
+    page: 'pages/InformationInfo/index',
   },
   {
     title: '意见反馈',

src/services/news.js

@@ -0,0 +1,18 @@
+
+import request from '@/utils/request'
+
+
+/**
+ * 农机资讯
+ * @param {*} data 
+ * @returns 
+ */
+export const getNewsList = (data) => request('/news', { data, method: 'GET' })
+
+/**
+ * 农机资讯详情
+ * @param {*} data 
+ * @returns 
+ */
+export const getNewsInfo = (id, data) => request(`/news/${id}`, { data, method: 'GET' })
+

src/services/order.js

@@ -31,5 +31,10 @@ export const orderInfo = (id, data) => request(`/order/${id}`, { data, method: '
 export const orderDelete = (id, data) => request(`/order/${id}`, { data, method: 'DELETE' })
 
 
-
+/**
+ * 评价订单
+ * @param {*} data 
+ * @returns 
+ */
+export const orderEvaluation = (data) => request(`/evaluation`, { data, method: 'POST' })
 

src/utils/codeSegment.js

@@ -1,3 +1,7 @@
+import { useCallback, useEffect, useRef } from "react";
+
+
+
 /**
  * object 转 queryStr
  * @param {*} params 
@@ -65,3 +69,24 @@ export function setMorKm (m) {
   return n
 }
 
+
+
+// 节流
+export function useThrottle (fn, delay, dep = []) {
+  const { current } = useRef({ fn, timer: null })
+  useEffect(
+    function () {
+      current.fn = fn
+    },
+    [fn]
+  )
+  return useCallback(function f (...args) {
+    if (!current.timer) {
+      current.timer = setTimeout(() => {
+        delete current.timer
+      }, delay)
+      current.fn.call(this, ...args)
+    }
+  }, dep)
+}
+