git hu

src/app.config.js

@@ -11,6 +11,32 @@ export default {
     navigationBarTitleText: 'WeChat',
     navigationBarTextStyle: 'black'
   },
+  // tabBar: {
+  //   "custom": true,
+  //   "color": "#000000",
+  //   "selectedColor": "#000000",
+  //   "backgroundColor": "#000000",
+  //   list: [{
+  //     pagePath: "pages/HomePage/index",
+  //     text: "首页",
+
+  //   },
+  //   {
+  //     pagePath: "pages/OrderPage/index",
+  //     text: "订单"
+  //   },
+  //   {
+  //     pagePath: "pages/InformationPage/index",
+  //     text: "资讯"
+  //   },
+  //   {
+  //     pagePath: "pages/MinePage/index",
+  //     text: "我的"
+  //   },
+
+  //   ]
+  // },
+
   permission: {
     'scope.userLocation': {
       desc: '您的位置信息将方便您更好的小程序体验'

src/app.less

@@ -5,6 +5,7 @@
   height: 100vh;
   overflow: hidden;
   box-sizing: border-box;
+  letter-spacing: 2px;
   // background-color: #f2f2f2;
 
   .index-navbar {
@@ -13,6 +14,12 @@
 
   .index-tabbar {
     flex: none;
+    display: flex;
+    height: 130px;
+    text-align: center;
+    box-sizing: border-box;
+    padding: 14px 0 23px 0;
+    box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.08);
   }
 
   .index-container {
@@ -22,23 +29,23 @@
   }
 }
 
-.custom-tabbar {
-  background: #ffffff;
-  box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.08);
-  .weui-tabbar__label {
-    color: #c0c8d3;
-    font-size: 30px;
-    font-weight: 800;
-  }
+// .custom-tabbar {
+//   background: #ffffff;
+//   box-shadow: 0px -4px 6px 0px rgba(0, 0, 0, 0.08);
+//   .weui-tabbar__label {
+//     color: #c0c8d3;
+//     font-size: 30px;
+//     font-weight: 800;
+//   }
 
-  .weui-bar__item_on {
-    .weui-tabbar__label {
-      color: #202020;
-      font-size: 30px;
-      font-weight: 800;
-    }
-  }
-}
+//   .weui-bar__item_on {
+//     .weui-tabbar__label {
+//       color: #202020;
+//       font-size: 30px;
+//       font-weight: 800;
+//     }
+//   }
+// }
 
 .purebtn {
   margin: 0;

src/components/ButtontWX/index.jsx

@@ -4,7 +4,7 @@ import withLayout from '@/layouts'
 import './style.less'
 
 export default (props) => {
-  const { butText, butWidth, butHeight, butFontSize, butBorderRadius, styleType, loading, onClick, formType, disabled, opacity } = props
+  const { butText, butWidth, butHeight, butFontSize, butBorderRadius, styleType, loading, onClick = () => { }, formType, disabled, opacity } = props
   let butStyle = {
     width: `${butWidth || 100}px`,
     height: `${butHeight || 40}px`,

src/components/LoginModel/index.jsx

@@ -1,5 +1,5 @@
 
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 import Taro from '@tarojs/taro'
 import { getUserQcode, setUserPhone } from '@/services/login'
 
@@ -16,7 +16,7 @@ import './style.less'
 
 export default (props) => {
 
-  const { isLoginVisible } = props
+  const { isLoginVisible, loginType } = props
 
   const { person, setPerson } = useModel('userData')
 
@@ -30,8 +30,18 @@ export default (props) => {
 
   const [checkImage, setCheckImage] = useState(false)
 
-  const [InputPhoneValue, setInputPhoneValue] = useState('')
-  const [InputCodeValue, setInputCodeValue] = useState('')
+  const [InputPhoneValue, setInputPhoneValue] = useState('18082043755')
+  const [InputCodeValue, setInputCodeValue] = useState('375501')
+  const [myClosures, setMyClosure] = useState(false)
+
+  useEffect(() => {
+    if (isLoginVisible) {
+      setMyClosure(isLoginVisible)
+    }
+  }, [isLoginVisible])
+  const myClosure = () => {
+    setMyClosure(false)
+  }
 
   const onInputPhone = (r) => {
     setInputPhoneValue(r?.detail?.value)
@@ -102,7 +112,15 @@ export default (props) => {
         setUserPhone(person.personId, { captcha: InputCodeValue, phone: InputPhoneValue }).then((e) => {
           console.log('e', e);
           setPerson({ ...person, phone: InputPhoneValue })
-          Taro.reLaunch({ url: '/pages/index/index' });
+          // Taro.navigateTo({ url: path });
+          if (loginType) {
+            Taro.navigateBack({
+              delta: 1
+            })
+          } else {
+            myClosure()
+
+          }
         })
         // console.log('person', person);
       }
@@ -116,44 +134,45 @@ export default (props) => {
   return (
     <>
       {
-        isLoginVisible ? <View className='page-index  ' style={{ position: 'absolute', zIndex: '29999' }
-        } >
-          <View className='index-navbar'>
-            <CustomNav title='登陆' home />
-          </View>
-          <View className='loginBackImg-box' >
-            <Image src={require("@/assets/lolginImages/backLogin.png")} />
-
-            <View className='loginhallo-text'>
-              <View>您好！</View>
-              <View>欢迎进入农户端小程序！</View>
+        isLoginVisible !== myClosures ? myClosures : isLoginVisible ?
+          <View className='page-index  ' style={{ position: 'absolute', zIndex: '29999' }
+          } >
+            <View className='index-navbar'>
+              <CustomNav title='登陆' home />
             </View>
-            <View>
-              <View className='loginPhone-box' >
-                <View className='loginPhone-box-loginPhoneView'>+86</View>
-                <Input maxlength={11} placeholder='请输入手机号码' type={Number} value={InputPhoneValue} onInput={onInputPhone} />
+            <View className='loginBackImg-box' >
+              <Image src={require("@/assets/lolginImages/backLogin.png")} />
 
-                <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} />
+              <View className='loginhallo-text'>
+                <View>您好！</View>
+                <View>欢迎进入农户端小程序！</View>
               </View>
-              <View className='loginPhone-box'>
-                <View className='loginPhone-box-loginPhoneView'>
-                  <Image style={{ width: '16px', height: '20px', margin: 'auto 2.8vw auto 2.8vw' }} src={require("@/assets/lolginImages/phoneCode.png")} />
+              <View>
+                <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} />
+                </View>
+                <View className='loginPhone-box'>
+                  <View className='loginPhone-box-loginPhoneView'>
+                    <Image style={{ width: '16px', height: '20px', margin: 'auto 2.8vw auto 2.8vw' }} src={require("@/assets/lolginImages/phoneCode.png")} />
+                  </View>
+                  <Input maxlength={10} placeholder='请输入验证码' value={InputCodeValue} onInput={onInputCode} />
                 </View>
-                <Input maxlength={10} placeholder='请输入验证码' value={InputCodeValue} onInput={onInputCode} />
               </View>
             </View>
-          </View>
-          <View className='BottomtButrelative'  >
-            <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) }} />
-            <View>
-              请认真查看<Text style={{ color: '#CE3800' }}>文本协议/隐私政策</Text>，确认之后选择此项！
+            <View className='BottomtButrelative'  >
+              <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) }} />
+              <View>
+                请认真查看<Text style={{ color: '#CE3800' }}>文本协议/隐私政策</Text>，确认之后选择此项！
+              </View>
             </View>
-          </View>
 
-        </View >
+          </View >
           : <></>
       }
     </>

