varosd

src/components/BottomMoadl/index.jsx

@@ -8,7 +8,7 @@ import './style.css'
 
 
 export default (props) => {
-  const { frameTitle, flag, onRecommend } = props
+  const { frameTitle, flag } = props
 
   let wrapAnimate = 'wrap wrapAnimate'
   let frameAnimate = 'frame-wrapper'
@@ -17,7 +17,7 @@ export default (props) => {
   // const [loading, setLoading] = useState(false)
 
   const hideFrame = () => {
-    onRecommend()
+    // onRecommend()
   }
 
 

src/components/ButtontWX/index.jsx

@@ -1,21 +1,25 @@
 
-import { View, Text } from '@tarojs/components'
+import { View, Text, Button } from '@tarojs/components'
 import './style.less'
 
 export default (props) => {
-  const { butText, butWidth, butHeight, butFontSize, butBorderRadius } = props
+  const { butText, butWidth, butHeight, butFontSize, butBorderRadius, onClick, formType, disabled } = props
   let butStyle = {
     width: `${butWidth || 100}px`,
     height: `${butHeight || 40}px`,
     borderRadius: `${butBorderRadius || 0}px`,
-    fontSize: `${butFontSize || 20}px`
+    fontSize: `${butFontSize || 20}px`,
+
   }
   let butStyle2 = {
     lineHeight: `${butHeight || 40}px`,
   }
+  const onClicks = () => {
+    onClick()
+  }
   return (
-    <View className='buttont-box' style={butStyle}>
-      <View style={butStyle2}>{butText || '确定'}</View>
-    </View>
+    <Button disabled={disabled} style={butStyle} onClick={onClicks} className='buttont-box' formType={formType || ''}  >
+      <View style={butStyle2}>{butText || ''}</View>
+    </Button>
   )
 }

src/components/CustomNav/index.jsx

@@ -0,0 +1,107 @@
+
+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 gobackBlack from '@/assets/icons/comm/goback.png'
+import gobackWhite from '@/assets/icons/comm/goback_white.png'
+
+import './style.less'
+
+export default (props) => {
+  const { bgImg, logo, title = '首页', home, noback } = props
+
+  // 菜单胶囊
+  const menuBound = useMemo(() => Taro.getMenuButtonBoundingClientRect(), [])
+  // 整体顶部导航
+  const navStyle = useMemo(() => {
+    return {
+      height: `${menuBound.bottom + 8}px`,
+      backgroundImage: bgImg ? `url(${bgImg})` : 'none',
+    }
+  }, [menuBound.bottom, bgImg])
+  // 导航栏
+  const navBarStyle = useMemo(() => {
+    return {
+      top: `${menuBound.top}px`,
+      height: `${menuBound.height}px`
+    }
+  }, [menuBound.top, menuBound.height])
+  // 导航栏按钮
+  const actionStyle = useMemo(() => {
+    return {
+      width: `${menuBound.width + 8}px`,
+      paddingLeft: '8px',
+      lineHeight: `${menuBound.height}px`,
+      height: `${menuBound.height}px`,
+    }
+  }, [menuBound.width, menuBound.height])
+  // 导航栏标题
+  const contentStyle = useMemo(() => {
+    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])
+
+  const handleAction = () => {
+    if (home || logo) return;
+
+    if (Taro.getCurrentPages().length > 1) {
+      Taro.navigateBack({ delta: 1 })
+    }
+  }
+
+  const goHome = () => {
+    Taro.reLaunch({
+      url: '/pages/index/index'
+    })
+  }
+
+  useEffect(() => {
+    if (title) {
+      Taro.setNavigationBarTitle({ title })
+    }
+  }, [title])
+
+  return (
+    <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>
+            )
+          }
+        </view>
+        <view className='custom-nav-bar-content' style={contentStyle}>{title}</view>
+      </view>
+    </view>
+  )
+}

src/components/CustomNav/style.less

@@ -0,0 +1,57 @@
+.custom-nav {
+  display: block;
+  position: relative;
+
+  &-bar {
+    display: flex;
+    position: fixed;
+    width: 100%;
+    z-index: 1024;
+    left: 0;
+
+    &-action {
+      flex: none;
+      box-sizing: border-box;
+
+      image {
+        display: inline-block;
+        border: 0;
+      }
+
+      &-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;
+      cursor: none;
+      pointer-events: none;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      box-sizing: border-box;
+    }
+  }
+}

src/pages/AboutUsPage/index.config.js

