.

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

@@ -1,4 +1,4 @@
-import { useState,useEffect } from "react"
+import { useState, useEffect } from "react"
 import { useModel } from '@/store'
 import Taro from "@tarojs/taro"
 import { View, Image, ScrollView } from "@tarojs/components"
@@ -13,85 +13,72 @@ 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'
 
 export default (props) => {
-  const { phone,setPhone } = useModel('phone')
+  const { phone, setPhone } = useModel('phone')
 
-  const handleAccount = () => { 
+  const handleAccount = () => {
     Taro.navigateTo({ url: '/pages/userInfo/index' });
-   }
-  const handleAboutUs = () => { 
+  }
+  const handleAboutUs = () => {
     Taro.navigateTo({ url: '/pages/aboutUs/index' });
   }
   const handleUpdate = () => {
     Taro.navigateTo({ url: '/pages/versionUpdate/index' });
-   }
-  const handleFeedback = () => { 
-    Taro.navigateTo({ url: '/pages/feedback/index' });
   }
-  const handleLogin = () => { 
-    Taro.navigateTo({ url: '/pages/login/index' });
+  const handleFeedback = () => {
+    Taro.navigateTo({ url: '/pages/feedback/index' });
   }
   const goMachinery = () => {
     Taro.navigateTo({ url: '/pages/machineryList/index' });
-   }
+  }
   const goWallet = () => {
     Taro.navigateTo({ url: '/pages/wallet/index?balance=2022.56' });
-   }
+  }
   const goBank = () => {
     Taro.navigateTo({ url: '/pages/bankCard/index' });
-   }
-  const signOut = () => { 
+  }
+  const signOut = () => {
     setPhone()
     Taro.reLaunch({ url: '/pages/index/index?tab=2' });
   }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
-      {
-        phone &&
-        <View className='personTip'>该账号归张三所属</View>
-      }
+      <View className='personTip'>该账号归张三所属</View>
       <View className='userHead'>
         <Image src={userBgi} className='userBgi' />
-        <View className='headcontent' onClick={phone?'':handleLogin}>
-          <Image src={phone ? banner1 : avatar} className='avatar' />
-          {
-            phone ? <View>
-              <View>张三</View>
-              <View>{phone}</View>
-            </View> : <View>点击登录</View>
-          }
+        <View className='headcontent' >
+          <Image src={avatar} className='avatar' />
+          <View>
+            <View>张三</View>
+            <View>{phone}</View>
+          </View>
         </View>
       </View>
-      {
-        phone &&
-        <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 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>
@@ -105,11 +92,8 @@ export default (props) => {
         <View className='userBox'>
           <MyCell icon={feedback} action={goto} user handleAction={handleFeedback}>意见反馈</MyCell>
         </View>
-        {
-          phone && <View className='signOut' onClick={signOut}>退出登录</View>
-        }
+        <View className='signOut' onClick={signOut}>退出登录</View>
       </View>
-
     </ScrollView>
   )
 }

src/pages/index/index.jsx

@@ -9,6 +9,7 @@ import user from "@/assets/comm/user.png";
 import userActive from "@/assets/comm/userActive.png";
 import CustomNav from "@/components/CustomNav";
 import withLayout from '@/layouts'
+import { useModel } from "@/store";
 import Order from './components/Order'
 import Job from './components/Job'
 import User from "./components/User";
@@ -17,15 +18,21 @@ import "./index.less";
 export default withLayout((props) => {
   const { router } = props
   let { tab, isLogin } = router.params
+  const { phone } = useModel('phone')
   const [currentTab, setCurrentTab] = useState(0);
   const handleClick = (val) => {
     setCurrentTab(val);
   };
-  useEffect(() => {
-    if (tab) {
+  useEffect(() => {    
+    if (tab) {      
       setCurrentTab(tab - 0)
     }
   }, [tab])
+  useEffect(()=>{
+    if (currentTab!==0&&!phone) {
+      Taro.reLaunch({ url: '/pages/login/index' });
+    }
+  },[currentTab])
   return (
     <View className='page-index'>
       <View className='index-navbar'>

src/pages/login/index.jsx

@@ -109,7 +109,7 @@ export default (props) => {
   return (
     <View className='page-index'>
       <View className='index-navbar'>
-        <CustomNav title='登录' />
+        <CustomNav home title='登录' />
       </View>
       <Image src={bgi} className='loginBgi' />
       <View className='index-container loginContent'>

src/services/machinery.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+/**
+ * 农机详情
+ * @param {*} id 
+ * @returns 
+ */
+ export const getMachineryDetail = (id, params) => request(`/machinery-sunmmary/${id}`, { params })
+
+
+ /**
+  * 农机列表
+  * @returns 
+  * params 搜索条件放这里
+  */
+ export const getMachineryList = (params) => request('/machinery', { params })
+