s ss sdebug

src/pages/CheckDetails/index.jsx

@@ -31,8 +31,6 @@ export default withLayout((props) => {
         setImagesList(e.imagesList)
         setContentList(e.contentList)
         setCarsInfo(e)
-
-        console.log('setCarsInfosetCarsInfosetCarsInfo', e);
       })
     }
 

src/pages/CheckMap/index.jsx

@@ -17,7 +17,6 @@ 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')
@@ -39,7 +38,6 @@ export default withLayout((props) => {
         setContentList(e.contentList)
         setCarsInfo(e)
 
-        console.log('e', e);
       })
     }
 

src/pages/InformationInfo/index.jsx

@@ -40,7 +40,7 @@ export default withLayout((props) => {
             <View >{newInfo?.title}</View>
             <Image src={decorate} />
           </View>
-          <View style={{ margin: '25px auto 6em auto', padding: '1px 15px 0px 15px' }}>
+          <View style={{ padding: '25px 15px 130px 15px' }}>
             {
               newInfo?.contentList.map((item, index) => {
                 return (

src/pages/OrderConfirmation/index.jsx

@@ -5,6 +5,7 @@ import withLayout from '@/layouts'
 import { useModel } from "@/store"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import timeImage from '@/assets/icons/comm/timeImage.png'//日期图片
+import formatTimes from "@/utils/codeSegment"
 
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
@@ -44,37 +45,58 @@ export default withLayout((props) => {
   }, [userOrderAddress])
 
   const formSubmit = (e) => {
-    const { amount, appontmentDate, address } = e?.detail?.value
-
-    if (amount && appontmentDate && address) {
-      generateOrder({
-        charges: carsInfo?.price * amount,
-        price: carsInfo?.price,
-        amount: amount || '',
-        machineryId: carsInfo?.machineryId,
-        machineryName: carsInfo?.name,
-        machineryType: carsInfo?.typeId,
-        typeName: carsInfo?.typeName,
-        address: address || '',
-        orgId: carsInfo?.orgId,
-        appointmentDate: `${appontmentDate} 08:00:00` || '',
-        // appointmentDate: '2022-03-25 08:00:00',
-      }).then((es) => {
+    const currentTime = formatTimes(new Date(), 'yyyy-MM-dd')
+    const newTime = formatTimes(timeSel, 'yyyy-MM-dd')
+
+    if (currentTime <= newTime) {
+      // const { amount, appontmentDate, address } = e?.detail?.value
+      const amount = e?.detail?.value?.amount
+      const appontmentDate = e?.detail?.value?.appontmentDate
+      const address = e?.detail?.value?.address
+
+      debugger
+
+      console.log('formSubmit', e?.detail);
+      if (e?.detail?.value?.amount && e?.detail?.value?.appontmentDate && e?.detail?.value?.address) {
+        generateOrder({
+          charges: carsInfo?.price * amount,
+          price: carsInfo?.price,
+          amount: amount || '',
+          machineryId: carsInfo?.machineryId,
+          machineryName: carsInfo?.name,
+          machineryType: carsInfo?.typeId,
+          typeName: carsInfo?.typeName,
+          address: address || '',
+          orgId: carsInfo?.orgId,
+          appointmentDate: `${appontmentDate} 08:00:00` || '',
+          // appointmentDate: '2022-03-25 08:00:00',
+        }).then((es) => {
+          Taro.showToast({
+            title: '农机预约成功',
+            icon: 'success',
+            duration: 2000
+          }).then(() => {
+            Taro.redirectTo({ url: `/pages/OrderInfo/index?orderId=${es.orderId}&stateType=待付款` })
+          })
+        })
+      } else {
         Taro.showToast({
-          title: '农机预约成功',
-          icon: 'success',
+          title: '请填写完整信息',
+          icon: 'error',
           duration: 2000
-        }).then(() => {
-          Taro.redirectTo({ url: `/pages/OrderInfo/index?orderId=${es.orderId}` })
         })
-      })
+      }
+
+
     } else {
       Taro.showToast({
-        title: '请填写完整信息',
+        title: '日期有误！',
         icon: 'error',
         duration: 2000
       })
+      return;
     }
+
     // Taro.navigateTo({ url: `/pages/OrderInfo/index?goOrder=${id}` })
   }
   useEffect(() => {
@@ -87,6 +109,8 @@ export default withLayout((props) => {
   }, [id, sserLocation])
   const onTimeChange = (e) => {
     console.log('时间选择器', e);
+    // 获取当前时间 
+
     setTimeSel(e?.detail?.value)
 
   }
@@ -112,7 +136,7 @@ export default withLayout((props) => {
         <Form onSubmit={formSubmit} >
           <View className='example-body-WorkingArea'>
             <View>作业面积/公顷</View>
-            <Input name='amount' type='number' className='aTextareaCentent' placeholder='请输入地址信息' />
+            <Input name='amount' type='number' maxlength={6} className='aTextareaCentent' placeholder='请输入地址信息' />
           </View>
           <View className='example-body-WorkingTime'>
             <View>作业时间：</View>
@@ -137,7 +161,7 @@ export default withLayout((props) => {
             </View>
           </View>
           <View className='BottomtBut-box'>
-            <ButtontWX onClick={formSubmit} butText='确定' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
+            <ButtontWX onClick={formSubmit} formType='submit' butText='确定' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
             <ButtontWX onClick={cancelPay} styleType butText='取消' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
           </View>
         </Form>

src/pages/Search/index.jsx

@@ -41,12 +41,16 @@ export default withLayout((props) => {
       <View className='index-navbar'>
         <CustomNav title='搜索' />
       </View>
+      <View className='searchClass-jieguoye'>
+        <Input type='text' onInput={handlerSearch} placeholder='搜索关键字查询' />
+        <Image src={searchs} />
+      </View>
       <scroll-view scrollY style='height: 100%;' >
-        <View className='searchClass-jieguoye'>
-          <Input type='text' onInput={handlerSearch} placeholder='搜索关键字查询' />
-          <Image src={searchs} />
+        <View className='CarsListContent'>
+          <CarsListContent carsList={carsList} />
+
         </View>
-        <CarsListContent carsList={carsList} />
+
 
 
       </scroll-view>

src/pages/Search/style.less

@@ -22,3 +22,6 @@
     top: 19px;
   }
 }
+.CarsListContent {
+  padding-bottom: 10em;
+}

src/pages/index/tabs/Information.jsx

@@ -35,7 +35,7 @@ export default withLayout((props) => {
                 <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 className='help-center-cell-bottom-content' >{formatTimes(item?.createDate, 'yyyy-MM-dd')}</View>
                 </View>
               </View>
             )