@@ -0,0 +1,10 @@
+
+export default {
+  navigationBarTitleText: '关于我们',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  usingComponents: {
+  }
+
+
+}

src/pages/AboutUsPage/index.jsx

@@ -0,0 +1,49 @@
+import { View, Image } from "@tarojs/components"
+import CustomNav from "@/components/CustomNav"
+import decorate from "@/assets/icons/comm/decorate.png"
+
+import './style.less'
+
+
+
+export default (props) => {
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='关于我们' />
+      </View>
+      <scroll-view scrollY style='height: 100%;' >
+        <View>
+          <View className='articleTitle-box'>
+            <Image src={decorate} />
+            <View>智慧农机的介绍</View>
+            <Image src={decorate} />
+          </View>
+          <View style={{ margin: '25px auto 0 auto', padding: '1px 15px 0px 15px' }}>
+            <View style={{ textIndent: '2em', color: '#121212', width: '100%', fontSize: '15px', lineHeight: '28px', textAlign: 'left' }}>
+              智慧农机旨在通过新一代物联网，大数据，3S等信息化技术有效整合省市县各级涉农资源
+            </View>
+            <View style={{ textIndent: '2em', color: '#121212', width: '100%', fontSize: '15px', lineHeight: '28px', textAlign: 'left' }}>
+              以顶层设计方式建成“一个平台一个中心N个应用”汇聚农业产业。农业“两区”。
+            </View>
+            <View style={{ textIndent: '2em', color: '#121212', width: '100%', fontSize: '15px', lineHeight: '28px', textAlign: 'left' }}>
+              物联网、植保、农机、畜牧、农资、农经，科教等各级农业业务应用及数据，形成大农业”数据中心。
+            </View>
+            <View style={{ textIndent: '2em', color: '#121212', width: '100%', fontSize: '15px', lineHeight: '28px', textAlign: 'left' }}>
+              构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。
+            </View>
+            <View style={{ textIndent: '2em', color: '#121212', width: '100%', fontSize: '15px', lineHeight: '28px', textAlign: 'left' }}>
+              智慧农机旨在通过新一代物联网，大数据，3S等信息化技术有效整合省市县各级涉农资源
+            </View>
+            <View style={{ textIndent: '2em', color: '#121212', width: '100%', fontSize: '15px', lineHeight: '28px', textAlign: 'left' }}>
+              以顶层设计方式建成“一个平台一个中心N个应用”汇聚农业产业。农业“两区”。
+            </View>
+          </View>
+
+
+        </View>
+      </scroll-view>
+    </View>
+  )
+}

src/pages/AboutUsPage/style.less

@@ -0,0 +1,15 @@
+.articleTitle-box {
+  width: 100%;
+  display: flex;
+  font-size: 40px;
+  font-weight: bold;
+  color: #222222;
+  align-items: center;
+  justify-content: center;
+  margin-top: 32px;
+  > Image {
+    width: 33px;
+    height: 33px;
+    margin: auto 31px;
+  }
+}

src/pages/FeedbackText/index.config.js

@@ -0,0 +1,10 @@
+
+export default {
+  navigationBarTitleText: '意见反馈',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  usingComponents: {
+  }
+
+
+}

src/pages/FeedbackText/index.jsx

@@ -0,0 +1,34 @@
+import { useState } from "react"
+import { Textarea, View } from "@tarojs/components"
+import CustomNav from "@/components/CustomNav"
+import ButtontWX from "@/components/ButtontWX"
+import './style.less'
+
+
+
+export default (props) => {
+
+  const [textAreaValue, setTextAreaValue] = useState('')
+
+
+  const onSubmitClick = () => {
+    console.log('textAreaValue', textAreaValue);
+  }
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='意见反馈' />
+      </View>
+      <View>
+        <View className='components-page'>
+
+          <Textarea placeholder='请留下您宝贵的意见和建议！' className='components-page-TextareaCentent' autoHeight onInput={(e) => { setTextAreaValue(e.detail.value) }} />
+        </View>
+        <View className='buton-bottom-Feedback'>
+          <ButtontWX onClick={onSubmitClick} butText='提交' butWidth={350} butHeight={49} butFontSize={16} butBorderRadius={49} />
+        </View>
+      </View>
+    </View>
+  )
+}

src/pages/FeedbackText/style.less

