layout

src/components/BottomMoadl/index.jsx

@@ -3,11 +3,11 @@ import { View, Image } from '@tarojs/components'
 import WeChatPay from '@/assets/BottomMoadlImags/WeChatPay.png'
 import Alipay from '@/assets/BottomMoadlImags/Alipay.png'
 import userRight from '@/assets/mineImgaes/userRight.png'
-
+import withLayout from '@/layouts'
 import './style.css'
 
 
-export default (props) => {
+export default withLayout((props) => {
   const { frameTitle, flag } = props
 
   let wrapAnimate = 'wrap wrapAnimate'
@@ -64,4 +64,4 @@ export default (props) => {
       </view>
     </view>
   )
-}
+})

src/components/ButtontWX/index.jsx

@@ -1,5 +1,6 @@
 
 import { View, Text, Button } from '@tarojs/components'
+import withLayout from '@/layouts'
 import './style.less'
 
 export default (props) => {

src/components/CarsListContent/index.jsx

@@ -3,6 +3,7 @@ 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'
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 
 import { getMachinery, } from "@/services/homes"
@@ -10,7 +11,7 @@ import { getMachinery, } from "@/services/homes"
 
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
   const location = Taro.getStorageSync('location')
   // const { carsList } = props
 
@@ -74,4 +75,4 @@ export default (props) => {
 
     </>
   )
-}
+})

src/components/CustomNav/index.jsx

@@ -1,15 +1,13 @@
 
-import { useState, useEffect, useMemo } from 'react'
 import Taro from '@tarojs/taro'
-import homeBlack from '@/assets/icons/comm/home.png'
-import homeWhite from '@/assets/icons/comm/home_white.png'
+import { View } from '@tarojs/components'
 import gobackBlack from '@/assets/icons/comm/goback.png'
-import gobackWhite from '@/assets/icons/comm/goback_white.png'
+import { useState, useEffect, useMemo } from 'react'
 
 import './style.less'
 
 export default (props) => {
-  const { bgImg, logo, title = '首页', home, noback } = props
+  const { logo, title = '首页', home, noback } = props
 
   // 菜单胶囊
   const menuBound = useMemo(() => Taro.getMenuButtonBoundingClientRect(), [])
@@ -17,9 +15,8 @@ export default (props) => {
   const navStyle = useMemo(() => {
     return {
       height: `${menuBound.bottom + 8}px`,
-      backgroundImage: bgImg ? `url(${bgImg})` : 'none',
     }
-  }, [menuBound.bottom, bgImg])
+  }, [menuBound.bottom])
   // 导航栏
   const navBarStyle = useMemo(() => {
     return {
@@ -41,20 +38,12 @@ export default (props) => {
     const screenWidth = menuBound.right + 8;
     return {
       width: `${screenWidth - menuBound.width * 2 - 16}px`,
-      color: bgImg ? '#fff' : '#333',
       lineHeight: `${menuBound.height}px`,
       height: `${menuBound.height}px`,
       paddingLeft: '8px',
       paddingRight: '8px',
     }
-  }, [menuBound.width, menuBound.height, menuBound.right, bgImg])
-  // logo
-  const logoStyle = useMemo(() => {
-    return {
-      width: `${menuBound.height}px`,
-      height: `${menuBound.height}px`,
-    }
-  }, [menuBound.height])
+  }, [menuBound.width, menuBound.height, menuBound.right])
 
   const handleAction = () => {
     if (home || logo) return;
@@ -64,12 +53,6 @@ export default (props) => {
     }
   }
 
