.

project.private.config.json

@@ -1,4 +1,5 @@
 {
+  "setting": {},
   "condition": {
     "plugin": {
       "list": []
@@ -10,15 +11,7 @@
       "list": []
     },
     "miniprogram": {
-      "list": [
-        {
-          "name": "",
-          "pathName": "pages/machineryList/index",
-          "query": "",
-          "scene": null,
-          "launchMode": "default"
-        }
-      ]
+      "list": []
     }
   }
 }

src/components/LoginModel/index.jsx

@@ -13,8 +13,8 @@ import unChecked from '@/assets/login/unChecked.png'
 import './style.less'
 
 export default (props) => {
+  const {path}=props
   const { person,setPerson } = useModel('person')
-
   const [agreement,setAgreement]=useState(false)
   const [phone,setPhone]=useState()
   const [qCode,setqCode]=useState()
@@ -89,6 +89,9 @@ export default (props) => {
           icon: 'none',
           duration: 1000
         })
+        if (path) {
+          Taro.reLaunch({ url: path });
+        }
       }).catch((e) => {
         Taro.showToast({
           title: '手机号或者验证码不正确',

src/components/MyCard/index.jsx

@@ -6,35 +6,31 @@ import MyButton from "../MyButton"
 import './style.less'
 
 export default (props) => {
-  const { detail, order, job, onClick } = props
-  const handleDetail = () => {
-    Taro.navigateTo({ url: '/pages/orderDetail/index' });
-  }
+  const { detail, order, job, value, onClick,goDetail } = props
+  
   return (
     <View className='card'>
       <Jianbian status='1' />
       <View className='cardHead'>
         {
-          job && <MyCell header='需求时间' job action='详情>>' handleAction={handleDetail}>2022-06-02</MyCell>
+          job && <MyCell header='需求时间' job action='详情>>' handleAction={goDetail}>2022-06-02</MyCell>
         }
         {
-          !job && <>
-            <MyCell header='需求时间'>2022-06-02</MyCell>
-            <Text className='price'><Text style={{ fontSize: '44rpx' }}>600</Text>元</Text>
-          </>
+          !job && <MyCell header='需求时间'>2022-06-02</MyCell>
         }
       </View>
       <View className='line' />
-      <MyCell header='农机名称'>收割机001</MyCell>
-      <MyCell header='下单人'>张三</MyCell>
+      <MyCell header='农机名称'>{value?.machineryName||'收割机001'}</MyCell>
+      <MyCell header='下单人'>{value?.personName}</MyCell>
       {
-        detail && <MyCell header='手机号'>13613949434</MyCell>
+        detail && <MyCell header='手机号'>{value?.phone||'13613949434'}</MyCell>
       }
-      <MyCell header='订单时间'>2022-03-08</MyCell>
+      <MyCell header='订单时间'>{value?.createDate.substr(0,10)||'2022-03-08'}</MyCell>
       {
-        detail && <MyCell header='服务地址'>河南省南阳市邓州市孟楼镇</MyCell>
+        detail && <MyCell header='服务地址'>{value?.address||'河南省南阳市邓州市孟楼镇'}</MyCell>
       }
       <MyCell header='作业时间'>上午06:00--晚上21:00</MyCell>
+      <MyCell header='订单费用'>{(value?.charges&&value.charges/100)||600}元</MyCell>
       {
         job && <MyButton value='开始作业' onClick={onClick} />
       }
@@ -42,7 +38,7 @@ export default (props) => {
         order && <View className='line' />
       }
       {
-        order && <View className='footer' onClick={handleDetail}>详情{">"}{">"}</View>
+        order && <View className='footer' onClick={goDetail}>详情{">"}{">"}</View>
       }
     </View>
   )

src/components/MyCard/style.less

@@ -9,14 +9,6 @@
     width: 100%;
     padding: 5px 0 0 38px;
     position: relative;
-    .price{
-      position: absolute;
-      right: 40px;
-      top: 14px;
-      font-size: 30px;
-      font-weight: bold;
-      color: #FF2525;
-    }
   }
   .line{
     width: 100%;

src/components/NullCard/index.jsx

@@ -0,0 +1,13 @@
+import { View,Image } from "@tarojs/components"
+import NoDataImg from '@/assets/noData.png'
+import './style.less'
+
+export default (props)=>{
+  const {value}=props
+  return (
+    <View className='noDataCard'>
+      <Image className='NullImg' src={NoDataImg} />
+      <View>{value}</View>
+    </View>
+  )
+}

src/components/NullCard/style.less

@@ -0,0 +1,17 @@
+.noDataCard{
+  margin: 30px;
+  box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
+  border-radius: 40px;
+  position: relative;
+  overflow: hidden;
+  padding: 78px;
+  font-size: 34px;
+  font-weight: bold;
+  color: #B4B4B4;
+  text-align: center;
+  .NullImg{
+    width: 220px;
+    height: 264px;
+    margin-bottom: 44px;
+  }
+}

src/pages/index/components/order/index.jsx

@@ -4,21 +4,17 @@ import { View, Input, Swiper, Image, SwiperItem, Text, ScrollView } from "@taroj
 import positionImg from '@/assets/comm/position.png'
 import searchImg from '@/assets/comm/search.png'
 import orderImg from '@/assets/comm/orderList.png'
-import LoginModel from "@/components/LoginModel";
 import Footer from "@/components/Footer";
 import MyCard from "@/components/MyCard";
-import { useModel } from "@/store";
-
-
+import NullCard from "@/components/NullCard";
 import { getBannerList } from "@/services/banner";
+import { getOrderList } from "@/services/order";
 import './style.less'
 
 
 export default (props) => {
-  const [imgList, setImgList] = useState([])  
-  const [show, setShow] = useState(false)
-  const [path, setPath] = useState()
-  const { person } = useModel('person')
+  const [imgList, setImgList] = useState([])
+  const [orderList, setOrderList] = useState([])
 
   const handleSearch = (e) => {
     console.log(e.detail.value)
@@ -26,6 +22,9 @@ export default (props) => {
   const handleMore = () => {
     Taro.navigateTo({ url: '/pages/moreOrder/index' });
   }
+  const handleDetail = (val) => {
+    Taro.navigateTo({ url: `/pages/orderDetail/index?id=${val}` });
+  }
   useEffect(() => {
     getBannerList({ position: 'bannerWorker' })
       .then(res => {
@@ -36,12 +35,12 @@ export default (props) => {
           icon: 'none',
         })
       })
+    getOrderList().then((res) => {
+      setOrderList(res.records)
+    })
   }, [])
   return (
     <View className='orderIndex'>
-      {
-        show && <LoginModel path={path} close={() => setShow(false)} />
-      }
       <View className='top'>
         <View className='left'>
           <Image src={positionImg} className='pImg' />
@@ -73,10 +72,13 @@ export default (props) => {
             <Text className='title'>订单列表</Text>
             <Text className='more' onClick={handleMore}>更多{">"}{">"}</Text>
           </View>
-
-          <MyCard order />
-          <MyCard order />
-          <Footer />
+          {
+            orderList.length===0?<NullCard value='您还没有新的订单！' />:
+            orderList.map((item)=>{
+              return <MyCard order value={item} key={item.orderId} goDetail={()=>handleDetail(item.orderId)} />
+            })
+          }
+          {/* <Footer /> */}
         </View>
       </ScrollView>
     </View>

src/pages/index/index.jsx

@@ -1,28 +1,39 @@
-import Taro, { useDidShow } from "@tarojs/taro";
-import { useState, useEffect } from "react";
+import Taro from "@tarojs/taro";
+import { useEffect, useState } from "react";
 import { View, Image } from "@tarojs/components"
+import { useModel } from "@/store";
+import withLayout from '@/layouts'
+import CustomNav from "@/components/CustomNav";
+import LoginModel from "@/components/LoginModel";
+import { setAmap } from '@/services/amap'
 import indexImg from "@/assets/comm/index.png";
 import indexActive from "@/assets/comm/indexActive.png";
 import job from "@/assets/comm/job.png";
 import jobActive from "@/assets/comm/jobActive.png";
 import user from "@/assets/comm/user.png";
 import userActive from "@/assets/comm/userActive.png";
-import CustomNav from "@/components/CustomNav";
-import { setAmap } from '@/services/amap'
-import withLayout from '@/layouts'
-import { useModel } from "@/store";
 import Order from './components/Order'
 import Job from './components/Job'
 import User from "./components/User";
 import "./index.less";
 
 
+
 export default withLayout((props) => {
   const { router } = props
   let { tab } = router.params
   const { location, setLocation } = useModel('location')
+  const { person } = useModel('person')
+  const [currentTab, setCurrentTab] = useState(0)
+  const [show, setShow] = useState(false)
+  const [path, setPath] = useState()
   const handleClick = (val) => {
-    Taro.reLaunch({ url: `/pages/index/index?tab=${val}` });
+    if (!person.phone && val != 0) {
+      setShow(true)
+      setPath(`/pages/index/index?tab=${val}`)
+    } else {
+      setCurrentTab(val)
+    }
   };
   useEffect(() => {
     if (!location) {
@@ -37,36 +48,44 @@ export default withLayout((props) => {
       setAmap({ params: 'location=' + location, path: '/v3/geocode/regeo' })
     }
   }, [])
+  useEffect(() => {
+    if (tab) {
+      setCurrentTab(tab - 0)
+    }
+  }, [tab])
   return (
     <View className='page-index'>
+      {
+        show && <LoginModel path={path} />
+      }
       <View className='index-navbar'>
-        <CustomNav home title={(!tab || tab == 0) ? '首页' : tab == 1 ? '作业管理' : '我的'} />
+        <CustomNav home title={currentTab == 0 ? '首页' : currentTab == 1 ? '作业管理' : '我的'} />
       </View>
       <View className='index-container'>
-        {(!tab || tab == 0) && <Order />}
-        {tab == 1 && <Job />}
-        {tab == 2 && <User />}
+        {currentTab == 0 && <Order />}
+        {currentTab == 1 && <Job />}
+        {currentTab == 2 && <User />}
       </View>
       <View className='index-tabbar'>
         <View
-          className={['tabberItem', (!tab || tab == 0) ? "activeTabber" : '']}
+          className={['tabberItem', currentTab == 0 ? "activeTabber" : '']}
           onClick={() => handleClick(0)}
         >
-          <Image className='tabberImg' src={(!tab || tab == 0) ? indexActive : indexImg}></Image>
+          <Image className='tabberImg' src={currentTab == 0 ? indexActive : indexImg}></Image>
           <View className='text'>首页</View>
         </View>
         <View
-          className={['tabberItem', tab === 1 ? "activeTabber" : '']}
+          className={['tabberItem', currentTab === 1 ? "activeTabber" : '']}
           onClick={() => handleClick(1)}
         >
-          <Image className='tabberImg' src={tab == 1 ? jobActive : job}></Image>
+          <Image className='tabberImg' src={currentTab == 1 ? jobActive : job}></Image>
           <View className='text'>作业管理</View>
         </View>
         <View
-          className={['tabberItem', tab === 2 ? "activeTabber" : '']}
+          className={['tabberItem', currentTab === 2 ? "activeTabber" : '']}
           onClick={() => handleClick(2)}
         >
-          <Image className='tabberImg' src={tab == 2 ? userActive : user}></Image>
+          <Image className='tabberImg' src={currentTab == 2 ? userActive : user}></Image>
           <View className='text'>个人中心</View>
         </View>
       </View>

src/pages/moreOrder/index.jsx

@@ -1,15 +1,19 @@
-import { useState } from "react";
+import Taro from "@tarojs/taro";
+import { useState, useEffect } from "react";
 import { View, Input, Image, Text, ScrollView } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav";
 import searchImg from '@/assets/comm/search.png'
 import withLayout from '@/layouts'
+import NullCard from "@/components/NullCard";
 import MyCard from "@/components/MyCard";
 import Footer from "@/components/Footer";
+import { getOrderList } from "@/services/order";
 import './style.less'
 
 export default withLayout(() => {
   const [imageShow, setImageShow] = useState(true)
   const [currentTab, setCurrentTab] = useState(0);
+  const [orderList, setOrderList] = useState([])
   const handleSearch = (e) => {
     if (e.detail.value) {
       console.log(e.detail.value)
@@ -24,6 +28,15 @@ export default withLayout(() => {
   const handleChange = (val) => {
     setCurrentTab(val)
   }
+  const handleDetail = (val) => {
+    Taro.navigateTo({ url: `/pages/orderDetail/index?id=${val}` });
+  }
+  useEffect(() => {
+    getOrderList().then((res) => {
+      console.log(res.records)
+      setOrderList(res.records)
+    })
+  }, [])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -75,10 +88,13 @@ export default withLayout(() => {
       <View className='index-container'>
         <ScrollView scrollY style={{ height: '100%' }}>
           {/* {currentTab} */}
-          <MyCard />
-          <MyCard />
-          <MyCard />
-          <Footer />
+          {
+            orderList.length===0?<NullCard value='您还没有新的订单！' />:
+            orderList.map((item)=>{
+              return <MyCard order value={item} key={item.orderId} goDetail={()=>handleDetail(item.orderId)} />
+            })
+          }
+          {/* <Footer /> */}
         </ScrollView>
         {/* {currentTab === 0 && <View>777</View>}
         {currentTab === 1 && <View>888</View>}

src/pages/orderDetail/index.jsx

@@ -2,15 +2,26 @@ import { View } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import MyCard from "@/components/MyCard"
 import withLayout from '@/layouts'
+import { useEffect , useState } from "react"
+import { getOrderDetail } from "@/services/order"
 
-export default withLayout(() => {
+
+export default withLayout((props) => {
+  const { router } = props
+  let { id } = router.params
+  const [value,setValue]=useState()
+  useEffect(()=>{
+    getOrderDetail(id).then((res)=>{
+      setValue(res)
+    })
+  },[id])
   return (
     <View className='page-index'>
       <View className='index-navbar'>
         <CustomNav title='更多' />
       </View>
       <View className='index-container'>
-        <MyCard detail />
+        <MyCard detail value={value} />
       </View>
     </View>
   )

src/services/order.js

@@ -0,0 +1,15 @@
+import request from '@/utils/request'
+
+/**
+  * 订单列表
+  * @returns 
+  * params 搜索条件放这里
+  */
+ export const getOrderList = (params) => request('/order', { params })
+
+/**
+  * 订单详情
+  * @returns 
+  * params 搜索条件放这里
+  */
+ export const getOrderDetail = (id,params) => request(`/order/${id}`, { params })

src/store/models/person.js

@@ -8,7 +8,7 @@ export default () => {
   const login = (params) => {
     signIn(params).then((res) => {
       const { person: taPerson,  sessionKey: skey } = res;
-      taPerson.phone=null
+      // taPerson.phone=null
       setPerson(taPerson);
       setSessionKey(skey);
     })

src/utils/hooks/useLogin.js

@@ -10,9 +10,8 @@ export default () => {
   const router = useRouter()
   const { person } = useModel('person')
   const [loginVisible, setLoginVisible] = useState(false)
-  let { tab } = router.params
 
-  const isInWhiteList = useMemo(() => whiteList.includes(router.path)&&(!tab||tab==0), [router.path, tab])
+  const isInWhiteList = useMemo(() => whiteList.includes(router.path), [router.path])
   const hasPhone = useMemo(() => !!person?.phone, [person?.phone])
   
   useEffect(() => {