@@ -0,0 +1,18 @@
+.components-page {
+  &-TextareaCentent {
+    width: 85%;
+    background: #fefefe;
+    border: 2px solid rgba(0, 0, 0, 0.2);
+    border-radius: 20px;
+    min-height: 25vh;
+    margin: 1em auto;
+    padding: 10px 37px;
+  }
+}
+
+.buton-bottom-Feedback {
+  width: 100%;
+  margin: 0 auto;
+  position: fixed;
+  bottom: 6vh;
+}

src/pages/HelpCenterInfo/index.config.js

@@ -0,0 +1,10 @@
+
+export default {
+  navigationBarTitleText: '帮助中心',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  usingComponents: {
+  }
+
+
+}

src/pages/HelpCenterInfo/index.jsx

@@ -0,0 +1,56 @@
+import { View, Image } from "@tarojs/components"
+import CustomNav from "@/components/CustomNav"
+
+
+import './style.less'
+
+
+
+export default (props) => {
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='帮助中心' />
+      </View>
+      <scroll-view scrollY style='height: 100%;' >
+
+        <View className='help-center-cell'>
+          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
+          <View className='help-center-cell-bottom' >
+            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
+            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
+          </View>
+        </View>
+        <View className='help-center-cell'>
+          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
+          <View className='help-center-cell-bottom' >
+            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
+            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
+          </View>
+        </View>
+        <View className='help-center-cell'>
+          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
+          <View className='help-center-cell-bottom' >
+            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
+            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
+          </View>
+        </View>
+        <View className='help-center-cell'>
+          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
+          <View className='help-center-cell-bottom' >
+            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
+            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
+          </View>
+        </View>
+        <View className='help-center-cell'>
+          <Image src='https://profile.csdnimg.cn/8/3/5/1_yunqiinsight' />
+          <View className='help-center-cell-bottom' >
+            <View className='help-center-cell-bottom-title'  >收割机的最新消息！！</View>
+            <View className='help-center-cell-bottom-content' >构建互联共享的“互联网+农业”信息服务体系以最终实现科学指导农业生产经营管理，政府决策监管和社会公众服务。</View>
+          </View>
+        </View>
+      </scroll-view>
+    </View>
+  )
+}

src/pages/HelpCenterInfo/style.less

@@ -0,0 +1,35 @@
+.help-center-cell {
+  width: 95%;
+  display: flex;
+  margin: 0 auto;
+  padding-bottom: 64px;
+  padding-top: 20px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+  align-items: center;
+  > Image {
+    width: 156px;
+    height: 156px;
+    border-radius: 10px;
+  }
+  &-bottom {
+    width: 70%;
+    margin-left: 22px;
+    &-title {
+      font-size: 34px;
+      font-weight: bold;
+      color: #222222;
+    }
+    &-content {
+      font-size: 28px;
+      font-weight: 400;
+      color: #121212;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-line-clamp: 2;
+      -webkit-box-orient: vertical;
+      line-height: 50px;
+      margin-top: 40px;
+    }
+  }
+}

src/pages/MoreCars/index.config.js

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

src/pages/MoreCars/index.jsx

@@ -0,0 +1,38 @@
+
+
+import { View, Image, Input, Button } from "@tarojs/components"
+import CustomNav from "@/components/CustomNav"
+import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
+
+
+import './style.less'
+
+
+
+export default (props) => {
+
+  const handleSearch = (e) => {
+    console.log(e.detail.value)
+  }
+
+
+
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='更多' />
+      </View>
+      <scroll-view scrollY style='height: 100%;' >
+
+        <View className='heads-content-searchClass-abcc'>
+          <Input type='text' className='heads-content-searchClass-abcc-searchInput' onBlur={handleSearch} placeholder='搜索关键字查询订单' />
+          <Image src={searchs} className='heads-content-searchClass-abcc-searchInput-searchImg' />
+        </View>
+
+
+
+      </scroll-view>
+    </View>
+  )
+}

src/pages/MoreCars/style.less

@@ -0,0 +1,23 @@
+.heads-content-searchClass-abcc {
+  display: inline-block;
+  position: relative;
+  width: 95%;
+  text-align: center;
+  flex: 1;
+  &-searchInput {
+    background: #f8f8f8;
+    border-radius: 34px;
+    padding-left: 68px;
+    padding-right: 34px;
+    font-size: 28px;
+    height: 68px;
+    line-height: 68px;
+  }
+  &-searchInput-searchImg {
+    width: 30px;
+    height: 30px;
+    position: absolute;
+    left: 31px;
+    top: 19px;
+  }
+}

src/pages/MyAddressInfo/index.config.js

@@ -0,0 +1,10 @@
+
+export default {
+  navigationBarTitleText: '我的地址',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  usingComponents: {
+  }
+
+
+}