-  const goHome = () => {
-    Taro.reLaunch({
-      url: '/pages/index/index'
-    })
-  }
-
   useEffect(() => {
     if (title) {
       Taro.setNavigationBarTitle({ title })
@@ -80,23 +63,13 @@ export default (props) => {
     <view className='custom-nav' style={navStyle}>
       <view className='custom-nav-bar' style={navBarStyle}>
         <view className='custom-nav-bar-action' style={actionStyle}>
-          {
-            !!logo && <image src={logo} className='custom-nav-bar-logo' mode='aspectFit' style={logoStyle} />
-          }
           {
             !logo && !home && (
-              <view className='custom-nav-bar-action-btns'>
-                {
-                  !noback && (
-                    <view className='custom-nav-bar-action-part' onClick={handleAction}>
-                      <image src={bgImg ? gobackWhite : gobackBlack} mode='aspectFit' />
-                    </view>
-                  )
-                }
-                <view className='custom-nav-bar-action-part' onClick={goHome}>
-                  <image src={bgImg ? homeWhite : homeBlack} mode='aspectFit' />
-                </view>
-              </view>
+              !noback && (
+                <View style={{ width: '100%', height: '100%' }} onClick={handleAction}>
+                  <image className='goback' src={gobackBlack} />
+                </View>
+              )
             )
           }
         </view>
@@ -104,4 +77,4 @@ export default (props) => {
       </view>
     </view>
   )
-}
+}

src/components/CustomNav/style.less

@@ -13,39 +13,21 @@
       flex: none;
       box-sizing: border-box;
 
-      image {
-        display: inline-block;
-        border: 0;
+      .goback {
+        width: 19px;
+        height: 35px;
+        position: absolute;
+        left: 30px;
+        top: 14.5px;
       }
-
-      &-btns {
-        width: 100%;
-        height: 100%;
-        display: flex;
-
-        & > view {
-          flex: auto;
-          width: 50%;
-          text-align: center;
-
-          image {
-            width: 100%;
-            height: 30px;
-          }
-        }
-      }
-    }
-
-    &-logo {
-      display: block !important;
-      border-radius: 50%;
-      margin: 0 auto;
     }
 
     &-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/layouts/index.jsx

@@ -1,13 +1,32 @@
 
 
 import useRouter from '@/utils/hooks/useRouter'
-import { getPageBy, getIndexPageOf } from '../routes'
+import Taro from '@tarojs/taro'
+import { useEffect } from 'react'
+import { useModel } from '@/store'
 
-export default (Child) => (props) => {
 
-  // const { person } = useModel('person')
+export default (Child) => (props) => {
+  const { person } = useModel('userData')
   const router = useRouter()
 
+  const { path } = router
+
+  useEffect(() => {
+    if (!person?.phone) {
+      if (path != '/pages/index/index' && path !== '/pages/UserLogin/index') {
+        Taro.navigateTo({ url: `/pages/UserLogin/index?id${1}` })
+      }
+    }
+    console.log("🚀 ~ file: index.jsx ~ line 11 ~ person", person, path)
+
+    // if (path != '/pages/index/index' && !person?.phone) {
+    //   Taro.navigateTo({ url: `/pages/userInfo/index?id${1}` })
+    // }
+  }, [path, person?.phone])
+
+
+
 
 
   return <Child {...props} router={router} />

src/pages/AboutUsPage/index.jsx

@@ -1,12 +1,14 @@
 import { View, Image } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import decorate from "@/assets/icons/comm/decorate.png"
+import withLayout from '@/layouts'
+
 
 import './style.less'
 
 
 
-export default (props) => {
+export default withLayout((props) => {
 
   return (
     <View className='page-index'>
@@ -46,4 +48,4 @@ export default (props) => {
       </scroll-view>
     </View>
   )
-}
+})

src/pages/CheckDetails/index.jsx

@@ -2,7 +2,7 @@ import { useState, useEffect } from "react"
 import { Image, View, Text, Swiper, SwiperItem } from "@tarojs/components"
 import Taro from "@tarojs/taro"
 import CustomNav from "@/components/CustomNav"
-
+import withLayout from '@/layouts'
 import ButtontWX from "@/components/ButtontWX"
 import decorate from "@/assets/icons/comm/decorate.png"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
@@ -14,7 +14,7 @@ import './style.less'
 
 
 
-export default (props) => {
+export default withLayout((props) => {
   console.log("🚀 ~ file: index.jsx ~ line 14 ~ props", props)
 
   const $instance = Taro.getCurrentInstance()
@@ -26,14 +26,17 @@ export default (props) => {
 
 
   useEffect(() => {
+    if (id) {
+      getMachineryInfo(id, { location: location, attached: true }).then((e) => {
+        setImagesList(e.imagesList)
+        setContentList(e.contentList)
+        setCarsInfo(e)
+
+        console.log('e', e);
+      })
+    }
 
-    getMachineryInfo(id, { location: location, attached: true }).then((e) => {
-      setImagesList(e.imagesList)
-      setContentList(e.contentList)
-      setCarsInfo(e)
 
-      console.log('e', e);
-    })
 
   }, [$instance.router.params, id, location])
 
@@ -116,4 +119,4 @@ export default (props) => {
 
     </View >
   )
-}
+})

src/pages/CheckMap/index.jsx

@@ -10,7 +10,7 @@ import { getMachineryInfo } from "@/services/homes"
 import './style.less'
 
 
-export default (props) => {
+export default withLayout((props) => {
 
 
   const $instance = Taro.getCurrentInstance()
@@ -117,4 +117,4 @@ export default (props) => {
       </scroll-view>
     </View>
   )
-}
+})

src/pages/FeedbackText/index.jsx

@@ -3,13 +3,15 @@ import { Textarea, View } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import ButtontWX from "@/components/ButtontWX"
 import { feedback } from "@/services/mine"
+import withLayout from '@/layouts'
+
 import Taro from "@tarojs/taro"
 
 import './style.less'
 
 
 
-export default (props) => {
+export default withLayout((props) => {
 
   const [textAreaValue, setTextAreaValue] = useState('')
   const [loading, setLoading] = useState(false)
@@ -66,4 +68,4 @@ export default (props) => {
       </View>
     </View>
   )
-}
+})

src/pages/HelpCenterInfo/index.jsx

@@ -1,12 +1,13 @@
 import { View, Image } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 
+import withLayout from '@/layouts'
 
 import './style.less'
 
 
 
-export default (props) => {
+export default withLayout((props) => {
 
   return (
     <View className='page-index'>
@@ -53,4 +54,4 @@ export default (props) => {
       </scroll-view>
     </View>
   )
-}
+})

src/pages/MoreCars/index.jsx

@@ -10,13 +10,14 @@ import CustomNav from "@/components/CustomNav"
 import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
 import { getMachineryType } from "@/services/homes"
 import CarsListContent from "@/components/CarsListContent"
+import withLayout from '@/layouts'
 
 import './style.less'
 
 
 
 
-export default (props) => {
+export default withLayout((props) => {
   const [activeTab, setActiveTab] = useState(1)
 
 
@@ -79,4 +80,4 @@ export default (props) => {
       </scroll-view>
     </View>
   )
-}
+})

src/pages/MyAddressList/AddressInfos/index.jsx

@@ -3,6 +3,7 @@ import Taro from "@tarojs/taro"
 import CustomNav from "@/components/CustomNav"
 import ButtontWX from '@/components/ButtontWX'
 import { addressSave, getAddress, addressDelete, addressUpdate } from "@/services/address"
+import withLayout from '@/layouts'
 
 import './style.less'
 import { useEffect } from "react"
@@ -10,7 +11,7 @@ import { useEffect } from "react"
 
 
 
-export default (props) => {
+export default withLayout((props) => {
   console.log("🚀 ~ file: index.jsx ~ line 14 ~ props", props)
 
   const $instance = Taro.getCurrentInstance()
@@ -87,4 +88,4 @@ export default (props) => {
       </View>
     </View>
   )
-}
+})

src/pages/MyAddressList/index.jsx

@@ -4,6 +4,7 @@ import { useState, useEffect, useMemo } from "react"
 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'
@@ -15,7 +16,7 @@ import './style.less'
 
 
 
-export default (props) => {
+export default withLayout((props) => {
   const [addresList, setAddresList] = useState([])
 
   const addAddress = () => {
@@ -150,6 +151,6 @@ export default (props) => {
       </scroll-view>
     </View >
   )
-}
+})
 
 

src/pages/NewVersionUpdatePage/index.jsx

@@ -1,13 +1,14 @@
 import { View, Image } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import decorate from "@/assets/icons/comm/decorate.png"
+import withLayout from '@/layouts'
 
 import './style.less'
 
 
 
 
-export default (props) => {
+export default withLayout((props) => {
 
   return (
     <View className='page-index'>
@@ -29,4 +30,4 @@ export default (props) => {
       </scroll-view>
     </View>
   )
-}
+})

src/pages/OrderConfirmation/index.jsx

@@ -1,6 +1,8 @@
 import { View, Text } from "@tarojs/components"
 import Taro from "@tarojs/taro"
 import { useState } from "react"
+import withLayout from '@/layouts'
+
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
 // import BottomMoadl from '@/components/BottomMoadl/index'
@@ -12,7 +14,7 @@ import ButtontWX from '@/components/ButtontWX'
 
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
   //底部弹窗
   // const [showFrame, setShowFrame] = useState(false)
   // const setRecommend = () => {
@@ -46,4 +48,4 @@ export default (props) => {
       </View>
     </View>
   )
-}
+})

src/pages/OrderInfo/index.jsx

@@ -4,6 +4,7 @@ import Taro from "@tarojs/taro"
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
 import formatTimes from "@/utils/codeSegment"
+import withLayout from '@/layouts'
 
 import { generateOrder, orderDelete, orderInfo } from "@/services/order"
 // import BottomMoadl from '@/components/BottomMoadl/index'
@@ -15,7 +16,7 @@ import { generateOrder, orderDelete, orderInfo } from "@/services/order"
 
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
 
   const $instance = Taro.getCurrentInstance()
   const { orderId } = $instance.router.params
@@ -114,4 +115,4 @@ export default (props) => {
       </View>
     </View>
   )
-}
+})

src/pages/UserLogin/index.jsx

@@ -10,11 +10,12 @@ import checkedImg from '@/assets/lolginImages/checkedImg.png'
 import unselectedImg from '@/assets/lolginImages/unselectedImg.png'
 import { useModel } from '@/store'
 
+import withLayout from '@/layouts'
 
 import './style.less'
 
 
-export default (props) => {
+export default withLayout((props) => {
 
   const { person, setUserPhoneInfo } = useModel('userData')
 
@@ -113,7 +114,7 @@ export default (props) => {
   return (
     <View className='page-index'>
       <View className='index-navbar'>
-        <CustomNav title='登陆' />
+        <CustomNav title='登陆' home />
       </View>
       <View className='loginBackImg-box' >
         <Image src={require("@/assets/lolginImages/backLogin.png")} />
@@ -149,4 +150,4 @@ export default (props) => {
 
     </View>
   )
-}
+})

src/pages/index/index.jsx

@@ -2,6 +2,8 @@ import React, { useState, useEffect } from 'react'
 import Taro, { useDidShow } from '@tarojs/taro'
 import withLayout from '@/layouts'
 import CustomNav from '@/components/CustomNav'
+import { useModel } from '@/store'
+
 import tabList from './tabbar'
 import Homes from './tabs/Homes'
 import Orders from './tabs/Orders'
@@ -12,6 +14,8 @@ import './index.less'
 
 export default withLayout((props) => {
   const { router } = props
+  const { person } = useModel('userData')
+  console.log("🚀 ~ file: index.jsx ~ line 18 ~ withLayout ~ person", person)
 
   const { params, path } = router
   const { tab } = params || {}
@@ -29,12 +33,21 @@ export default withLayout((props) => {
     if (tab) {
       setCurrentTab(tab - 0)
     }
-  }, [tab])
+  }, [tab,])
 
 
   const handleTabChange = (e) => {
-    const { index } = e.detail
-    setCurrentTab(index)
+    if (!person?.phone) {
+      Taro.navigateTo({ url: `/pages/UserLogin/index?id${1}` })
+
+    } else {
+      if (person?.phone) {
+        const { index } = e.detail
+        setCurrentTab(index)
+      }
+
+    }
+
   }
 
 
@@ -42,7 +55,7 @@ export default withLayout((props) => {
     <view className='page-index'>
 
       <view className='index-navbar'>
-        <CustomNav title='首页' />
+        <CustomNav title='首页' home />
       </view>
       <view className='index-container'>
         {currentTab === 0 && <Homes />}

src/pages/index/tabs/Homes.jsx

@@ -7,10 +7,12 @@ import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
 import carsListImga from '@/assets/homesImgaes/carsListImga.png'//农机列表图片
 import CarsListContent from "@/components/CarsListContent"
 import { getHomeBanner, getMachinery, } from "@/services/homes"
+import withLayout from '@/layouts'
+
 import { useModel } from "@/store"
 import './HomesCss/style.less'
 
-export default (props) => {
+export default withLayout((props) => {
   const location = Taro.getStorageSync('location')
   const [bannerHome, setBannerHome] = useState([])
   const [carsList, setCarsList] = useState([])
@@ -47,41 +49,39 @@ export default (props) => {
 
   return (
     <scroll-view className='scrollView' scrollY style='height: 100%;' >
-      {
-        person?.phone !== '' ? <>
-          <View className='heads-top-box'>
-            <View className='heads-top-box-left'>
-              <Image src={addresss} className='heads-top-box-left-addresssImg' />
-              <Text>邓州市</Text>
-              <View className='heads-top-box-left-addresssImg-DownIcon' />
-            </View>
-            <View className='heads-content-searchClass'>
-              <Input type='text' className='heads-content-searchClass-searchInput' onBlur={handleSearch} placeholder='搜索关键字查询订单' />
-              <Image src={searchs} className='heads-content-searchClass-searchInput-searchImg' />
-            </View>
-          </View>
-          <Swiper
-            circular
-            autoplay
-            className='swiper-box'
-          >
-            {bannerHome.map((item, inx) => (
-              <SwiperItem key={inx}>
-                <Image src={item.thumb} mode='widthFix' className='storeImage' />
-              </SwiperItem>
-            ))}
-          </Swiper>
-          <View className='content-header-box'>
-            <View className='content-header-box-liftCentent'>
-              <Image src={carsListImga} />
-              <View>农机列表</View>
-            </View>
-            <View onClick={goToCarsList} className='content-header-box-rightCentent'>更多&gt;&gt;</View>
-          </View>
-          <CarsListContent carsList={carsList} />
-        </> : <View>未登录，请先登陆</View>
-      }
+
+      <View className='heads-top-box'>
+        <View className='heads-top-box-left'>
+          <Image src={addresss} className='heads-top-box-left-addresssImg' />
+          <Text>邓州市</Text>
+          <View className='heads-top-box-left-addresssImg-DownIcon' />
+        </View>
+        <View className='heads-content-searchClass'>
+          <Input type='text' className='heads-content-searchClass-searchInput' onBlur={handleSearch} placeholder='搜索关键字查询订单' />
+          <Image src={searchs} className='heads-content-searchClass-searchInput-searchImg' />
+        </View>
+      </View>
+      <Swiper
+
+        mode='scaleToFill'
+        className='swiper-box'
+      >
+        {bannerHome.map((item, inx) => (
+          <SwiperItem key={inx}>
+            <Image src={item.thumb} mode='widthFix' className='storeImage' />
+          </SwiperItem>
+        ))}
+      </Swiper>
+      <View className='content-header-box'>
+        <View className='content-header-box-liftCentent'>
+          <Image src={carsListImga} />
+          <View>农机列表</View>
+        </View>
+        <View onClick={goToCarsList} className='content-header-box-rightCentent'>更多&gt;&gt;</View>
+      </View>
+      <CarsListContent carsList={carsList} />
+
 
     </scroll-view>
   )
-}
+})

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

@@ -46,11 +46,12 @@
 }
 
 .swiper-box {
-  height: calc(calc(100vw-60px) * 0.62);
+  height: calc(calc(100vh - 50vh) * 0.62);
   text-align: center;
-  margin: 30px;
+  margin-top: 1em;
+
   .storeImage {
-    height: 100%;
+    width: 95vw;
   }
 }
 

src/pages/index/tabs/Mine.jsx

@@ -11,6 +11,7 @@ import versionUpdate from '@/assets/mineImgaes/versionUpdate.png'//版本更新
 import userMoren from '@/assets/mineImgaes/userMoren.png'//默认头像
 import userRight from '@/assets/mineImgaes/userRight.png'
 import { useModel } from "@/store"
+import withLayout from '@/layouts'
 
 import { getAddress } from "@/services/address"
 
@@ -19,7 +20,7 @@ import { getAddress } from "@/services/address"
 import './MineCss/style.less'
 
 
-export default (props) => {
+export default withLayout((props) => {
   const { person } = useModel('userData')
   const [isLoginBox, setIsLoginBox] = useState(false)
   const [addresInfo, setAddresInfo] = useState('')
@@ -38,7 +39,7 @@ export default (props) => {
     console.log($instance.router.params, '$instance.router.params路由')
     if ($instance.router.params.userOk || person.phone) {
       setIsLoginBox(true)
-      return { phone: person.phone, nickName: person.nickName, avatar: person.avatar }
+      return { phone: person?.phone, nickName: person?.nickName, avatar: person?.avatar }
     }
 
   }, [$instance.router.params, person])
@@ -160,4 +161,4 @@ export default (props) => {
       </View>
     </scroll-view>
   )
-}
+})

src/pages/index/tabs/Orders.jsx

@@ -8,11 +8,12 @@ import { useEffect, useState } from "react"
 import { getOrder } from "@/services/order"
 import formatTimes from "@/utils/codeSegment"
 import { useModel } from "@/store"
+import withLayout from '@/layouts'
 
 import './OrdersCss/style.less'
 
 
-export default (props) => {
+export default withLayout((props) => {
 
   const [ourderList, setOrderList] = useState([])
 
@@ -88,7 +89,7 @@ export default (props) => {
     <scroll-view scrollY style='height: 100%;' >
 
       {
-        person?.phone !== '' ? <>
+        person?.phone ? <>
           <View className='content-header-box-orders'>
             <View className='content-header-box-orders-liftCentent'>
               <Image src={ordersListImga} />
@@ -123,4 +124,4 @@ export default (props) => {
 
     </scroll-view>
   )
-}
+})

src/pages/userInfo/index.jsx

@@ -5,11 +5,13 @@ import { Input, View, Image } from "@tarojs/components"
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
 import { updateInfo } from "@/services/login"
+import withLayout from '@/layouts'
+
 // import banner1 from '@/assets/banner/1.jpg'
 // import resetImg from '@/assets/user/cancel.png'
 import './style.less'
 
-export default (props) => {
+export default withLayout((props) => {
 
   const { person, setPerson } = useModel('userData')
 
@@ -109,4 +111,4 @@ export default (props) => {
       </View>
     </View>
   )
-}
+})

src/utils/hooks/useRouter.js

@@ -2,6 +2,7 @@ import Taro, { useRouter } from '@tarojs/taro'
 // import { parseQueryString, random } from '@/utils'
 // import { useModel } from '@/store'
 import { useEffect, useRef, useState } from 'react'
+import { useModel } from '@/store'
 
 export default () => {
   const router = useRouter()