Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-miniapp

project.config.json

@@ -39,8 +39,20 @@
         "disableUseStrict": false,
         "showES6CompileOption": false,
         "useCompilerPlugins": false,
-        "minifyWXML": true
+        "minifyWXML": true,
+        "ignoreDevUnusedFiles": false,
+        "ignoreUploadUnusedFiles": false
     },
     "compileType": "miniprogram",
-    "condition": {}
+    "condition": {},
+    "libVersion": "2.25.0",
+    "srcMiniprogramRoot": "dist/",
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
+    }
 }

project.private.config.json

@@ -0,0 +1,9 @@
+{
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "machinery-miniapp",
+    "setting": {
+        "compileHotReLoad": true,
+        "urlCheck": false,
+        "preloadBackgroundData": false
+    }
+}

src/components/AssessModel/index.jsx

@@ -1,52 +1,25 @@
-
 import { useState } from 'react'
-
-import ButtontWX from '@/components/ButtontWX'
-import { Textarea, View } from '@tarojs/components'
-
 import Taro from '@tarojs/taro'
+import { Textarea, View } from '@tarojs/components'
+import ButtontWX from '@/components/ButtontWX'
+import { orderEvaluation } from '@/services/order'
 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 { showCutover, orderId, onClose } = 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({
@@ -56,7 +29,6 @@ export default (props) => {
       return;
     }
     else {
-
       orderEvaluation({ orderId: orderId, score: kwCollectNub, content: textAreaCentent }).then(() => {
         Taro.showToast({
           title: '评价成功',
@@ -68,15 +40,11 @@ export default (props) => {
           }, 500);
         })
       })
-
     }
   }
 
-
-
   return (
     <>
-
       {
         showCutover ? <View className='modelBack' >
           <View className='assessModel-box'>
@@ -85,7 +53,6 @@ export default (props) => {
                 <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)} />
@@ -93,24 +60,14 @@ export default (props) => {
                   })
                 }
               </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>
+        </View> : <></>
       }
     </>
-
-
-
-
-
   )
-}
-
+}

src/components/CarsListContent/index.jsx

@@ -1,13 +1,11 @@
 
-import { View, Swiper, Image, SwiperItem, Text, Input } from "@tarojs/components"
-import { useEffect, useState, useMemo } from "react"
-import Taro, { useReachBottom } from "@tarojs/taro"
+import { View, Image, Text, } from "@tarojs/components"
+import Taro from "@tarojs/taro"
 import ButtontWX from '@/components/ButtontWX'
 import withLayout from '@/layouts'
 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'
 
