.

src/components/CustomNav/style.less

@@ -25,7 +25,9 @@
     &-content {
       flex: none;
       text-align: center;
-      font-size: 32px;
+      font-size: 34px;
+      font-weight: bold;
+      color: #333;
       cursor: none;
       pointer-events: none;
       text-overflow: ellipsis;

src/components/MyButton/index.jsx

@@ -0,0 +1,7 @@
+import { View } from "@tarojs/components"
+import './style.less'
+
+export default (props) => {
+  const { value, onClick } = props
+  return <View className='myBtn' onClick={onClick}>{value}</View>
+}

src/components/MyButton/style.less

@@ -0,0 +1,13 @@
+
+  .myBtn{
+    height: 94px;
+    font-size: 34px;
+    font-weight: bold;
+    line-height: 94px;
+    text-align: center;
+    color: #fff;
+    background: linear-gradient(0deg, #00AE39,#A0E067);
+    border-radius: 49px;
+    width: 100%;
+    margin: 25px 0 18px;
+  }

src/components/MyCard/index.jsx

@@ -1,13 +1,17 @@
 import Taro from "@tarojs/taro"
 import { View, Text } from '@tarojs/components'
 import MyCell from "../MyCell"
+import MyButton from "../MyButton"
 import './style.less'
 
 export default (props) => {
-  const { detail, order, job,changeJob } = props
+  const { detail, order, job, onClick } = props
   const handleDetail = () => {
     Taro.navigateTo({ url: '/pages/orderDetail/index' });
   }
+  const handleClick = () => {
+    Taro.navigateTo({ url: '/pages/orderDetail/index' });
+  }
   return (
     <View className='card'>
       <View className='jianbian'>
@@ -15,7 +19,7 @@ export default (props) => {
       </View>
       <View className='cardHead'>
         {
-          job && <MyCell header='需求时间' job action='详情>>'>2022-06-02</MyCell>
+          job && <MyCell header='需求时间' job action='详情>>' handleAction={handleClick}>2022-06-02</MyCell>
         }
         {
           !job && <>
@@ -36,8 +40,8 @@ export default (props) => {
       }
       <MyCell header='作业时间'>上午06:00--晚上21:00</MyCell>
       {
-        job&&<View className='jobbtn' onClick={changeJob}>开始作业</View>
-      }      
+        job && <MyButton value='开始作业' onClick={onClick} />
+      }
       {
         order && <View className='line' />
       }

src/components/MyCard/style.less

@@ -43,18 +43,6 @@
     opacity: 0.1;
     margin: 15.5px 0;
   }
-  .jobbtn{
-    height: 94px;
-    font-size: 34px;
-    font-weight: bold;
-    line-height: 94px;
-    text-align: center;
-    color: #fff;
-    background: linear-gradient(0deg, #A0E067, #00AE39);
-    border-radius: 49px;
-    width: 100%;
-    margin: 25px 0 18px;
-  }
   .footer{
     width: 100%;
     text-align: center;

src/components/MyCell/index.jsx

@@ -1,19 +1,26 @@
 import Taro from "@tarojs/taro"
-import { View } from "@tarojs/components"
+import { View,Image } from "@tarojs/components"
 import './style.less'
 
 export default (props) => {
-  const { job } = props
-  const handleClick = () => {
-    if (job) {
-      Taro.navigateTo({ url: '/pages/orderDetail/index' });
-    }
-  }
+  const { job, user, handleAction } = props
+  
   return (
-    <View className='Mycell'>
-      <View className='cell-header'>{props.header}</View>：
-      <View className='cell-body'>{props.children}</View>
-      <View className='cell-action' style={{marginRight:job?'30rpx':''}} onClick={handleClick}>{props.action}</View>
-    </View>
+    <View className='Mycell' onClick={user?handleAction:null}>
+      {
+        !user && <>
+          <View className='cell-header'>{props.header}</View>：
+          <View className='cell-body'>{props.children}</View>
+          <View className='cell-action' style={{ marginRight: job ? '30rpx' : '' }} onClick={handleAction}>{props.action}</View>
+        </>
+      }
+      {
+        user&&<>
+        <Image src={props.icon} className='cell-header-icon' />
+        <View className='cell-body-user'>{props.children}</View>
+        <Image className='cell-action-user' src={props.action} />
+      </>
+      }
+      </View>
   )
 }

src/components/MyCell/style.less

@@ -6,7 +6,7 @@
   color: #606060;
   padding:18px 0;
 
-  .cell-header, .cell-action {
+  .cell-header, .cell-action,.cell-header-icon,.cell-action-user {
     flex: none;
   }
   .cell-header{
@@ -22,4 +22,23 @@
     line-height: 46px;
     word-break: break-all;
   }
+
+
+  .cell-header-icon{
+    width: 32px;
+    height: 38px;
+    margin-right: 23px;
+    position: relative;
+    top: 4px;
+  }
+  .cell-body-user{
+    color: #333333;
+    flex: 1;
+  }
+  .cell-action-user{
+    width: 21px;
+    height: 36px;  
+    position: relative;
+    top: 4px;
+  }
 }

src/pages/index/components/Job/index.jsx

@@ -31,8 +31,8 @@ export default (props) => {
         <View>河南省南阳市邓州市孟楼镇</View>
         <Button className='btn' onClick={handleOk}>确认</Button>
       </Popup>
-      <MyCard job changeJob={handleChange} />
-      <MyCard job changeJob={handleChange} />
+      <MyCard job onClick={handleChange} />
+      <MyCard job onClick={handleChange} />
     </ScrollView>
   )
 }

src/pages/index/components/User/index.jsx

@@ -0,0 +1,90 @@
+import { View, Image, ScrollView } from "@tarojs/components"
+import userBgi from '@/assets/user/userBgi.png'
+import avatar from '@/assets/user/defaultAvatar.png'
+import MyCell from "@/components/MyCell"
+import account from '@/assets/user/account.png'
+import aboutUs from '@/assets/user/aboutUs.png'
+import update from '@/assets/user/update.png'
+import feedback from '@/assets/user/feedback.png'
+import goto from '@/assets/user/goto.png'
+import machinery from '@/assets/user/machinery.png'
+import wallet from '@/assets/user/wallet.png'
+import bankCard from '@/assets/user/bankCard.png'
+import banner1 from '@/assets/banner/1.jpg'
+import './style.less'
+import { useState } from "react"
+
+export default (props) => {
+  const { isLogin } = props
+  const [islogin, setIsLogin] = useState(false)
+  const handleAccount = () => { console.log(5555) }
+  const handleAboutUs = () => { }
+  const handleUpdate = () => { }
+  const handleFeedback = () => { }
+  const handleLogin = () => { setIsLogin(true) }
+  const goMachinery = () => { }
+  const goWallet = () => { }
+  const goBank = () => { }
+  const signOut = () => { setIsLogin(false) }
+  return (
+    <ScrollView scrollY style={{ height: '100%' }}>
+      <View className='userHead'>
+        <Image src={userBgi} className='userBgi' />
+        <View className='headcontent' onClick={handleLogin}>
+          <Image src={islogin ? banner1 : avatar} className='avatar' />
+          {
+            islogin ? <View>
+              <View>张三</View>
+              <View>13612345678</View>
+            </View> : <View>点击登录</View>
+          }
+        </View>
+      </View>
+      {
+        islogin &&
+        <View className='userCard'>
+          <View
+            className='cardItem'
+            onClick={() => goMachinery()}
+          >
+            <Image className='cardImg' src={machinery}></Image>
+            <View className='text'>我的农机</View>
+          </View>
+          <View
+            className='cardItem'
+            onClick={() => goWallet()}
+          >
+            <Image className='cardImg' src={wallet}></Image>
+            <View className='text'>我的钱包</View>
+          </View>
+          <View
+            className='cardItem'
+            onClick={() => goBank()}
+          >
+            <Image className='cardImg' src={bankCard}></Image>
+            <View className='text'>我的银行卡</View>
+          </View>
+
+        </View>
+      }
+      <View className='userContent'>
+        <View className='userBox'>
+          <MyCell icon={account} action={goto} user handleAction={handleAccount} >账号与安全</MyCell>
+        </View>
+        <View className='userBox'>
+          <MyCell icon={aboutUs} action={goto} user handleAction={handleAboutUs}>关于我们</MyCell>
+        </View>
+        <View className='userBox'>
+          <MyCell icon={update} action={goto} user handleAction={handleUpdate}>版本更新</MyCell>
+        </View>
+        <View className='userBox'>
+          <MyCell icon={feedback} action={goto} user handleAction={handleFeedback}>意见反馈</MyCell>
+        </View>
+        {
+          islogin && <View className='signOut' onClick={signOut}>退出登录</View>
+        }
+      </View>
+
+    </ScrollView>
+  )
+}

src/pages/index/components/User/style.less

@@ -0,0 +1,71 @@
+.userHead{
+  width: 100%;
+  height: 50vw;
+  .userBgi{
+    width: 100%;
+    height: 50vw;
+  }
+  .headcontent{
+    position: absolute;
+    top: calc(25vw - 63px);
+    display: flex;
+    align-items: center;
+    left: 90px;
+    font-size: 34px;
+    font-weight: 500;
+    color: #FFF;
+    text-shadow: 0px 2px 0px rgba(0, 0, 0, 0.4);
+    .avatar{
+      width: 126px;
+      height: 126px;
+      border-radius: 63px;
+      margin-right: 20px;
+    }
+    view+view{
+      margin-top: 38px;
+    }
+  }
+}
+.userContent{
+  padding: 0 30px;
+  .userBox{
+    box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.12);
+    padding: 20px 35px;
+  }
+  .signOut{
+    width: 100%;
+    height: 98px;
+    background: #F8F8F8;
+    border-radius: 49px;
+    font-size: 40px;
+    text-align: center;
+    line-height: 98px;
+    font-weight: bold;
+    color: #333333;
+    margin: 60px 0;
+  }
+}
+.userCard{
+  display: flex;
+  align-items: center;
+  text-align: center;
+  height: 202px;
+  box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
+  border-radius: 40px;
+  margin:0 30px;
+  position: relative;
+  top: -30px;
+  background-color: #fff;
+  .cardItem{
+    flex: 1;
+    .cardImg{
+      width: 60px;
+      height: 60px;
+    }
+    .text{
+      font-size: 34px;
+      font-weight: bold;
+      color: #333333;
+    }
+  }
+}

src/pages/index/index.jsx

@@ -10,6 +10,7 @@ import userActive from "@/assets/comm/userActive.png";
 import CustomNav from "@/components/CustomNav";
 import Order from './components/Order'
 import Job from './components/Job'
+import User from "./components/User";
 import "./index.less";
 
 export default (props) => {
@@ -26,7 +27,7 @@ export default (props) => {
       <View className='index-container'>
         {currentTab === 0 && <Order />}
         {currentTab === 1 && <Job />}
-        {currentTab === 2 && <View>999</View>}
+        {currentTab === 2 && <User />}
       </View>
       <View className='index-tabbar'>
         <View