Merge branch 'm

package.json

@@ -42,19 +42,21 @@
     "@tarojs/taro": "3.3.6",
     "react": "^17.0.0",
     "react-dom": "^17.0.0",
+    "react-redux": "^7.2.6",
+    "redux": "^4.1.2",
     "weui-miniprogram": "^1.2.3"
   },
   "devDependencies": {
-    "@types/webpack-env": "^1.13.6",
-    "@types/react": "^17.0.2",
-    "@tarojs/mini-runner": "3.3.6",
     "@babel/core": "^7.8.0",
+    "@tarojs/mini-runner": "3.3.6",
     "@tarojs/webpack-runner": "3.3.6",
+    "@types/react": "^17.0.2",
+    "@types/webpack-env": "^1.13.6",
     "babel-preset-taro": "3.3.6",
-    "eslint-config-taro": "3.3.6",
     "eslint": "^6.8.0",
-    "eslint-plugin-react": "^7.8.2",
+    "eslint-config-taro": "3.3.6",
     "eslint-plugin-import": "^2.12.0",
+    "eslint-plugin-react": "^7.8.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "stylelint": "9.3.0"
   }

project.config.json

@@ -2,7 +2,7 @@
     "miniprogramRoot": "dist/",
     "projectname": "nanyang",
     "description": "南阳农机",