@@ -18,39 +16,17 @@ export default withLayout((props) => {
 
   const { carsList } = props
   const { sserLocation } = useModel('userData')
-  // const { carsList } = props
-
-  // const [carsList, setCarsList] = useState([])
-
-  // useEffect(() => {
-  //   getMachinery(sserLocation).then((e) => {
-  //     setCarsList(e.records)
-  //   })
-
-  // }, [sserLocation])
-
-
-
-
   const startReserve = (res) => {
     Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id=${res}&location=${sserLocation}` })
-
   }
   const goCarsInfo = (res) => {
     Taro.navigateTo({ url: `/pages/CheckDetails/index?id=${res}&location=${sserLocation}` })
-
   }
   const goMapInfo = (res) => {
-    console.log("🚀 ~ file: index.jsx ~ line 43 ~ goMapInfo ~ res", res)
     Taro.navigateTo({ url: `/pages/CheckMap/index?id=${res}&location=${sserLocation}` })
-
-
   }
 
-
   return (
-
-
     <>
       {
         carsList?.length > 0 ? carsList.map((item, index) => {
@@ -77,7 +53,6 @@ export default withLayout((props) => {
           )
         }) : <ListPlaceholder title='暂无农机信息！' />
       }
-
     </>
   )
 })

src/components/LoginModel/index.jsx

@@ -45,8 +45,6 @@ export default (props) => {
 
   const onInputPhone = (r) => {
     setInputPhoneValue(r?.detail?.value)
-    console.log("🚀 ~ file: index.jsx ~ line 26 ~ InputCodeValue", InputPhoneValue)
-
   }
   const onInputCode = (r) => {
     setInputCodeValue(r?.detail?.value)
@@ -55,7 +53,6 @@ export default (props) => {
   //获取验证码
   const getCode = (r) => {
     if (InputPhoneValue === '' || !(/^1[3456789]\d{9}$/.test(InputPhoneValue))) {
-      console.log('提示')
       Taro.showToast({
         title: '手机号码有误',
         icon: 'none',
@@ -96,7 +93,6 @@ export default (props) => {
   const getUserLogin = () => {
 
     if (InputPhoneValue === '' || !(/^1[3456789]\d{9}$/.test(InputPhoneValue))) {
-      console.log('提示')
       Taro.showToast({
         title: '手机号或验证码有误',
         icon: 'none',
@@ -111,40 +107,30 @@ export default (props) => {
         })
       } else {
         setUserPhone(person.personId, { captcha: InputCodeValue, phone: InputPhoneValue }).then((e) => {
-          console.log('e', e);
-
           setPerson(e.person)
           // Taro.navigateTo({ url: path });
           // Taro.navigateTo({ url: `/pages/index/index?tab=${tab}` });
-
           if (loginType) {
-
             Taro.navigateBack({
               delta: 1
             })
-
           } else {
             myClosure()
-
           }
         })
-        // console.log('person', person);
       }
-
     }
-
   }
 
-
-
   return (
     <>
       {
         isLoginVisible !== myClosures ? myClosures : isLoginVisible ?
           <View className='page-index  ' style={{ position: 'absolute', zIndex: '29999' }
-          }>
+          }
+          >
             <View className='index-navbar'>
-              <CustomNav title='登陆' home />
+              <CustomNav title='登录' home />
             </View>
             <View className='loginBackImg-box' >
               <Image src={require("@/assets/lolginImages/backLogin.png")} />
@@ -157,7 +143,7 @@ export default (props) => {
                 <View className='loginPhone-box' >
                   <View className='loginPhone-box-loginPhoneView'>+86</View>
                   <Input maxlength={11} placeholder='请输入手机号码' type={Number} value={InputPhoneValue} onInput={onInputPhone} />
-                  <ButtontWX opacity={countCenter.show_btn ? '0.7' : '11'} disabled={countCenter.show_btn} onClick={getCode} butText={countCenter.code_ts} butWidth={94} butHeight={34} butFontSize={15} butBorderRadius={10} />
+                  <ButtontWX opacity={countCenter.show_btn ? '0.7' : '11'} disabled={countCenter.show_btn} onClick={getCode} butText={countCenter.code_ts} butWidth={150} butHeight={34} butFontSize={15} butBorderRadius={10} />
                 </View>
                 <View className='loginPhone-box'>
                   <View className='loginPhone-box-loginPhoneView'>
@@ -168,7 +154,7 @@ export default (props) => {
               </View>
             </View>
             <View className='BottomtButrelative'  >
-              <ButtontWX onClick={getUserLogin} butText='登陆' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
+              <ButtontWX onClick={getUserLogin} butText='登录' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
             </View>
             <View className='bottom-agreement'>
               <Image src={!checkImage ? checkedImg : unselectedImg} onClick={() => { setCheckImage(!checkImage) }} />

src/components/orderRater/index.js

@@ -57,32 +57,22 @@ Component({
       ]
     }
   },
-
   data: {
     initScore: 0
   },
-
-
   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 () {
     this.setData({
       initScore: this.properties.score
     })
-    console.log('ready')
   }
 })

src/layouts/index.jsx

@@ -1,7 +1,7 @@
 
 
 import useRouter from '@/utils/hooks/useRouter'
-import { useEffect, useMemo, useState } from 'react'
+import { useMemo } from 'react'
 import { useModel } from '@/store'
 import Spin from "@/components/Spin";
 
@@ -31,50 +31,4 @@ export default (Child) => (props) => {
   )
 
 
-}
-
-
-
-
-
-
-
-
-
-// import useRouter from '@/utils/hooks/useRouter'
-// import Taro from '@tarojs/taro'
-// import { useState, useMemo } from 'react'
-// import { useModel } from '@/store'
-// import LoginModel from '@/components/LoginModel'
-// import useLogin from '@/utils/hooks/useLogin'
-
-
-// export default (Child) => (props) => {
-//   const { person } = useModel('userData')
-//   const router = useRouter()
-//   const [isShow, setIsShow] = useState(false)
-
-
-//   const { path } = router
-
-//   useLogin()
-//   console.log("🚀 ~ file: index.jsx ~ line 20 ~   useLogin().abac", useLogin())
-
-//   const isShowFun = () => {
-//     setIsShow(true)
-
-//   }
-//   // Taro.useReady(()=>{
-//   //   useLogin(person,router)
-//   // })
-//   // useEffect(()=>{
-//   //   useLogin(person,router)
-//   // },[person, person?.phone, router, router?.path])
-
-//   // 确保执行过 login 方法，拿到了 person
-//   const isLoged = useMemo(() => !!person?.personId, [person?.personId])
-
-//   return isLoged ? <Child {...props} router={router} /> : <LoginModel isLoginVisible={isShow} />
-// }
-
-
+}

src/pages/AddressInfos/index.jsx

@@ -1,32 +1,20 @@
-import { View, Form, Input, Switch, Textarea } from "@tarojs/components"
+import { View, Form, Textarea } from "@tarojs/components"
 import Taro from "@tarojs/taro"
 import CustomNav from "@/components/CustomNav"
 import ButtontWX from '@/components/ButtontWX'
-import { addressSave, getAddress, addressDelete, addressUpdate } from "@/services/address"
+import { addressSave, addressUpdate } from "@/services/address"
 import withLayout from '@/layouts'
-
 import './style.less'
 
-
-
-
-
 export default withLayout((props) => {
 
   const $instance = Taro.getCurrentInstance()
   const { addressId, address } = $instance.router.params
 
   const formSubmit = e => {
-
     const value = e?.detail?.value
-    console.log(value)
-
-
-
     if (addressId) {
-
       addressUpdate(addressId, { address: value.address }).then((res) => {
-        console.log('地址修改成功', res);
         Taro.showToast({
           title: '地址修改成功',
           icon: 'success',
@@ -37,12 +25,10 @@ export default withLayout((props) => {
               delta: 1
             })
           }, 1000)
-
         })
       })
     } else {
       addressSave({ address: value.address }).then((e) => {
-        console.log('地址添加成功', e);
         Taro.showToast({
           title: '地址添加成功',
           icon: 'success',
@@ -56,10 +42,7 @@ export default withLayout((props) => {
         })
       })
     }
-
-
   }
-
   const formReset = e => {
     console.log(e)
   }

src/pages/CheckDetails/index.jsx

@@ -9,14 +9,9 @@ import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import { getMachineryInfo } from "@/services/homes"
 import formatPrice from "@/utils/formatPrice"
 import TextContent from "./TextContent"
-
-
 import './style.less'
 
-
-
 export default withLayout((props) => {
-  console.log("🚀 ~ file: index.jsx ~ line 14 ~ props", props)
 
   const $instance = Taro.getCurrentInstance()
   const { id, location } = $instance.router.params
@@ -39,34 +34,25 @@ export default withLayout((props) => {
 
   }, [$instance.router.params, id, location])
 
-  console.log("🚀 ~ file: index.jsx ~ line 23 ~ carsInfo", carsInfo)
-
-
   const startReserve = () => {
     Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id=${carsInfo?.machineryId}&location=${location}` })
-
   }
 
   const goMapInfo = (res) => {
     Taro.navigateTo({ url: `/pages/CheckMap/index?id=${carsInfo?.machineryId}&location=${location}` })
-
   }
 
   return (
     <View className='page-index'>
-
       <View className='index-navbar'>
         <CustomNav title='查看详情' />
       </View>
       <scroll-view scrollY style='height: 100%;' >
-
         <View >
-
           {/* <Image style={{ width: '100%' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' /> */}
           <Swiper
             mode='scaleToFill'
             className='swiper-box-info'
-
           >
             {imagesList.map((item, inx) => (
               <SwiperItem key={inx}>
@@ -83,7 +69,7 @@ export default withLayout((props) => {
             <View className='content-header-box-map-Info' onClick={() => goMapInfo('222888')}>
               <View className='content-header-box-map-Info-liftCentent'>
                 <Image src={addresss} />
-                <View>距离当前位置8.8公里&gt;&gt;</View>
+                <View>距离当前位置{carsInfo?.distance/1000}公里&gt;&gt;</View>
               </View>
             </View>
             <View className='content-header-box-map-Info-carsName'>{carsInfo?.orgName}</View>
@@ -95,27 +81,18 @@ export default withLayout((props) => {
               </View>
               {
                 contentList.map((item, index) => {
-
                   return (
-                    <TextContent item={item} />
+                    <TextContent key={item.machineryId} item={item} />
                   )
-
-
                 })
               }
-
-
             </View>
             <View className='startReserve-Bottom-oen'>
               <ButtontWX butText='预约' onClick={startReserve} butWidth={300} butHeight={49} butFontSize={16} butBorderRadius={49} />
-
             </View>
-
-
           </View>
         </View>
       </scroll-view>
-
     </View >
   )
 })

src/pages/CheckDetails/style.less

@@ -13,8 +13,6 @@
   background-color: #fff;
   border-radius: 40px 40px 0px 0px;
   .CheckDetails-bottom-box-flaxBox-liftText {
-    width: 95%;
-
     display: flex;
     justify-content: space-between;
 
@@ -33,6 +31,8 @@
       background: linear-gradient(180deg, #fa7878 0%, #b61515 100%);
       -webkit-background-clip: text;
       -webkit-text-fill-color: transparent;
+      width: 6em;
+      text-align: right;
       > Text {
         font-size: 25px;
       }

src/pages/CheckMap/index.jsx

@@ -64,7 +64,6 @@ export default withLayout((props) => {
     width: 40, // 浮标宽度
     height: 37,// 浮标高度
   }]
-  console.log("🚀 ~ file: index.jsx ~ line 46 ~ markers", markers)
 
   return (
     <View className='page-index'>

src/pages/FeedbackText/index.jsx

@@ -18,7 +18,6 @@ export default withLayout((props) => {
 
   const onSubmitClick = () => {
     setLoading(true)
-    console.log('textAreaValue', textAreaValue);
     if (textAreaValue == '') {
       Taro.showToast({
         title: '请填写内容哦',

src/pages/LoginPage/index.config.js

@@ -1,6 +1,6 @@
 
 export default {
-  navigationBarTitleText: '登陆',
+  navigationBarTitleText: '登录',
   navigationStyle: 'custom',
   disableScroll: true,
   usingComponents: {

src/pages/MoreCars/CarTypeList.jsx

@@ -1,6 +1,5 @@
 
 import { View, Swiper, Image, SwiperItem, Text, Input } from "@tarojs/components"
-import { useEffect, useState, useMemo } from "react"
 import Taro, { useReachBottom } from "@tarojs/taro"
 import ButtontWX from '@/components/ButtontWX'
 import withLayout from '@/layouts'
@@ -14,36 +13,18 @@ import './CarTypeList.less'
 
 export default withLayout((props) => {
   const { csrsListType } = props
-  console.log("🚀 ~ file: index.jsx ~ line 17 ~ withLayout ~ csrsListType", csrsListType)
   const { sserLocation } = useModel('userData')
-
-  // const { carsList } = props
-
-  const [carsList, setCarsList] = useState([])
-  console.log("🚀 ~ file: index.jsx ~ line 23 ~ withLayout ~ carsList", carsList)
-
-  const [caryType, setCaryType] = useState(false)
-
-
   const startReserve = (res) => {
     Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id=${res}&location=${sserLocation}` })
-
   }
   const goCarsInfo = (res) => {
     Taro.navigateTo({ url: `/pages/CheckDetails/index?id=${res}&location=${sserLocation}` })
-
   }
   const goMapInfo = (res) => {
     Taro.navigateTo({ url: `/pages/CheckMap/index?id=${res}&location=${sserLocation}` })
-
-
   }
 
-
-
   return (
-
-
     <>
       {
         csrsListType?.length > 0 ? csrsListType.map((item, index) => {
@@ -69,10 +50,7 @@ export default withLayout((props) => {
             </View>
           )
         }) : <ListPlaceholder title='该分类暂无农机！' />
-
       }
-
-
     </>
   )
 })

src/pages/MoreCars/index.jsx

@@ -38,52 +38,37 @@ export default withLayout((props) => {
 
   useEffect(() => {
     if (tabIndex !== 0) {
-      // ClassificationComparison()
       activeNames.map((item) => {
         classId.push({ id: item.typeId })
 
       })
       getMachinery(sserLocation, { typeId: classId[tabIndex - 1].id }).then((e) => {
-        console.log('农机分类', e);
         steCsrsListType(e.records)
       })
     } else {
-      // ClassificationComparison()
-
       getMachinery(sserLocation, { pageSize: 999 }).then((e) => {
         steCsrsListType(e.records)
       })
     }
-
-
   }, [sserLocation, tabIndex])
 
-
   useEffect(() => {
-
     getMachineryType().then((e) => {
       const tabList = e.records
       setActiveNames(tabList)
       let tabss = tabList.map(x => ({ title: x.name, }))
       const newTabs = [{ title: '全部' }, ...tabss]
       setTabs(newTabs)
-
     })
   }, [])
 
   const goSearch = () => {
     Taro.navigateTo({ url: `/pages/Search/index?location=${sserLocation}` })
-
   }
-
-
   const handleTabChange = (e) => {
-    console.log('e', e.detail);
     steTabIndex(e?.detail?.index)
-
   }
 
-
   return (
     <View className='page-index'>
       <View className='index-navbar'>

src/pages/MyAddressList/index.jsx

@@ -46,7 +46,6 @@ export default withLayout((props) => {
   const handelSwitch = (id) => {
     addressDefault(id).then((res) => {
       getList()
-      console.log(addresList);
     })
 
   }
@@ -59,14 +58,9 @@ export default withLayout((props) => {
     })
   }
   useDidShow(() => {
-    console.log(9999);
     getList()
   })
 
-  // useEffect(() => {
-  //   getList()
-  // }, [])
-
   const handleAddress = (e) => {
     if (e) {
       setUserOrderAddress(e)

src/pages/OrderConfirmation/index.jsx

@@ -57,7 +57,6 @@ export default withLayout((props) => {
 
       // debugger
 
-      console.log('formSubmit', e?.detail);
       if (e?.detail?.value?.amount && e?.detail?.value?.appontmentDate && e?.detail?.value?.address) {
         generateOrder({
           charges: carsInfo?.price * amount,
@@ -97,36 +96,26 @@ export default withLayout((props) => {
       })
       return;
     }
-
-    // Taro.navigateTo({ url: `/pages/OrderInfo/index?goOrder=${id}` })
   }
   useEffect(() => {
     if (id) {
       getMachineryInfo(id, { location: location, attached: true }).then((e) => {
         setCarsInfo(e)
-        console.log('e', e);
       })
     }
   }, [id, sserLocation])
   const onTimeChange = (e) => {
-    console.log('时间选择器', e);
     // 获取当前时间 
-
     setTimeSel(e?.detail?.value)
-
   }
   const cancelPay = () => {
     Taro.navigateBack({
       delta: 1
     })
   }
-
-
   const goAddress = () => {
     Taro.navigateTo({ url: `/pages/MyAddressList/index?type=orderAddress` })
   }
-
-
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -143,22 +132,18 @@ export default withLayout((props) => {
             <View>作业时间：</View>
             <View className='example-body-WorkingTime-TimePicker'>
               <Image src={timeImage} />
-              {/* <mp-pickerTime tips='请选择时间' isChinese={1} onChange={myevent} /> */}
-
               <Picker mode='date' name='appontmentDate' onChange={onTimeChange}>
                 <View className='picker' >
                   {timeSel || '请选择日期'}
                 </View>
               </Picker>
             </View>
-
           </View>
           <View className='example-body-WorkingLocation'>
             <View>作业位置：</View>
             <View className='example-body-WorkingLocation-info' onClick={goAddress}>
               <Image src={addresss} />
               <Input name='address' disabled className='aTextareaCentent' value={userAddres} placeholder={userAddres == '' ? '请输入地址信息' : ''} />
-
             </View>
           </View>
           <View className='BottomtBut-box'>
@@ -167,7 +152,6 @@ export default withLayout((props) => {
           </View>
         </Form>
       </View>
-
     </View>
   )
 })

src/pages/OrderInfo/index.jsx

@@ -1,37 +1,27 @@
 import { View, Text } from "@tarojs/components"
 import { useEffect, useState, useMemo } from "react"
-import Taro, { useDidShow } from "@tarojs/taro"
+import Taro from "@tarojs/taro"
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
-import formatTimes from "@/utils/codeSegment"
+import AssessModel from "@/components/AssessModel"
 import withLayout from '@/layouts'
+import formatTimes from "@/utils/codeSegment"
 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 { orderPrepay, orderDelete, orderInfo } from "@/services/order"
+import { useModel } from "@/store"
 import './style.less'
 
 export default withLayout((props) => {
-  // const { stateType } = props
 
   const $instance = Taro.getCurrentInstance()
   const { orderId } = $instance.router.params
-
+  const { orderList, setOrderList } = useModel('order')
   const [orderInfos, setOrderInfos] = useState()
-
   const [isAssessVisible, setIsAssessVisible] = useState(false)
-
   const { processStatus } = useProcessStatus(orderInfos)
 
-  //底部弹窗
-  // const [showFrame, setShowFrame] = useState(false)
-  // const setRecommend = () => {
-  //   setShowFrame(!showFrame)
-  // }
-
+  //取消订单
   const cancelPay = () => {
     Taro.showModal({
       title: '提示',
@@ -39,13 +29,19 @@ export default withLayout((props) => {
       success: function (res) {
         if (res.confirm) {
           orderDelete(orderId).then((e) => {
-            console.log('订单取消/删除', e);
             Taro.showToast({
               title: '订单取消成功',
               icon: 'success',
               duration: 2000
             }).then(() => {
               setTimeout(() => {
+                var list = [];
+                for (var item of orderList) {
+                  if (item.orderId != orderId) {
+                    list.push(item)
+                  }
+                }
+                setOrderList(list);
                 Taro.navigateBack({
                   delta: 1
                 })
@@ -59,34 +55,24 @@ export default withLayout((props) => {
     })
   }
 
-  useEffect(() => {
-    if (orderId) {
-      orderInfo(orderId).then((res) => {
-        setOrderInfos(res)
-      })
-    } else {
 
-      Taro.showToast({
-        title: '暂无订单详情',
-        icon: 'error',
-        duration: 2000
-      }).then(() => {
-        setTimeout(() => {
-          Taro.navigateBack({
-            delta: 1
-          })
-        }, 1000)
+  //支付
+  const pay = () => {
+    orderPrepay(orderId, {
+      payType: 'wx',
+    }).then((e) => {
+      console.log('订单返回', e);
+      Taro.showLoading({
+        title: '支付中',
       })
-    }
-
-  }, [orderId])
-
+      requestPayment(e)
+    })
+  }
+  //微信支付付款
   const requestPayment = (params) => {
     Taro.hideLoading()
-    console.log("🚀 ~ file: index.jsx ~ line 92 ~ requestPayment ~ params", params)
     Taro.requestPayment({
       ...params,
-
       package: params.packageValue,
       success: () => {
         Taro.showToast({
@@ -95,8 +81,15 @@ export default withLayout((props) => {
           duration: 1000,
         }).then(() => {
           setTimeout(() => {
-            Taro.reLaunch({
-              url: `/pages/index/index?tab=2`
+            var list = [...orderList];
+            for (var item of list) {
+              if (item.orderId == orderId) {
+                item.payStatus = 1
+              }
+            }
+            setOrderList(list);
+            Taro.navigateBack({
+              delta: 1
             })
           }, 400)
         })
@@ -107,72 +100,31 @@ export default withLayout((props) => {
           icon: "none",
           duration: 2000,
         });
-        Taro.reLaunch({
-          // url: `/pages/MineUserAll/AllOrder/index?tabJump=1`
-        })
       },
     })
   }
 
-  const pay = () => {
-
-    orderPrepay(orderId, {
-      payType: 'wx',
-
-    }).then((e) => {
-      console.log('订单返回', e);
-      Taro.showLoading({
-        title: '支付中',
-      })
-      requestPayment(e)
-
-    })
-    //支付逻辑
-  }
-
-  //退单
-  const orderRefunds = () => {
-    Taro.showLoading({
-      title: '退单申请中',
-    })
-    orderRefund(orderId).then(() => {
-      Taro.showLoading()
-
-      Taro.showToast({
-        title: "退单成功",
-        icon: "none",
-        duration: 2000,
-      }).then(() => {
-        setTimeout(() => {
-          Taro.navigateBack({
-            delta: 1
-          })
-        }, 400)
-
-
-      })
-    }).catch(() => {
-      Taro.showLoading()
-      Taro.showToast({
-        title: "请重试",
-        icon: "error",
-        duration: 2000,
-      });
-    })
-  }
+  //弹出弹窗
   const startModle = () => {
     setIsAssessVisible(true)
-
   }
+  //关闭评价弹窗
   const onClose = () => {
     setIsAssessVisible(false)
+    var list = [...orderList];
+    for (var item of list) {
+      if (item.orderId == orderId) {
+        item.isEvaluated = 1
+      }
+    }
+    setOrderList(list);
     Taro.navigateBack({
       delta: 1
     })
 
   }
-
-  const { processLabel, stateStyle, action : Actions } = useMemo(() => {
+  //显示底部按钮
+  const { processLabel, stateStyle, action: Actions } = useMemo(() => {
     const { label, color } = getProcessSignBy(processStatus)
     let action = <></>;
 
@@ -192,19 +144,40 @@ export default withLayout((props) => {
       default:
         break;
     }
-    return  {
+    return {
       processLabel: label,
       stateStyle: color,
       action
     }
   }, [processStatus])
 
+  useEffect(() => {
+    if (orderId) {
+      orderInfo(orderId).then((res) => {
+        setOrderInfos(res)
+      })
+    } else {
+      Taro.showToast({
+        title: '暂无订单详情',
+        icon: 'error',
+        duration: 2000
+      }).then(() => {
+        setTimeout(() => {
+          Taro.navigateBack({
+            delta: 1
+          })
+        }, 1000)
+      })
+    }
+  }, [orderId])
+
   return (
     <View className='page-index'>
       <View className='index-navbar'>
         <CustomNav title='订单详情' />
       </View>
-      <AssessModel orderId={orderId} showCutover={isAssessVisible} maskClosable={isAssessVisible} onClose={onClose} onFinish={onClose} />
+      {/* 评价弹窗 */}
+      <AssessModel orderId={orderId} showCutover={isAssessVisible} onClose={onClose} />
       {/* <BottomMoadl frameTitle='支付方式' flag={showFrame} onRecommend={setRecommend} /> */}
       <View className='orders-listBox-RihtboxBoxOrderViewText'>
         <View className='View-LiftTextTop'>订单编号：<Text>{orderInfos?.orderNo}</Text></View>

src/pages/Search/index.jsx

@@ -1,39 +1,25 @@
 import Taro from '@tarojs/taro'
-import CustomNav from '@/components/CustomNav'
-import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
-
+import { useState } from 'react'
 import { View, Input, Image } from '@tarojs/components'
 import withLayout from '@/layouts'
-import { useThrottle } from '@/utils/codeSegment'
+import CustomNav from '@/components/CustomNav'
 import CarsListContent from "@/components/CarsListContent"
+import { useThrottle } from '@/utils/codeSegment'
 import { getMachinery } from '@/services/homes'
-import { useModel } from '@/store'
-
-
+import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
 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 (
@@ -48,13 +34,8 @@ export default withLayout((props) => {
       <scroll-view scrollY style='height: 100%;' >
         <View className='CarsListContent'>
           <CarsListContent carsList={carsList} />
-
         </View>
-
-
-
       </scroll-view>
     </View>
   )
-
 })

src/pages/UserLogin/index.config.js

@@ -1,6 +1,6 @@
 
 export default {
-  navigationBarTitleText: '登陆',
+  navigationBarTitleText: '登录',
   navigationStyle: 'custom',
   disableScroll: true,
   usingComponents: {

src/pages/UserLogin/index.jsx

@@ -118,7 +118,7 @@
 //   return (
 //     <View className='page-index' hidden={isLoginVisible}>
 //       <View className='index-navbar'>
-//         <CustomNav title='登陆' home />
+//         <CustomNav title='登录' home />
 //       </View>
 //       <View className='loginBackImg-box' >
 //         <Image src={require("@/assets/lolginImages/backLogin.png")} />
@@ -143,7 +143,7 @@
 //         </View>
 //       </View>
 //       <View className='BottomtButrelative'  >
-//         <ButtontWX onClick={getUserLogin} butText='登陆' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
+//         <ButtontWX onClick={getUserLogin} butText='登录' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
 //       </View>
 //       <View className='bottom-agreement'>
 //         <Image src={!checkImage ? checkedImg : unselectedImg} onClick={() => { setCheckImage(!checkImage) }} />

src/pages/index/index.jsx

@@ -28,54 +28,29 @@ import './index.less'
 export default withLayout((props) => {
   const { router } = props
   const { person } = useModel('userData')
-
-
   const { params, path } = router
-
-
   const { tab } = params || {}
-
-
-  console.log("🚀 ~ file: index.jsx ~ line 24 ~ withLayout ~ tab", tab)
   const [currentTab, setCurrentTab] = useState(0)
-
-
-
-  // const [isShow, setIsShow] = useState(false)
-
-
   useDidShow(() => {
-    console.log('useDidShow',);
-
     if (!person?.phone) {
-      console.log('还是未登录',);
       setCurrentTab(0)
     }
   })
 
   useEffect(() => {
-    // setCurrentTab(index)
-
     if (tab) {
       setCurrentTab(tab - 0)
     }
-    // setIsShow(true)
   }, [tab,])
 
   const handleClick = (index) => {
-    // Taro.switchTab({
-    //   url: '/pages/InformationPage/index'
-    // })
     if (!person?.phone) {
       Taro.navigateTo({ url: `/pages/LoginPage/index?login=true&tab=${index}` })
-      // setIsShow(true)
     } else {
       Taro.redirectTo({ url: `/pages/index/index?tab=${index}` });
-      // setCurrentTab(index)
     }
   }
 
-
   return (
     <view className='page-index'>
       {/* <LoginModel isLoginVisible={isShow} /> */}
@@ -120,7 +95,6 @@ export default withLayout((props) => {
           <Image className='tabberImg' src={currentTab == 3 ? MineNOImgaes : MineOFFImgaes}></Image>
           <View className='text'>我的</View>
         </View>
-        {/* <mp-tabbar extClass='custom-tabbar' autoSelect={false} current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar> */}
       </view>
     </view>
   )

src/pages/index/tabs/Homes.jsx

@@ -26,56 +26,40 @@ export default withLayout((props) => {
 
   useEffect(() => {
     getHomeBanner({ position: 'banner' }).then((e) => {
-      console.log('e', e);
       setBannerHome(e)
     })
     getMachinery(sserLocation, { pageNum: currentPage, }).then((e) => {
       const records = currentPage === 1 ? e.records || [] : carsList.concat(e.records || [])
-      console.log("🚀 ~ file: Orders.jsx ~ line 41 ~ getOrder ~ records", records)
       if (e.records.length == 0 && currentPage != 1) {
         setIsMore(true)
         return
       }
       setCarsList(records)
     })
-
   }, [currentPage, sserLocation])
 
-
-
   const handleScrollToLower = () => {
     if (carsList.length < 9) {
       return;
     } else {
       setCurrentPage(currentPage + 1)
-
     }
   }
 
-
-
-
-
   const goSearch = () => {
     Taro.navigateTo({ url: `/pages/Search/index?location=${sserLocation}` })
-
   }
 
   const goToCarsList = () => {//更多
     Taro.navigateTo({ url: `/pages/MoreCars/index` })
-
-
-
   }
 
-
   return (
     <scroll-view
       className='scrollView'
       scrollY
       style='height: 100%;'
       onScrollToLower={isMore ? '' : handleScrollToLower}
-
     >
 
       <View className='heads-top-box'>
@@ -90,7 +74,6 @@ export default withLayout((props) => {
         </View>
       </View>
       <Swiper
-
         mode='scaleToFill'
         className='swiper-box'
       >
@@ -108,8 +91,6 @@ export default withLayout((props) => {
         <View onClick={goToCarsList} className='content-header-box-rightCentent'>更多&gt;&gt;</View>
       </View>
       <CarsListContent carsList={carsList} />
-
-
     </scroll-view>
   )
 })

src/pages/index/tabs/Mine.jsx

@@ -105,7 +105,7 @@ export default withLayout((props) => {
               <Image className='Userback' src={back} />
 
               <Image className='User-Avatar-background-falseBox-userImg userImg' src={userMoren} />
-              <View onClick={userLoginnow} className='User-Avatar-background-falseBox-userLogin' >点击登陆</View>
+              <View onClick={userLoginnow} className='User-Avatar-background-falseBox-userLogin' >点击登录</View>
             </View>
             :
             <>
@@ -153,7 +153,7 @@ export default withLayout((props) => {
 
         {/* {
           !isLoginBox ? '' :
-            <View className='bottom-buttom'>退出登陆</View>
+            <View className='bottom-buttom'>退出登录</View>
         } */}
 
       </View>

src/pages/index/tabs/MineCss/style.less

@@ -35,7 +35,7 @@
   }
 }
 
-//已登陆样式-----------------------
+//已登录样式-----------------------
 
 .User-Avatar-background-trueBox {
   background-size: 100% 100%;

src/pages/index/tabs/Orders.jsx

@@ -3,73 +3,52 @@ import { View, Image, Text } from "@tarojs/components"
 import Taro, { useDidShow } from '@tarojs/taro'
 import ListPlaceholder from "@/components/ListPlaceholder"
 import withLayout from '@/layouts'
-
 import ordersListImga from '@/assets/ordersImages/ordersListImga.png'
 import ordersLeft from '@/assets/ordersImages/ordersLeft.png'//订单装饰
 import { useEffect, useState } from "react"
 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 { useModel } from "@/store"
 import './OrdersCss/style.less'
 
 
 
 export default withLayout((props) => {
 
-  const [ourderList, setOrderList] = useState([])
-
-  const [currentPage, setCurrentPage] = useState(1)
-
-  const [isMore, setIsMore] = useState(false)
-
-  const { person, setPerson } = useModel('userData')
-
-
-  useDidShow(() => {
-    getOrder({ pageNum: currentPage || 1, mine: true }).then((e) => {
-      const { records } = e
-      setOrderList(records)
-    })
-  })
-
+  const { orderList, setOrderList, pageNum, setPageNum, isMore, setIsMore } = useModel('order')
+  
   const handleScrollToLower = () => {
-    if (ourderList.length < 9) {
+    if (orderList.length < 9) {
       return;
     } else {
-      setCurrentPage(currentPage + 1)
-
+      setPageNum(pageNum + 1)
     }
   }
-  useEffect(() => {
-    getOrder({ pageNum: currentPage, mine: true }).then((e) => {
-      const records = currentPage === 1 ? e.records || [] : ourderList.concat(e.records || [])
-      console.log("🚀 ~ file: Orders.jsx ~ line 41 ~ getOrder ~ records", records)
-      if (e.records.length == 0 && currentPage != 1) {
-        setIsMore(true)
-        return
-      }
-      // setJobList(lst)
-      setOrderList(records)
-
-
-
-    })
-  }, [currentPage])
-  console.log(ourderList, 'ourderList');
-
   const orderStates = (item) => {
     const processStatus = getProcessStatus(item)
     const { label: title, color: styleColor } = getProcessSignBy(processStatus)
     return { title, styleColor }
   }
 
-  const handleTobePaid = (id, stateType, stateStyle) => {
-    Taro.navigateTo({ url: `/pages/OrderInfo/index?orderId=${id}&stateType=${stateType}&stateStyle=${stateStyle}` })
+  const handleTobePaid = (id) => {
+    Taro.navigateTo({ url: `/pages/OrderInfo/index?orderId=${id}` })
   }
-
+  useEffect(()=>{
+    setPageNum(1);
+    setIsMore(false);
+  },[])
+  useEffect(() => {
+    getOrder({ pageNum: pageNum, mine: true }).then((e) => {
+      const records = pageNum === 1 ? e.records || [] : orderList.concat(e.records || [])
+      if (e.records.length == 0 && pageNum != 1) {
+        setIsMore(true)
+        return
+      }
+      setOrderList(records)
+    })
+  }, [pageNum])
 
   return (
     <scroll-view
@@ -77,21 +56,19 @@ export default withLayout((props) => {
       style='height: 100%;'
       onScrollToLower={isMore ? '' : handleScrollToLower}
     >
-
       <View className='content-header-box-orders'>
         <View className='content-header-box-orders-liftCentent'>
           <Image src={ordersListImga} />
           <View>订单列表</View>
         </View>
-        {/* <View className='content-header-box-orders-rightCentent'>更多&gt;&gt;</View> */}
       </View>
       {
-        ourderList?.length > 0 ? ourderList.map((item, index) => {
+        orderList?.length > 0 ? orderList.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, orderStates(item)?.title, orderStates(item)?.styleColor)} >
+                <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>

src/routes.js

@@ -25,7 +25,7 @@ const Pages = [
     page: 'pages/OrderConfirmation/index',
   },
   {
-    title: '登陆页',
+    title: '登录页',
     page: 'pages/UserLogin/index',
   },
   {
@@ -92,7 +92,7 @@ const Pages = [
 
 
   {
-    title: '登陆页面~',
+    title: '登录页面~',
     page: 'pages/LoginPage/index',
   },
 

src/services/login.js

@@ -14,7 +14,7 @@ export const login = (data) => request('/login', { data, method: 'post' })
 export const getUserQcode = (params) => request('/sms-captcha', { method: 'post', params })
 
 /**
-* 验证码登陆修改
+* 验证码登录修改
 * @param {*} 
 * @returns 
 */

src/store/index.js

@@ -1,8 +1,9 @@
 import { createStore, createStoreRoot, createModelHook } from '@zjxpcyc/react-tiny-store'
 import userData from './userData'
+import order from './order'
 
 const store = createStore()
-const models = { userData, }
+const models = { userData,order }
 
 
 

src/store/order.js

@@ -0,0 +1,8 @@
+import { useState } from "react";
+
+export default () => {
+  const [orderList, setOrderList] = useState();
+  const [pageNum, setPageNum] = useState(1);
+  const [isMore, setIsMore] = useState(false);
+  return { orderList, setOrderList, pageNum, setPageNum, isMore, setIsMore };
+};

src/store/userData.js

@@ -11,13 +11,6 @@ export default () => {
   const [sserLocation, setUserLocation] = useState('')
   const [userOrderAddress, setUserOrderAddress] = useState('')
 
-
-
-  // console.log("🚀 来自store的打印 person数据", person)
-
-
-
-
   const logins = (params) => {
     login(params).then((res) => {
       const { person: taPerson, sessionKey: skey } = res;

src/utils/hooks/useProcessStatus.js

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