.

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

@@ -42,7 +42,7 @@ export default (props) => {
   }
   const signOut = () => {
     setPhone()
-    Taro.reLaunch({ url: '/pages/index/index?tab=2' });
+    Taro.reLaunch({ url: '/pages/login/index' });
   }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>

src/pages/index/index.jsx

@@ -8,6 +8,7 @@ import jobActive from "@/assets/comm/jobActive.png";
 import user from "@/assets/comm/user.png";
 import userActive from "@/assets/comm/userActive.png";
 import CustomNav from "@/components/CustomNav";
+import {setAmap} from '@/services/amap'
 import withLayout from '@/layouts'
 import { useModel } from "@/store";
 import Order from './components/Order'
@@ -18,21 +19,26 @@ import "./index.less";
 export default withLayout((props) => {
   const { router } = props
   let { tab, isLogin } = router.params
-  const { phone } = useModel('phone')
+  const { location,setLocation } = useModel('location')
   const [currentTab, setCurrentTab] = useState(0);
   const handleClick = (val) => {
     setCurrentTab(val);
   };
-  useEffect(() => {    
+  useEffect(() => {  
+    if(!location){
+      Taro.getLocation({
+        type:'gcj02',
+        success:function(res){
+          setLocation(res.longitude+','+res.latitude)
+          setAmap({params:'location='+res.longitude+','+res.latitude,path: '/v3/geocode/regeo'})
+        }})
+    } else {
+      setAmap({params:'location='+location,path: '/v3/geocode/regeo'})
+    }
     if (tab) {      
       setCurrentTab(tab - 0)
     }
   }, [tab])
-  useEffect(()=>{
-    if (currentTab!==0&&!phone) {
-      Taro.reLaunch({ url: '/pages/login/index' });
-    }
-  },[currentTab])
   return (
     <View className='page-index'>
       <View className='index-navbar'>

src/pages/machineryList/index.jsx

@@ -1,17 +1,27 @@
+import { useEffect } from "react"
 import Taro from "@tarojs/taro"
 import { View, ScrollView } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import withLayout from '@/layouts'
+import {getMachineryList} from '@/services/machinery'
+import { useModel } from "@/store"
 import MachineryCard from './Card'
 import './style.less'
 
 export default withLayout((props) => {
+  const { location } = useModel('location')
+
   const goDetail=()=>{
     Taro.navigateTo({ url: '/pages/machineryDetail/index' });
   }
   const goMap=()=>{
     Taro.navigateTo({ url: '/pages/machineryMap/index' });
   }
+  useEffect(()=>{
+    getMachineryList({location:location}).then((res)=>{
+      
+    })
+  },[])
   return (
     <View className='page-index'>
       <View className='index-navbar'>

src/pages/machineryMap/index.jsx

@@ -45,8 +45,8 @@ export default withLayout((props) => {
       </View>
       <View className='index-container machineryMap'>
         <Map
-          longitude={112.116846}
-          latitude={32.688935}
+          longitude={112.092716}
+          latitude={32.681642}
           markers={markers}
           className='map'
           onMarkerTap={handleClick}

src/services/amap.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+/**
+ * 高德地图接口
+ * @param {*} data 
+ * @returns 
+ */
+ export const setAmap = (params) => request('/amap', { method: 'post', params })

src/store/index.js

@@ -1,11 +1,13 @@
 import { createStore, createStoreRoot, createModelHook } from '@zjxpcyc/react-tiny-store'
 import phone from './models/phone'
 import person from './models/person'
+import location from './models/location'
 
 const store = createStore()
 const models = {
   phone,
-  person
+  person,
+  location
 }
 
 const useModel = createModelHook(store)

src/store/models/location.js

@@ -0,0 +1,10 @@
+import { useState } from "react";
+
+export default function useHotel() {
+  const [location, setLocation] = useState()
+
+  return {
+    location,
+    setLocation,
+  }
+}