fitem

src/pages/OrderConfirmation/index.jsx

@@ -1,5 +1,5 @@
 import { View, Image, Form, Input, Picker } from "@tarojs/components"
-import Taro from "@tarojs/taro"
+import Taro, { useDidShow } from "@tarojs/taro"
 import { useEffect, useState } from "react"
 import withLayout from '@/layouts'
 import { useModel } from "@/store"
@@ -27,32 +27,55 @@ export default withLayout((props) => {
 
   const $instance = Taro.getCurrentInstance()
   const { id } = $instance.router.params
-  const { sserLocation, setUserLocation } = useModel('userData')
+  const { sserLocation, userOrderAddress } = useModel('userData')
 
   const [timeSel, setTimeSel] = useState('')
   const [carsInfo, setCarsInfo] = useState({})
+  const [userAddres, setUserAddres] = useState('')//在store拿到位置
 
 
+
+  useDidShow(() => {
+
+    if (userOrderAddress) {
+      setUserAddres(userOrderAddress)
+
+    }
+  }, [userOrderAddress])
+
   const formSubmit = (e) => {
-    console.log('表单输入', e?.detail?.value);
     const { amount, appontmentDate, address } = e?.detail?.value
-    // Taro.navigateTo({ url: `/pages/OrderInfo/index?goOrder=${id}` })
-    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,
-      // appontmentDate: appontmentDate || '',
-      appontmentDate: '2022-03-25 08:00:00',
-    }).then((es) => {
-      Taro.redirectTo({ url: `/pages/OrderInfo/index?orderId=${es.orderId}` })
 
-    })
+    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) => {
+        Taro.showToast({
+          title: '农机预约成功',
+          icon: 'success',
+          duration: 2000
+        }).then(() => {
+          Taro.redirectTo({ url: `/pages/OrderInfo/index?orderId=${es.orderId}` })
+        })
+      })
+    } else {
+      Taro.showToast({
+        title: '请填写完整信息',
+        icon: 'error',
+        duration: 2000
+      })
+    }
+    // Taro.navigateTo({ url: `/pages/OrderInfo/index?goOrder=${id}` })
   }
   useEffect(() => {
     if (id) {
@@ -74,6 +97,9 @@ export default withLayout((props) => {
   }
 
 
+  const goAddress = () => {
+    Taro.navigateTo({ url: `/pages/MyAddressList/index?type=orderAddress` })
+  }
 
 
   return (
@@ -104,9 +130,9 @@ export default withLayout((props) => {
           </View>
           <View className='example-body-WorkingLocation'>
             <View>作业位置：</View>
-            <View className='example-body-WorkingLocation-info' onClick={() => { console.log('111111',); }}>
+            <View className='example-body-WorkingLocation-info' onClick={goAddress}>
               <Image src={addresss} />
-              <Input name='address' disabled className='aTextareaCentent' value='1111111' placeholder='请输入地址信息' />
+              <Input name='address' disabled className='aTextareaCentent' value={userAddres} placeholder={userAddres == '' ? '请输入地址信息' : ''} />
 
             </View>
           </View>