src/layouts/index.jsx

@@ -13,6 +13,7 @@ import useLogin from '@/utils/hooks/useLogin'
 export default (Child) => (props) => {
   const { person } = useModel('userData')
   const router = useRouter()
+  console.log("🚀 ~ file: index.jsx ~ line 16 ~ router", router)
 
 
   const { loginVisible } = useLogin()
@@ -29,7 +30,7 @@ export default (Child) => (props) => {
         isLoged && !loginVisible && <Child {...props} router={router} />
       }
       {
-        isLoged && loginVisible && <LoginModel isLoginVisible={loginVisible} />
+        isLoged && loginVisible && <LoginModel isLoginVisible={loginVisible} path={router.path} />
       }
     </>
   )

src/pages/CheckDetails/index.jsx

@@ -7,6 +7,7 @@ import ButtontWX from "@/components/ButtontWX"
 import decorate from "@/assets/icons/comm/decorate.png"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import { getMachineryInfo } from "@/services/homes"
+import formatPrice from "@/utils/formatPrice"
 import TextContent from "./TextContent"
 
 
@@ -77,7 +78,7 @@ export default withLayout((props) => {
           <View className='CarsContent-TextBox'>
             <View className='CheckDetails-bottom-box-flaxBox-liftText'>
               <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>{carsInfo?.name}</View>
-              <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>{carsInfo?.price}/<Text>公顷</Text></View>
+              <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>{formatPrice(carsInfo.price)}/<Text>公顷</Text></View>
             </View>
             <View className='content-header-box-map-Info' onClick={() => goMapInfo('222888')}>
               <View className='content-header-box-map-Info-liftCentent'>

src/pages/LoginPage/index.config.js

@@ -0,0 +1,10 @@
+
+export default {
+  navigationBarTitleText: '登陆',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  usingComponents: {
+
+  }
+
+}

src/pages/LoginPage/index.jsx

@@ -0,0 +1,27 @@
+
+import { View } from "@tarojs/components"
+import CustomNav from "@/components/CustomNav"
+import Taro from "@tarojs/taro"
+import { useEffect, useState } from "react"
+import LoginModel from "@/components/LoginModel"
+
+
+
+export default (props) => {
+  const [isShow, setIsShow] = useState(false)
+
+  const $instance = Taro.getCurrentInstance()
+  const { login } = $instance.router.params
+
+  useEffect(() => {
+    setIsShow(true)
+  }, [])
+
+  return (
+    <View className='page-index'>
+      <View>
+        <LoginModel isLoginVisible={isShow} loginType={login} />
+      </View>
+    </View>
+  )
+}

src/pages/MyAddressList/AddressInfos/index.jsx

@@ -22,6 +22,8 @@ export default withLayout((props) => {
     const value = e?.detail?.value
     console.log(value)
 
+
+
     if (addressId) {
 
       addressUpdate(addressId, { address: value.address }).then((res) => {
@@ -76,7 +78,7 @@ export default withLayout((props) => {
             <Textarea name='address' value={address} className='aTextareaCentent' placeholder='请输入地址信息' />
           </View>
           <View className='buton-bottom'>
-            <ButtontWX onClick={formSubmit} formType='submit' butText='保存' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
+            <ButtontWX formType='submit' butText='保存' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
           </View>
         </Form>
 

src/pages/MyAddressList/index.jsx

@@ -20,6 +20,8 @@ export default withLayout((props) => {
   const [addresList, setAddresList] = useState([])
   const $instance = Taro.getCurrentInstance()
   const { type } = $instance.router.params
+
+
   console.log("🚀 ~ file: index.jsx ~ line 23 ~ withLayout ~ orderAddress", type)
 
 

src/pages/OrderInfo/index.jsx

@@ -122,17 +122,24 @@ export default withLayout((props) => {
 
 
   const pay = () => {
-    orderPrepay(orderId, {
-      payType: 'wx',
-
-    }).then((e) => {
-      console.log('订单返回', e);
-      Taro.showLoading({
-        title: '支付中',
-      })
-      requestPayment(e)
+    console.log('asd2222222222sad`a',);
 
+    Taro.switchTab({
+      url: '/pages/index/index?tab=3'
     })
+    console.log('asdsad`a',);
+
+    // orderPrepay(orderId, {
+    //   payType: 'wx',
+
+    // }).then((e) => {
+    //   console.log('订单返回', e);
+    //   Taro.showLoading({
+    //     title: '支付中',
+    //   })
+    //   requestPayment(e)
+
+    // })
     //支付逻辑
   }
 
@@ -192,7 +199,7 @@ export default withLayout((props) => {
         <View>作业面积：<Text>{orderInfos?.amount}</Text></View>
         <View>需求时间：<Text>{formatTimes(orderInfos?.appointmentDate, 'yyyy-MM-dd')}</Text></View>
         <View>下单时间：<Text>{formatTimes(orderInfos?.createDate, 'yyyy-MM-dd')}</Text></View>
-        <View>订单状态：<Text style={{ color: `${stateStyle}` }}  >{stateType}</Text></View>
+        <View>订单状态：<Text style={{ color: `${stateStyle}` }}  >{stateType === '已付款' ? '已付款,待调度' : stateType}</Text></View>
         <View className='View-LiftTextBotton'>
           <View className='feiyongStyle'>费用：<Text className='feiyongStyle-charges' >{formatPrice(orderInfos?.charges)}</Text></View>
           <View className='feiyongStyle'>状态：<Text style={{ color: `${stateStyle}` }} className='feiyongStyle-stateStyle' >{orderInfos?.payStatus === 1 ? '已付款' : '待付款'}</Text></View>
@@ -210,7 +217,6 @@ export default withLayout((props) => {
                       <ButtontWX butText='支付' onClick={pay} butWidth={150} butHeight={39} butFontSize={16} butBorderRadius={49} />
                     </> : stateType == '已付款' ?
                       <ButtontWX butText='退单' onClick={orderRefunds} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
-
                       // <ButtontWX butText={`${orderInfos?.payStatus == 3 ? '退单申请中' : '退单'}`} disabled={orderInfos?.payStatus == 3 ? true : false} onClick={orderInfos?.payStatus == 3 ? '' : orderRefunds} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
                       : stateType == '待作业' ? <ButtontWX butText={`${orderInfos?.payStatus == 3 ? '退单申请中' : '退单'}`} disabled={orderInfos?.payStatus == 3 ? true : false} onClick={orderInfos?.payStatus == 3 ? '' : orderRefunds} butWidth={323} butHeight={49} butFontSize={16} butBorderRadius={49} />
 

src/pages/index/index.jsx

@@ -4,8 +4,19 @@ import withLayout from '@/layouts'
 import CustomNav from '@/components/CustomNav'
 import { useModel } from '@/store'
 import LoginModel from "@/components/LoginModel"
+import { View, Image } from '@tarojs/components'
+
+//分别是   首页  订单  资讯 我的
+import HomesOFFImgaes from '@/assets/tabbar/HomesOFFImgaes.png'
+import HomesNOImgaes from '@/assets/tabbar/HomesNOImgaes.png'
+import OrdersOFFImgaes from '@/assets/tabbar/OrdersOFFImgaes.png'
+import OrdersNOImgaes from '@/assets/tabbar/OrdersNOImgaes.png'
+import newsONImages from '@/assets/tabbar/newsONImages.png'
+import newsOFFImages from '@/assets/tabbar/newsOFFImages.png'
+import MineOFFImgaes from '@/assets/tabbar/MineOFFImgaes.png'
+import MineNOImgaes from '@/assets/tabbar/MineNOImgaes.png'
+
 
-import tabList from './tabbar'
 import Homes from './tabs/Homes'
 import Orders from './tabs/Orders'
 import Mine from './tabs/Mine'
@@ -20,38 +31,65 @@ export default withLayout((props) => {
 
 
   const { params, path } = router
+
+
   const { tab } = params || {}
 
+
+  console.log("🚀 ~ file: index.jsx ~ line 24 ~ withLayout ~ tab", tab)
+
   const [currentTab, setCurrentTab] = useState(0)
 
   const [isDidShow, setIsDidShow] = useState(0)
 
+
+  const [tabsIndex, setTabsIndex] = useState(0)
+
+
+
   const [isShow, setIsShow] = useState(false)
 
 
   useDidShow(() => {
     setIsDidShow(isDidShow + 1)
+    if (!person?.phone) {
+      console.log('还是未登录',);
+      setCurrentTab(0)
+
+
+    } else {
+      setCurrentTab(tabsIndex)
+      // handleTabChange(tabsIndex)
+
+      console.log('已登陆',);
+
+    }
   })
 
   useEffect(() => {
     if (tab) {
       setCurrentTab(tab - 0)
+
+
     }
     // setIsShow(true)
   }, [tab,])
 
 
-  const handleTabChange = (e) => {
+  const handleClick = (index) => {
+    // Taro.switchTab({
+    //   url: '/pages/InformationPage/index'
+    // })
+
 
     if (!person?.phone) {
-      // Taro.navigateTo({ url: `/pages/UserLogin/index` })
-      setIsShow(true)
+      setTabsIndex(index)
+      Taro.navigateTo({ url: `/pages/LoginPage/index?login=true` })
+      // setIsShow(true)
     } else {
-      const { index } = e.detail
       setCurrentTab(index)
 
     }
-
   }
 
 
@@ -61,7 +99,7 @@ export default withLayout((props) => {
 
       <view className='index-navbar'>
 
-        <CustomNav title='首页' home />
+        <CustomNav title={currentTab === 0 ? '首页' : currentTab === 1 ? '订单' : currentTab === 2 ? '资讯' : '我的'} home />
       </view>
       <view className='index-container'>
         {currentTab === 0 && <Homes />}
@@ -71,7 +109,35 @@ export default withLayout((props) => {
         {currentTab === 3 && <Mine isDidShow={isDidShow} router={router} />}
       </view>
       <view className='index-tabbar'>
-        <mp-tabbar extClass='custom-tabbar' current={currentTab} list={tabList} onChange={handleTabChange}></mp-tabbar>
+        <View
+          className={['tabberItem', currentTab == 0 ? "activeTabber" : '']}
+          onClick={() => handleClick(0)}
+        >
+          <Image className='tabberImg' src={currentTab == 0 ? HomesNOImgaes : HomesOFFImgaes}></Image>
+          <View className='text'>首页</View>
+        </View>
+        <View
+          className={['tabberItem', currentTab === 1 ? "activeTabber" : '']}
+          onClick={() => handleClick(1)}
+        >
+          <Image className='tabberImg' src={currentTab == 1 ? OrdersNOImgaes : OrdersOFFImgaes}></Image>
+          <View className='text'>订单</View>
+        </View>
+        <View
+          className={['tabberItem', currentTab === 2 ? "activeTabber" : '']}
+          onClick={() => handleClick(2)}
+        >
+          <Image className='tabberImg' src={currentTab == 2 ? newsOFFImages : newsONImages}></Image>
+          <View className='text'>资讯</View>
+        </View>
+        <View
+          className={['tabberItem', currentTab === 3 ? "activeTabber" : '']}
+          onClick={() => handleClick(3)}
+        >
+          <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/index.less

@@ -0,0 +1,18 @@
+.tabberItem {
+  flex: 1;
+  font-size: 30px;
+  font-weight: bold;
+  .tabberImg {
+    width: 52px;
+    height: 52px;
+    display: block;
+    margin: auto;
+  }
+  .text {
+    line-height: 29px;
+    margin-top: 12px;
+  }
+}
+.activeTabber {
+  color: #ff703b;
+}

src/pages/index/tabs/Homes.jsx

@@ -17,7 +17,10 @@ export default withLayout((props) => {
   const [bannerHome, setBannerHome] = useState([])
   const [carsList, setCarsList] = useState([])
 
-  const { person, setPerson } = useModel('userData')
+  const [currentPage, setCurrentPage] = useState(1)
+
+  const [isMore, setIsMore] = useState(false)
+
 
 
 
@@ -26,21 +29,32 @@ export default withLayout((props) => {
       console.log('e', e);
       setBannerHome(e)
     })
-    getMachinery(sserLocation).then((e) => {
-      setCarsList(e.records)
+    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)
     })
 
-  }, [sserLocation])
+  }, [currentPage, sserLocation])
+
 
 
+  const handleScrollToLower = () => {
+    if (carsList.length < 9) {
+      return;
+    } else {
+      setCurrentPage(currentPage + 1)
 
+    }
+  }
 
 
 
 
-  const handleSearch = (e) => {
-    console.log(e?.detail?.value)
-  }
 
   const goSearch = () => {
     Taro.navigateTo({ url: `/pages/Search/index?location=${sserLocation}` })
@@ -56,7 +70,13 @@ export default withLayout((props) => {
 
 
   return (
-    <scroll-view className='scrollView' scrollY style='height: 100%;' >
+    <scroll-view
+      className='scrollView'
+      scrollY
+      style='height: 100%;'
+      onScrollToLower={isMore ? '' : handleScrollToLower}
+
+    >
 
       <View className='heads-top-box'>
         <View className='heads-top-box-left'>

src/pages/index/tabs/Orders.jsx

@@ -1,8 +1,8 @@
 
 import { View, Image, Text } from "@tarojs/components"
 import Taro, { useDidShow } from '@tarojs/taro'
-import withLayout from '@/layouts'
 import ListPlaceholder from "@/components/ListPlaceholder"
+import withLayout from '@/layouts'
 
 import ordersListImga from '@/assets/ordersImages/ordersListImga.png'
 import ordersLeft from '@/assets/ordersImages/ordersLeft.png'//订单装饰
@@ -70,7 +70,7 @@ export default withLayout((props) => {
         title: '已付款',
         styleColor: '#FF703B'
       }
-    } else if (item.payStatus == 1 && item.dispatchStatus === 1) {
+    } else if (item.payStatus == 1 && item.dispatchStatus === 1 && item.workStatus === 0) {
       return {
         title: '待作业',
         styleColor: '#FF703B'
@@ -86,7 +86,7 @@ export default withLayout((props) => {
         title: '待评价',
         styleColor: '#51D4FF'
       }
-    } if (item.workStatus === 3 && item.isEvaluated === 1) {
+    } if (item.workStatus === 3 && item.isEvaluated === 1 && item.dispatchStatus == 1) {
       return {
         title: '已完成',
         styleColor: '#FF703B'

src/routes.js

@@ -6,6 +6,11 @@ const Pages = [
     page: 'pages/index/index',
     isIndex: true,
   },
+  // {
+  //   title: '首页1~',
+  //   page: 'pages/HomePage/index',
+
+  // },
   {
     title: '搜索页',
     page: 'pages/Search/index',
@@ -70,6 +75,27 @@ const Pages = [
     title: '查看地图',
     page: 'pages/CheckMap/index',
   },
+  // {
+  //   title: '订单1~',
+  //   page: 'pages/OrderPage/index',
+
+  // },
+  // {
+  //   title: '资讯1~',
+  //   page: 'pages/InformationPage/index',
+  // },
+  // {
+  //   title: '我的1~',
+  //   page: 'pages/MinePage/index',
+  // },
+
+
+
+  {
+    title: '登陆页面~',
+    page: 'pages/LoginPage/index',
+  },
+
 ];
 
 

src/utils/hooks/useLogin.js

@@ -6,7 +6,9 @@ import { useModel } from '@/store'
 import { useMemo, useState, useEffect } from "react";
 
 const whiteList = [
-  "/pages/index/index"
+  "/pages/index/index",
+  "/pages/LoginPage/index",
+  "/pages/HomePage/index"
 ]
 
 export default () => {

src/utils/hooks/useRouter.js

@@ -20,8 +20,6 @@ export default () => {
       return;
     }
 
-
-
   }, [scene])
 
   return routerRef.current