src/pages/MyAddressInfo/index.jsx

@@ -0,0 +1,52 @@
+import { View, Form, Input, Button } from "@tarojs/components"
+import CustomNav from "@/components/CustomNav"
+import ButtontWX from '@/components/ButtontWX'
+
+
+import './style.less'
+
+
+
+
+export default (props) => {
+  const formSubmit = e => {
+    console.log(e.detail.value)
+  }
+
+  const formReset = e => {
+    console.log(e)
+  }
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='我的地址' />
+      </View>
+      <scroll-view scrollY style='height: 100%;' >
+        <View className='form-content'>
+          <Form onSubmit={formSubmit} onReset={formReset} >
+            <View className='example-body'>
+              <View>姓名：</View>
+              <Input name='name' placeholder='请输入姓名' />
+            </View>
+            <View className='example-body'>
+              <View>手机号：</View>
+              <Input name='phone' placeholder='请输入手机号' />
+            </View>
+            <View className='example-body'>
+              <View>定位信息：</View>
+              <Input name='locast' placeholder='请输入定位信息' />
+            </View>
+            <View className='example-body'>
+              <View>地址信息：</View>
+              <Input name='locastInfo' placeholder='请输入地址信息' />
+            </View>
+            <View className='buton-bottom'>
+              <ButtontWX onClick={() => { }} formType='submit' butText='保存' butWidth={315} butHeight={49} butFontSize={16} butBorderRadius={49} />
+            </View>
+          </Form>
+
+        </View>
+      </scroll-view>
+    </View >
+  )
+}

src/pages/MyAddressInfo/style.less

@@ -0,0 +1,27 @@
+.form-content {
+  width: 100%;
+  height: 100%;
+  margin: 40px 30px;
+  .example-body {
+    margin-top: 40px;
+    > View {
+      width: 90%;
+
+      font-size: 34px;
+      font-weight: bold;
+      color: #333333;
+    }
+    > Input {
+      margin-top: 58px;
+      width: 90%;
+      font-size: 34px;
+      color: #333333;
+      padding-bottom: 30px;
+      border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+    }
+  }
+  .buton-bottom {
+    width: 100%;
+    margin: 85px -40px;
+  }
+}

src/pages/NewVersionUpdatePage/index.config.js

@@ -0,0 +1,9 @@
+
+export default {
+  navigationBarTitleText: '版本更新',
+  navigationStyle: 'custom',
+  disableScroll: true,
+  usingComponents: {
+  }
+
+}

src/pages/NewVersionUpdatePage/index.jsx

@@ -0,0 +1,32 @@
+import { View, Image } from "@tarojs/components"
+import CustomNav from "@/components/CustomNav"
+import decorate from "@/assets/icons/comm/decorate.png"
+
+import './style.less'
+
+
+
+
+export default (props) => {
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='版本更新' />
+      </View>
+      <scroll-view scrollY style='height: 100%;' >
+        <View>
+          <View className='articleTitle-box-New'>
+            <Image src={decorate} />
+            <View>最近更新：</View>
+            <Image src={decorate} />
+          </View>
+          <View className='new-Content-text'>
+            版本更新了一次
+            <View>----解决了一些已知的问题-----</View>
+          </View>
+        </View>
+      </scroll-view>
+    </View>
+  )
+}

src/pages/NewVersionUpdatePage/style.less

@@ -0,0 +1,31 @@
+.articleTitle-box-New {
+  width: 100%;
+  display: flex;
+  font-size: 40px;
+  font-weight: bold;
+  color: #222222;
+  align-items: center;
+  justify-content: center;
+  margin-top: 32px;
+  > Image {
+    width: 33px;
+    height: 33px;
+    margin: auto 31px;
+  }
+}
+
+.new-Content-text {
+  width: 100%;
+  text-align: center;
+  font-size: 32px;
+  font-weight: bold;
+  color: #101010;
+  margin: 80px auto;
+  > View {
+    width: 100%;
+    margin: 0 auto;
+    font-size: 32px;
+    color: #101010;
+    font-weight: 500;
+  }
+}

src/pages/OrderInfo/index.jsx

@@ -1,5 +1,6 @@
 import { View, Text } from "@tarojs/components"
 import { useState } from "react"
+import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
 // import BottomMoadl from '@/components/BottomMoadl/index'
 