-    "appid": "wx835627a9b9b3932a",
+    "appid": "wx94f23e5b285c046d",
     "setting": {
         "urlCheck": true,
         "es6": false,

src/app.js

@@ -1,8 +1,12 @@
 import { Component } from 'react'
 import Taro from '@tarojs/taro'
 import { login } from '@/services/login'
+
+import store from './store'
+
 import './app.less'
 
+
 class App extends Component {
 
   componentDidMount () { }
@@ -14,6 +18,13 @@ class App extends Component {
       success: (res) => {
         const { code } = res;
         login({ code })
+
+
+        const action = { type: "SET_VISIBILITY_FILTER", state: { cookis: 'a1sd54a5wd654s' } }
+        store.dispatch(action)
+
+
+        console.log(store.getState());
       }
     })
 

src/pages/CheckDetails/index.jsx

@@ -1,25 +1,73 @@
 import { useState } from "react"
-import { Textarea, View } from "@tarojs/components"
+import { Image, View, Text } from "@tarojs/components"
+import Taro from "@tarojs/taro"
 import CustomNav from "@/components/CustomNav"
+
 import ButtontWX from "@/components/ButtontWX"
+import decorate from "@/assets/icons/comm/decorate.png"
+import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import './style.less'
 
 
 
 export default (props) => {
 
-  const [textAreaValue, setTextAreaValue] = useState('')
 
+  const startReserve = () => {
+    Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
+
+  }
+
+  const goMapInfo = (res) => {
+    Taro.navigateTo({ url: `/pages/CheckMap/index?mapId=${res + 111}` })
 
+  }
 
   return (
     <View className='page-index'>
+
       <View className='index-navbar'>
         <CustomNav title='查看详情' />
       </View>
-      <View>
+      <scroll-view scrollY style='height: 100%;' >
 
-      </View>
-    </View>
+        <View >
+
+          <Image style={{ width: '100%' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' />
+
+          <View className='CarsContent-TextBox'>
+            <View className='CheckDetails-bottom-box-flaxBox-liftText'>
+              <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>不知家收割机</View>
+              <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>2188/<Text>公顷</Text></View>
+            </View>
+            <View className='content-header-box-map-Info' onClick={() => goMapInfo('222888')}>
+              <View className='content-header-box-map-Info-liftCentent'>
+                <Image src={addresss} />
+                <View>距离当前位置8.8公里&gt;&gt;</View>
+              </View>
+            </View>
+            <View className='content-header-box-map-Info-carsName'>农机手小李的收割机</View>
+            <View className='startReserve-centent'>
+              <View className='articleTitle-box-Details'>
+                <Image src={decorate} />
+                <View>作业详情</View>
+                <Image src={decorate} />
+              </View>
+              <Image style={{ width: '100%' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' />
+              <Image style={{ width: '100%' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' />
+              <Image style={{ width: '100%' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' />
+
+              <View className='startReserve-Bottom'>
+                <ButtontWX butText='预约' onClick={startReserve} butWidth={300} butHeight={49} butFontSize={16} butBorderRadius={49} />
+
+              </View>
+            </View>
+
+
+          </View>
+        </View>
+      </scroll-view>
+
+    </View >
   )
 }

src/pages/CheckDetails/style.less

@@ -1,18 +1,86 @@
-.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;
+.CarsContent-TextBox {
+  padding: 40px 30px;
+  position: relative;
+  top: -9vh;
+  background-color: #fff;
+  border-radius: 40px 40px 0px 0px;
+  .CheckDetails-bottom-box-flaxBox-liftText {
+    width: 95%;
+
+    display: flex;
+    justify-content: space-between;
+
+    &-Titles {
+      text-overflow: ellipsis; //显示...
+      white-space: nowrap; //不换行
+      overflow: hidden;
+      font-size: 36px;
+      font-weight: bold;
+      color: #222222;
+    }
+    &-price {
+      font-size: 44px;
+      font-weight: 800;
+      color: #666666;
+      background: linear-gradient(180deg, #fa7878 0%, #b61515 100%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      > Text {
+        font-size: 25px;
+      }
+    }
+  }
+
+  .content-header-box-map-Info {
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+    // justify-content: space-between;
+    padding: 30px 0 30px 0;
+    &-liftCentent {
+      display: flex;
+      align-items: center;
+      > Image {
+        width: 22px;
+        height: 27px;
+      }
+      > View {
+        padding-left: 15px;
+        font-size: 30px;
+        font-weight: 800;
+        color: #222222;
+      }
+    }
+    &-rightCententInfo {
+      font-size: 30px;
+      font-weight: 500;
+      color: #666666;
+    }
+    &-carsName {
+      font-size: 30px;
+      font-weight: bold;
+      color: #222222;
+    }
+  }
+
+  .articleTitle-box-Details {
+    display: flex;
+    font-size: 30px;
+    font-weight: bold;
+    color: #222222;
+    align-items: center;
+    justify-content: center;
+    margin-top: 32px;
+    > Image {
+      width: 33px;
+      height: 33px;
+      margin: auto 31px;
+    }
   }
-}
 
-.buton-bottom-Feedback {
-  width: 100%;
-  margin: 0 auto;
-  position: fixed;
-  bottom: 6vh;
+  .startReserve-Bottom {
+    position: absolute;
+    bottom: -3vh;
+    width: 92vw;
+  }
 }

src/pages/CheckMap/index.jsx

@@ -1,22 +1,87 @@
-import { useState } from "react"
-import { Textarea, View } from "@tarojs/components"
+import { useEffect } from "react"
+import { Map, View, Image, Text } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import ButtontWX from "@/components/ButtontWX"
+import Taro from "@tarojs/taro"
+import decorate from "@/assets/icons/comm/decorate.png"
+import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import './style.less'
 
 
-
 export default (props) => {
 
+  const $instance = Taro.getCurrentInstance()
+
+
+  useEffect(() => {
+    console.log($instance.router.params)
+
+  }, [])
+
+  const startReserve = () => {
+    Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
+
+  }
+
+  const markers = [{ // 绘制浮标，传入JSON支持多个
+    // iconPath: "/images/location.png", 
+    id: 0,
+    latitude: 112.092169,// 经度
+    longitude: 32.694883,//纬度
+    width: 50, // 浮标宽度
+    height: 50 // 浮标高度
+  }]
 
   return (
     <View className='page-index'>
       <View className='index-navbar'>
         <CustomNav title='查看地图' />
       </View>
-      <View>
+      <scroll-view scrollY style='height: 100%;' >
 
-      </View>
+        <View className='MapBox-centent'>
+          <Map
+            id='map'
+            longitude='112.092169'
+            latitude='32.694883'
+            scale='12'
+            markers={markers}
+            bindmarkertap='markertap'
+            style='width:100%;height:35vh;'
+          >
+          </Map>
+          <View className='MapBox-centent-BodyArticle'>
+            <Image style={{ width: '100%', borderRadius: '20px 20px 0px 0px' }} src='http://img3.jc001.cn/img/001/1/1512/15566fd0311736f.jpg' />
+            <View className='CarsContent-TextBox'>
+              <View className='CheckDetails-bottom-box-flaxBox-liftText'>
+                <View className='CheckDetails-bottom-box-flaxBox-liftText-Titles'>不知家收割机</View>
+                <View className='CheckDetails-bottom-box-flaxBox-liftText-price'>2188/<Text>公顷</Text></View>
+              </View>
+              <View className='content-header-box-map-Info'>
+                <View className='content-header-box-map-Info-liftCentent'>
+                  <Image src={addresss} />
+                  <View>距离当前位置8.8公里&gt;&gt;</View>
+                </View>
+              </View>
+              <View className='content-header-box-map-Info-carsName'>农机手小李的收割机</View>
+              <View className='startReserve-centent'>
+                {/* <View className='articleTitle-box-Details'>
+                  <Image src={decorate} />
+                  <View>作业详情</View>
+                  <Image src={decorate} />
+                </View> */}
+
+                <View className='startReserve-Bottom'>
+                  <ButtontWX butText='预约' onClick={startReserve} butWidth={300} butHeight={49} butFontSize={16} butBorderRadius={49} />
+
+                </View>
+              </View>
+
+
+            </View>
+          </View>
+        </View>
+      </scroll-view>
     </View>
   )
 }

src/pages/CheckMap/style.less

@@ -1,18 +1,94 @@
-.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;
-  }
-}
+.MapBox-centent {
+  width: 100vw;
+  &-BodyArticle {
+    background: #fff;
+    position: relative;
+    top: -7vh;
+    .CarsContent-TextBox {
+      padding: 40px 30px;
+      position: relative;
+      top: -8vh;
+      background-color: #fff;
+      border-radius: 40px 40px 0px 0px;
+      .CheckDetails-bottom-box-flaxBox-liftText {
+        width: 95%;
+
+        display: flex;
+        justify-content: space-between;
+
+        &-Titles {
+          text-overflow: ellipsis; //显示...
+          white-space: nowrap; //不换行
+          overflow: hidden;
+          font-size: 36px;
+          font-weight: bold;
+          color: #222222;
+        }
+        &-price {
+          font-size: 44px;
+          font-weight: 800;
+          color: #666666;
+          background: linear-gradient(180deg, #fa7878 0%, #b61515 100%);
+          -webkit-background-clip: text;
+          -webkit-text-fill-color: transparent;
+          > Text {
+            font-size: 25px;
+          }
+        }
+      }
 
-.buton-bottom-Feedback {
-  width: 100%;
-  margin: 0 auto;
-  position: fixed;
-  bottom: 6vh;
+      .content-header-box-map-Info {
+        margin: 0 auto;
+        display: flex;
+        align-items: center;
+        // justify-content: space-between;
+        padding: 30px 0 30px 0;
+        &-liftCentent {
+          display: flex;
+          align-items: center;
+          > Image {
+            width: 22px;
+            height: 27px;
+          }
+          > View {
+            padding-left: 15px;
+            font-size: 30px;
+            font-weight: 800;
+            color: #222222;
+          }
+        }
+        &-rightCententInfo {
+          font-size: 30px;
+          font-weight: 500;
+          color: #666666;
+        }
+        &-carsName {
+          font-size: 30px;
+          font-weight: bold;
+          color: #222222;
+        }
+      }
+
+      .articleTitle-box-Details {
+        display: flex;
+        font-size: 30px;
+        font-weight: bold;
+        color: #222222;
+        align-items: center;
+        justify-content: center;
+        margin-top: 32px;
+        > Image {
+          width: 33px;
+          height: 33px;
+          margin: auto 31px;
+        }
+      }
+
+      .startReserve-Bottom {
+        position: relative;
+        bottom: -3vh;
+        width: 92vw;
+      }
+    }
+  }
 }

src/pages/OrderInfo/index.jsx

@@ -2,6 +2,7 @@ import { View, Text } from "@tarojs/components"
 import { useState } from "react"
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
+import store from "@/store"
 // import BottomMoadl from '@/components/BottomMoadl/index'
 
 
@@ -18,6 +19,10 @@ export default (props) => {
   //   setShowFrame(!showFrame)
   // }
 
+  const pay = () => {
+
+  }
+
 
   return (
     <View className='page-index'>
@@ -37,7 +42,7 @@ export default (props) => {
         </View>
       </View>
       <View className='BottomtBut' >
-        <ButtontWX butText='支付' butWidth={345} butHeight={49} butFontSize={16} butBorderRadius={49} />
+        <ButtontWX butText='支付' onClick={pay} butWidth={345} butHeight={49} butFontSize={16} butBorderRadius={49} />
       </View>
     </View>
   )

src/pages/index/tabs/Homes.jsx

@@ -7,6 +7,8 @@ import searchs from '@/assets/homesImgaes/searchs.png'//搜索图片
 import carsListImga from '@/assets/homesImgaes/carsListImga.png'//农机列表图片
 
 
+import store from '@/store'
+
 import './HomesCss/style.less'
 
 export default (props) => {
@@ -34,9 +36,36 @@ export default (props) => {
     console.log(e.detail.value)
   }
 
-  const goToCarsList = () => {
+  const goToCarsList = () => {//更多
     Taro.navigateTo({ url: '/pages/MoreCars/index' })
+
+    // let value = store.getState()
+    // console.log('value-Home里面取值', store.getState());
+    // if (value.appid == '') {
+    //   Taro.showToast({
+    //     title: '成功',
+    //     icon: 'success',
+    //     duration: 2000
+    //   })
+    // } else {
+
+    // }
+
+  }
+
+  const startReserve = () => {
+    Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
+
+  }
+  const goCarsInfo = (res) => {
+    Taro.navigateTo({ url: `/pages/CheckDetails/index?id=${res}` })
+
   }
+  const goMapInfo = (res) => {
+    Taro.navigateTo({ url: `/pages/CheckMap/index?mapId=${res + 111}` })
+
+  }
+
 
   return (
 
@@ -76,17 +105,17 @@ export default (props) => {
         carsList.map((item, index) => {
           return (
             <View key={index} className='carsListImga-bottom-box'>
-              <Image src={item.carsUrl} />
+              <Image src={item.carsUrl} onClick={() => goCarsInfo(item.id)} />
               <View className='carsListImga-bottom-box-flaxBox'>
                 <View className='carsListImga-bottom-box-flaxBox-liftText'>
                   <View className='carsListImga-bottom-box-flaxBox-liftText-Titles'>{item.carsName}</View>
                   <View className='carsListImga-bottom-box-flaxBox-liftText-price'>{item.jiage}/<Text>公顷</Text></View>
                 </View>
                 <View className='carsListImga-bottom-box-flaxBox-rightBut'>
-                  <ButtontWX butText='预约' butWidth={80} butHeight={34} butFontSize={19} butBorderRadius={0} />
+                  <ButtontWX onClick={startReserve} butText='预约' butWidth={80} butHeight={34} butFontSize={19} butBorderRadius={0} />
                 </View>
               </View>
-              <View className='content-header-box-map'>
+              <View className='content-header-box-map' onClick={() => goMapInfo(item.mapId)}>
                 <View className='content-header-box-map-liftCentent'>
                   <Image src={addresss} />
                   <View>距离当前位置{item.carsLocation}公里</View>

src/pages/index/tabs/Mine.jsx

@@ -1,6 +1,6 @@
 
 import { View, Image } from "@tarojs/components"
-import { useDidShow } from "@tarojs/taro"
+import Taro from "@tarojs/taro"
 import { useState } from "react"
 import UserCellBox from '@/components/UserCellBox'
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
@@ -9,18 +9,59 @@ import feedbacks from '@/assets/mineImgaes/feedbacks.png'//意见反馈
 import helpCenter from '@/assets/mineImgaes/helpCenter.png'//帮助中心
 import versionUpdate from '@/assets/mineImgaes/versionUpdate.png'//版本更新
 import userRight from '@/assets/mineImgaes/userRight.png'//版本更新
+import store from "@/store"
 import './MineCss/style.less'
 
 
 export default (props) => {
   const [isLoginBox, setIsLoginBox] = useState(false)
   const userList = [
-    { userTitle: '关于我们', userImg: aboutUs },
-    { userTitle: '版本更新', userImg: versionUpdate },
-    { userTitle: '帮助中心', userImg: helpCenter },
-    { userTitle: '意见反馈', userImg: feedbacks },
+    { userTitle: '关于我们', userImg: aboutUs, pageType: 0 },
+    { userTitle: '版本更新', userImg: versionUpdate, pageType: 1 },
+    { userTitle: '帮助中心', userImg: helpCenter, pageType: 2 },
+    { userTitle: '意见反馈', userImg: feedbacks, pageType: 3 },
   ]
 
+
+  const setAddress = (dd) => {
+    Taro.navigateTo({ url: `/pages/MyAddressInfo/index?id${dd}` })
+
+  }
+
+  const userLoginnow = () => {
+    const action = { type: "SET_VISIBILITY_FILTER", state: { appid: '55555555555' } }
+    store.dispatch(action)
+    console.log(store.getState());
+
+
+    // Taro.navigateTo({ url: `/pages/UserLogin/index?id` })
+    // setIsLoginBox(true)
+  }
+  const goToPages = (res) => {
+    switch (res) {
+      case 0:
+        Taro.navigateTo({ url: '/pages/AboutUsPage/index' })
+
+        break;
+      case 1:
+        Taro.navigateTo({ url: '/pages/NewVersionUpdatePage/index' })
+
+        break;
+      case 2:
+        Taro.navigateTo({ url: '/pages/HelpCenterInfo/index' })
+
+        break;
+      case 3:
+        Taro.navigateTo({ url: '/pages/FeedbackText/index' })
+
+        break;
+
+      default:
+        break;
+    }
+  }
+
+
   return (
 
     <scroll-view scrollY style='height: 100%;' >
@@ -30,7 +71,7 @@ export default (props) => {
           !isLoginBox ?
             <View style={{ backgroundImage: "url(" + require("@/assets/mineImgaes/mineBack.png") + ")" }} className='User-Avatar-background-falseBox'>
               <Image className='User-Avatar-background-falseBox-userImg userImg' src='https://profile.csdnimg.cn/3/1/5/0_qq_42551866' />
-              <View className='User-Avatar-background-falseBox-userLogin' onClick={() => setIsLoginBox(true)}>点击登陆</View>
+              <View onClick={userLoginnow} className='User-Avatar-background-falseBox-userLogin' >点击登陆</View>
             </View>
             :
             <>
@@ -43,8 +84,8 @@ export default (props) => {
                 </View>
 
               </View>
-              <UserCellBox title='地址信息' >
-                <View className='addresss-box'>
+              <UserCellBox title='地址信息'>
+                <View className='addresss-box' onClick={setAddress} >
                   <Image className='addresss-box-images' src={addresss} />
                   <View className='addresss-box-contents'>
                     <View className='addresss-box-contents-texts' >河南省南阳市邓州市九龙镇5556666665</View>
@@ -61,7 +102,7 @@ export default (props) => {
           {
             userList.map((item, index) => {
               return (
-                <View key={index} className='User-Setup-background-wxInfo-InfoCell'>
+                <View key={index} className='User-Setup-background-wxInfo-InfoCell' onClick={() => goToPages(item.pageType)}>
                   <Image className='User-Setup-background-wxInfo-InfoCell-imgae' src={item.userImg} />
                   <View className='box-flex'>
                     <View className='User-Setup-background-wxInfo-InfoCell-text'>{item.userTitle}</View>

src/store/index.js

@@ -0,0 +1,8 @@
+import { createStore } from 'redux'
+import reducer from './reducers'
+
+
+const store = createStore(reducer) // 创建数据存储仓库
+
+
+export default store   

src/store/reducers.js

@@ -0,0 +1,43 @@
+const defaultState = {
+  appid: '',
+  cookis: ''
+}
+console.log(defaultState, 'defaultState');
+
+
+function todoApp (state = defaultState, action) {
+  state = JSON.parse(JSON.stringify(state)) //深度
+  switch (action.type) {
+    case 'SET_VISIBILITY_FILTER':
+      state = {
+        ...defaultState,
+        ...action.state
+      }
+      return state;
+    default:
+      return state;
+
+
+
+  }
+}
+
+
+// function fn (state = defaultState, action) {
+//   state = JSON.parse(JSON.stringify(state)) //深度
+
+//   switch (action.type) {
+//     case "setVisibilityFilter":
+//       state = {
+//         ...defaultState,
+//         ...action.state
+//       }
+//       return state;
+//     default:
+//       return state;
+//   }
+
+// }
+
+const state = todoApp
+export default state