style

src/components/CarsListContent/index.jsx

@@ -8,6 +8,8 @@ import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import { useModel } from "@/store"
 import ListPlaceholder from "@/components/ListPlaceholder"
 import { getMachinery, } from "@/services/homes"
+import formatPrice from "@/utils/formatPrice"
+import { setMorKm } from '@/utils/codeSegment'
 
 
 import './style.less'
@@ -56,7 +58,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'>{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} />
@@ -65,7 +67,7 @@ export default withLayout((props) => {
               <View className='content-header-box-map' onClick={() => goMapInfo(item.machineryId)}>
                 <View className='content-header-box-map-liftCentent'>
                   <Image src={addresss} />
-                  <View>距离当前位置公里</View>
+                  <View>距离当前位置{setMorKm(item.distance)}</View>
                 </View>
                 <View className='content-header-box-map-rightCentent'>进入地图&gt;&gt;</View>
               </View>

src/pages/MoreCars/CarTypeList.jsx

@@ -7,7 +7,8 @@ import withLayout from '@/layouts'
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import { useModel } from "@/store"
 import ListPlaceholder from "@/components/ListPlaceholder"
-
+import formatPrice from "@/utils/formatPrice"
+import { setMorKm } from '@/utils/codeSegment'
 
 import './CarTypeList.less'
 
@@ -44,14 +45,14 @@ export default withLayout((props) => {
 
     <>
       {
-        csrsListType == [] ? csrsListType.map((item, index) => {
+        csrsListType !== [] ? csrsListType.map((item, index) => {
           return (
             <View key={index} className='carsListImga-bottom-box'>
               <Image src={item.thumb} onClick={() => goCarsInfo(item.machineryId)} />
               <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'>{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} />
@@ -60,7 +61,7 @@ export default withLayout((props) => {
               <View className='content-header-box-map' onClick={() => goMapInfo(item.machineryId)}>
                 <View className='content-header-box-map-liftCentent'>
                   <Image src={addresss} />
-                  <View>距离当前位置公里</View>
+                  <View>距离当前位置{setMorKm(item.distance)}</View>
                 </View>
                 <View className='content-header-box-map-rightCentent'>进入地图&gt;&gt;</View>
               </View>

src/pages/MoreCars/index.jsx

@@ -50,7 +50,6 @@ export default withLayout((props) => {
   //   }
 
 
-
   // }
 
   useEffect(() => {
@@ -67,7 +66,7 @@ export default withLayout((props) => {
     } else {
       // ClassificationComparison()
 
-      getMachinery(sserLocation).then((e) => {
+      getMachinery(sserLocation, { pageSize: 999 }).then((e) => {
         steCsrsListType(e.records)
       })
     }

src/pages/MyAddressList/index.jsx

@@ -5,9 +5,9 @@ import CustomNav from "@/components/CustomNav"
 import edit from "@/assets/icons/comm/edit.png"
 import userRight from '@/assets/mineImgaes/userRight.png'
 import withLayout from '@/layouts'
-
 import deletes from "@/assets/icons/comm/deletes.png"
 import ButtontWX from '@/components/ButtontWX'
+import { useModel } from "@/store"
 
 
 import { addressDefault, getAddress, addressDelete, addressUpdate } from "@/services/address"
@@ -18,6 +18,10 @@ import './style.less'
 
 export default withLayout((props) => {
   const [addresList, setAddresList] = useState([])
+  const $instance = Taro.getCurrentInstance()
+  const { orderAddress } = $instance.router.params
+  const { setUserOrderAddress, userOrderAddress } = useModel('userData')
+
 
   const addAddress = () => {
     Taro.navigateTo({ url: `/pages/MyAddressList/AddressInfos/index?id=${1}` })
@@ -93,7 +97,32 @@ export default withLayout((props) => {
     console.log('评分', e.detail);
 
   }
+  const handleAddress = (e) => {
+    if (e) {
+      setUserOrderAddress(e)
+      Taro.showToast({
+        title: '选择成功',
+        icon: 'success',
+        duration: 2000
+      }).then(() => {
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          })
+          setInterval()
+
+        }, 300)
+      })
+
+      console.log('选择的地址存放在store', userOrderAddress);
+
+
+
+    }
 
+
+
+  }
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -122,20 +151,28 @@ export default withLayout((props) => {
                     </View>
 
                     <View className='addressList-box-addressBotton-setAddress'>
-                      <View>
-                        设为默认地址:
-                        <RadioGroup className='radio-group' onChange={(res) => handelSwitch(item.addressId, res)} >
-                          <Radio color='#FC5531' checked={item.isDefault}></Radio>
-                        </RadioGroup>
-                      </View>
-
-                      <View className='addressList-box-addressBotton-addressDelete' onClick={() => addressDeletess(item.addressId)}>
-                        <View>
-                          删除
-                        </View>
-                        <Image src={deletes} />
+                      {
+                        orderAddress ? <>
+                          <View>
+                            设为默认地址:
+                            <RadioGroup className='radio-group' onChange={(res) => handelSwitch(item.addressId, res)} >
+                              <Radio color='#FC5531' checked={item.isDefault}></Radio>
+                            </RadioGroup>
+                          </View>
+
+                          <View className='addressList-box-addressBotton-addressDelete' onClick={() => addressDeletess(item.addressId)}>
+                            <View>
+                              删除
+                            </View>
+                            <Image src={deletes} />
+
+                          </View>
+                        </>
+                          : <View className='orderAddressa' onClick={() => handleAddress(item.address)}>
+                            选择此地址
+                          </View>
+                      }
 
-                      </View>
                     </View>
                   </View>
                 </View>

src/pages/MyAddressList/style.less

@@ -83,6 +83,10 @@
         //   position: relative;
         // }
       }
+      .orderAddressa {
+        font-size: 34px;
+        font-weight: 800;
+      }
     }
     &-addressDelete {
       display: flex;

src/pages/OrderConfirmation/style.less

@@ -59,6 +59,12 @@
         white-space: nowrap;
         color: #000;
       }
+      .aTextareaCentent {
+        width: 80vw;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        -webkit-line-clamp: 1;
+      }
     }
   }
   .BottomtBut-box {

src/pages/OrderInfo/index.jsx

@@ -5,6 +5,7 @@ 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 { generateOrder, orderDelete, orderInfo } from "@/services/order"
 // import BottomMoadl from '@/components/BottomMoadl/index'
@@ -92,11 +93,11 @@ export default withLayout((props) => {
         <View className='View-LiftTextTop'>订单编号：<Text>{orderInfos?.orderNo}</Text></View>
         <View>农机名称：<Text>{orderInfos?.machineryName}</Text></View>
         <View>作业面积：<Text>{orderInfos?.amount}</Text></View>
-        <View>需求时间：<Text>{formatTimes(orderInfos?.appointmentDate, 'yyyy-MM-dd hh:mm')}</Text></View>
-        <View>下单时间：<Text>{formatTimes(orderInfos?.createDate, 'yyyy-MM-dd hh:mm')}</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 className='View-LiftTextBotton'>
-          <View>费用：<Text className='feiyongStyle'>{orderInfos?.charges}</Text></View>
+          <View>费用：<Text className='feiyongStyle'>{formatPrice(orderInfos?.charges)}</Text></View>
         </View>
       </View>
       <View className='BottomtBut' >

src/pages/index/tabs/Orders.jsx

@@ -103,8 +103,8 @@ export default withLayout((props) => {
                 <View className='View-LiftTextTop' onClick={() => handleTobePaid(item.orderId)} >订单编号：<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 hh:mm')}</Text></View>
-                <View>下单时间：<Text>{formatTimes(item.createDate, 'yyyy-MM-dd hh:mm')}</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>

src/store/userData.js

@@ -8,12 +8,13 @@ export default () => {
   const [sessionKey, setSessionKey] = useState()
   const [userPhoneInfo, setUserPhoneInfo] = useState()
 
-
   const [sserLocation, setUserLocation] = useState('')
+  const [userOrderAddress, setUserOrderAddress] = useState('')
+
 
 
   console.log("🚀 来自store的打印 person数据", person)
-  console.log("🚀 来自store的打印 sserLocation定位", sserLocation)
+
 
 
 
@@ -39,6 +40,10 @@ export default () => {
     sserLocation,
     setUserLocation,
 
+
+    userOrderAddress,//订单选择位置
+    setUserOrderAddress,
+
     logins,
   }
 }

src/utils/codeSegment.js

@@ -20,7 +20,7 @@ export function getQueryString (params) {
 
 
 
-
+//日期格式化
 function getDateByStr (dtStr) {
   if (!dtStr) return undefined;
 
@@ -50,3 +50,18 @@ export default function formatTimes (dt, fmt) {
 };
 
 
+
+export function setMorKm (m) {
+  var n = ''
+  if (m) {
+    if (m >= 1000) {
+      n = (m / 1000).toFixed(2) + '公里'
+    } else {
+      n = m + '米'
+    }
+  } else {
+    n = '0m'
+  }
+  return n
+}
+

src/utils/formatPrice.js

@@ -0,0 +1 @@
+export default (t) => ((t || 0) / 100).toFixed(2);