@@ -19,7 +20,10 @@ export default (props) => {
 
 
   return (
-    <View>
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='订单详情' />
+      </View>
       {/* <BottomMoadl frameTitle='支付方式' flag={showFrame} onRecommend={setRecommend} /> */}
       <View className='orders-listBox-RihtboxBoxOrderViewText'>
         <View className='View-LiftTextTop'>订单编号：<Text>41242425</Text></View>
@@ -32,7 +36,7 @@ export default (props) => {
           <View>费用：<Text className='feiyongStyle'>88</Text></View>
         </View>
       </View>
-      <View className='BottomtBut' onClick={setRecommend}>
+      <View className='BottomtBut' >
         <ButtontWX butText='支付' butWidth={345} butHeight={49} butFontSize={16} butBorderRadius={49} />
       </View>
     </View>

src/pages/UserLogin/index.config.js

@@ -1,9 +1,8 @@
 
 export default {
   navigationBarTitleText: '登陆',
-  // navigationStyle: 'custom',
+  navigationStyle: 'custom',
   disableScroll: true,
-
   usingComponents: {
   }
 

src/pages/UserLogin/index.jsx

@@ -1,25 +1,112 @@
 
-import { View, Image, Input } from '@tarojs/components'
+import { useState } from 'react'
+import Taro from '@tarojs/taro'
+
+import { View, Image, Input, Text } from '@tarojs/components'
+import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
+import checkedImg from '@/assets/lolginImages/checkedImg.png'
+import unselectedImg from '@/assets/lolginImages/unselectedImg.png'
 
 import './style.less'
 
+
 export default (props) => {
 
-  return (
-    <View className='loginBackImg-box' >
-      <Image src={require("@/assets/lolginImages/backLogin.png")} />
+  const [countCenter, setCountCenter] = useState({
+    count: 10,
+    toast: false,
+    show_btn: false,
+    code_ts: '获取验证码'
+  })
+
+  const [checkImage, setCheckImage] = useState(false)
+  const [InputCodeValue, setInputCodeValue] = useState('')
+
+  const InputCode = (r) => {
+    setInputCodeValue(r.detail.value)
+  }
+
+  const getCode = (r) => {
+    if (InputCodeValue === '' || !(/^1[3456789]\d{9}$/.test(InputCodeValue))) {
+      // 这里验证一下号码格式是否正确，为空或者不正常都提示一下，然后激活提示控件true，其他的框架提示控件同理
+      console.log('提示')
+      Taro.showToast({
+        title: '手机号码有误',
+        icon: 'none',
+        duration: 2000
+      })
+
+    } else {
+      // 这里写一个定时器就可以去更新灰色按钮的内容而且show_btn是false时会出现灰色按钮，当倒计时结束又变成可以触发的按钮
+      let count = countCenter.count
+      const timer = setInterval(() => {
+        setCountCenter({
+          count: (count--),
+          show_btn: true,
+          code_ts: count + '秒后重发'
+        }, () => {
+          if (count == 0) {
+            clearInterval(timer)
+            setCountCenter({
+              show_btn: false,
+              count: 60,
+              code_ts: '获取验证码'
+            })
+          }
+        })
+      }, 1000)
+    }
+  }
 
-      <View className='loginhallo-text'>
-        <View>您好！</View>
-        <View>欢迎进入农户端小程序！</View>
-      </View>
 
-      <View className='loginPhone-box'>
-        <View>+86</View>
-        <Input />
-        <ButtontWX butText='获取验证码' butWidth={94} butHeight={34} butFontSize={15} butBorderRadius={10} />
 
+  const getUserLogin = () => {
+    if (!checkImage) {
+      Taro.showToast({
+        title: '下方协议未勾选',
+        icon: 'none',
+        duration: 2000
+      })
+    }
+  }
+
+
+
+  return (
+    <View className='page-index'>
+      <View className='index-navbar'>
+        <CustomNav title='登陆' />
+      </View>
+      <View className='loginBackImg-box' >
+        <Image src={require("@/assets/lolginImages/backLogin.png")} />
+
+        <View className='loginhallo-text'>
+          <View>您好！</View>
+          <View>欢迎进入农户端小程序！</View>
+        </View>
+        <View>
+          <View className='loginPhone-box' >
+            <View className='loginPhone-box-loginPhoneView'>+86</View>
+            <Input maxlength={11} placeholder='请输入手机号码' type={Number} onInput={InputCode} />
+            <ButtontWX 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='请输入验证码' />
+          </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>
       </View>
 
     </View>

src/pages/UserLogin/style.less

@@ -4,13 +4,13 @@
   > Image {
     height: 100%;
     width: 100%;
-    background-size: 100% 100%;
-    background-repeat: no-repeat;
-    position: fixed;
+
+    position: absolute;
+    top: 0;
   }
 
   .loginhallo-text {
-    position: absolute;
+    position: relative;
     margin: 98px 0 80px 30px;
   }
   .loginhallo-text:nth-child(1) {
@@ -25,8 +25,45 @@
   }
 
   .loginPhone-box {
-    position: absolute;
-    > View {
+    width: 93%;
+    height: 108px;
+    margin: 0 auto;
+    position: relative;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+    padding-bottom: 12px;
+
+    &-loginPhoneView {
+      font-size: 38px;
+      font-weight: 500;
+      color: #333333;
+      height: 39px;
+      line-height: 39px;
+      padding-right: 20px;
+      margin-right: 31px;
+      border-right: 3px solid #000;
     }
   }
 }
+.BottomtButrelative {
+  position: relative;
+  bottom: 5vh;
+}
+
+.bottom-agreement {
+  position: relative;
+  display: flex;
+  align-items: center;
+  font-size: 26px;
+  color: #2a2a2a;
+  margin-left: 30px;
+  margin-bottom: 60px;
+  // height: 2vh;
+  // bottom: 8vh;
+  > Image {
+    width: 28px;
+    height: 28px;
+    margin-right: 11px;
+  }
+}

src/pages/index/index.config.js

@@ -1,7 +1,8 @@
 
 export default {
   navigationBarTitleText: '首页',
-  // navigationStyle: 'custom',
+  navigationStyle: 'custom',
+
   styleIsolation: 'shared',
   enableShareAppMessage: true,
   disableScroll: true,

src/pages/index/index.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import Taro, { useDidShow } from '@tarojs/taro'
 import withLayout from '@/layouts'
-
+import CustomNav from '@/components/CustomNav'
 import tabList from './tabbar'
 import Homes from './tabs/Homes'
 import Orders from './tabs/Orders'
@@ -40,7 +40,9 @@ export default withLayout((props) => {
 
   return (
     <view className='page-index'>
+
       <view className='index-navbar'>
+        <CustomNav title='首页' />
       </view>
       <view className='index-container'>
         {currentTab === 0 && <Homes />}

src/pages/index/tabs/Homes.jsx

@@ -1,7 +1,7 @@
 
 import { View, Swiper, Image, SwiperItem, Text, Input } from "@tarojs/components"
 import ButtontWX from '@/components/ButtontWX'
-
+import Taro from "@tarojs/taro"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
 import carsListImga from '@/assets/homesImgaes/carsListImga.png'//农机列表图片
@@ -34,6 +34,10 @@ export default (props) => {
     console.log(e.detail.value)
   }
 
+  const goToCarsList = () => {
+    Taro.navigateTo({ url: '/pages/MoreCars/index' })
+  }
+
   return (
 
 
@@ -65,7 +69,7 @@ export default (props) => {
           <Image src={carsListImga} />
           <View>农机列表</View>
         </View>
-        <View className='content-header-box-rightCentent'>更多&gt;&gt;</View>
+        <View onClick={goToCarsList} className='content-header-box-rightCentent'>更多&gt;&gt;</View>
       </View>
 
       {

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

@@ -1,7 +1,7 @@
 .User-Avatar-background-falseBox {
   width: 95vw;
   height: 30vh;
-  background-size: 100%;
+  background-size: 100% 100%;
   background-repeat: no-repeat;
   border-radius: 40px;
   box-shadow: 0px 10px 24px 0px rgba(0, 0, 0, 0.1);

src/routes.js

@@ -9,12 +9,34 @@ const Pages = [
   {
     title: '订单详情',
     page: 'pages/OrderInfo/index',
-    isIndex: true,
   },
   {
     title: '登陆页',
     page: 'pages/UserLogin/index',
-    isIndex: true,
+  },
+  {
+    title: '我的地址',
+    page: 'pages/MyAddressInfo/index',
+  },
+  {
+    title: '关于我们',
+    page: 'pages/AboutUsPage/index',
+  },
+  {
+    title: '版本更新',
+    page: 'pages/NewVersionUpdatePage/index',
+  },
+  {
+    title: '帮助中心',
+    page: 'pages/HelpCenterInfo/index',
+  },
+  {
+    title: '意见反馈',
+    page: 'pages/FeedbackText/index',
+  },
+  {
+    title: '农机列表',
+    page: 'pages/MoreCars/index',
   },
 
 ];