.

src/layouts/index.jsx

@@ -4,5 +4,7 @@ import useRouter from '@/utils/hooks/useRouter'
 
 export default (Child) => (props) => {
   const router = useRouter()
-  return <Child {...props} router={router} />
+  const location = Taro.getStorageSync('location')
+
+  return <Child {...props} router={router} location={location} />
 }

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

@@ -44,9 +44,6 @@ export default (props) => {
   const signOut = () => { 
     Taro.reLaunch({ url: '/pages/index/index?tab=2' });
   }
-  const handleMap = () => { 
-    Taro.reLaunch({ url: '/pages/machineryMap/index' });
-  }
   return (
     <ScrollView scrollY style={{ height: '100%' }}>
       {
@@ -105,10 +102,6 @@ export default (props) => {
         <View className='userBox'>
           <MyCell icon={feedback} action={goto} user handleAction={handleFeedback}>意见反馈</MyCell>
         </View>
-
-        <View className='userBox'>
-          <MyCell icon={feedback} action={goto} user handleAction={handleMap}>农机地图</MyCell>
-        </View>
         {
           isLogin && <View className='signOut' onClick={signOut}>退出登录</View>
         }

src/pages/machineryList/Card/index.jsx

@@ -4,12 +4,15 @@ import banner1 from '@/assets/banner/2.jpg'
 import './style.less'
 
 export default (props) => {
-  const {onClick}=props
+  const {onClick,goMap}=props
   return (
-  <View className='machineryCard' onClick={onClick}>
+  <View className='machineryCard'>
     <Jianbian status='1' />
-    <Image src={banner1} mode='aspectFill' />
-    <View className='machineryName'>收割机001--S01</View>
+    <Image src={banner1} mode='aspectFill' onClick={onClick} />
+    <View className='info'>
+      <View className='machineryName' onClick={onClick} >收割机001--S01</View>
+      <View className='goMap' onClick={goMap}>进入地图 {">"}{">"}</View>
+    </View>    
   </View>
   )
 }

src/pages/machineryList/Card/style.less

@@ -1,5 +1,4 @@
 .machineryCard{
-  height: 594px;
   background: #FFF;
   box-shadow: 0px 0px 44px 0px rgba(0, 0, 0, 0.08);
   border-radius: 40px;
@@ -10,10 +9,19 @@
     height: calc(calc(100vw - 60px) * 0.66);
     width: 100%;
   }
-  .machineryName{
-    font-size: 36px;
+  .info{
     font-weight: bold;
-    color: #222222;
-    margin: 39px 0 0 28px;
+    display: flex;
+    align-items: center;
+    margin: 39px 0 60px 28px;
+    .machineryName{
+      font-size: 36px;
+      color: #222222;
+    }
+    .goMap{
+      position: absolute;
+      right: 28px;
+      color: #666666;
+    }
   }
 }

src/pages/machineryList/index.jsx

@@ -6,9 +6,12 @@ import MachineryCard from './Card'
 import './style.less'
 
 export default withLayout((props) => {
-  const goMap=()=>{
+  const goDetail=()=>{
     Taro.navigateTo({ url: '/pages/machineryDetail/index' });
   }
+  const goMap=()=>{
+    Taro.navigateTo({ url: '/pages/machineryMap/index' });
+  }
   return (
     <View className='page-index'>
       <View className='index-navbar'>
@@ -16,7 +19,7 @@ export default withLayout((props) => {
       </View>
       <View className='index-container machineryListContent'>
         <ScrollView scrollY style={{ height: '100%' }}>
-          <MachineryCard onClick={()=>goMap()} />
+          <MachineryCard onClick={()=>goDetail()}  goMap={()=>goMap()} />
           <MachineryCard />
           <MachineryCard />
         </ScrollView>

src/pages/machineryMap/index.jsx

@@ -1,6 +1,6 @@
 import Taro from "@tarojs/taro"
 import { useState } from "react"
-import { View, Map,Image } from "@tarojs/components"
+import { View, Map, Image } from "@tarojs/components"
 import withLayout from '@/layouts'
 import CustomNav from "@/components/CustomNav"
 import m1 from '@/assets/machinery/greenMachinery.png'
@@ -9,60 +9,64 @@ import picon from '@/assets/comm/position.png'
 import './style.less'
 
 export default withLayout((props) => {
-  const [show,setShow]=useState(false)
-  const markers=[
+  const [show, setShow] = useState(false)
+  const markers = [
     {
-      id:1,
-      longitude:112.105348,
-      latitude:32.697352,
-      iconPath:m1,
-      width:50,
-      height:50
+      id: 1,
+      longitude: 112.105348,
+      latitude: 32.697352,
+      iconPath: m1,
+      width: 50,
+      height: 50
     },
     {
-      id:2,
-      longitude:112.120295,
-      latitude:32.686656,
-      iconPath:m2,      
-      width:50,
-      height:50
+      id: 2,
+      longitude: 112.120295,
+      latitude: 32.686656,
+      iconPath: m2,
+      width: 50,
+      height: 50
     }
   ]
-  const handleClick=(e)=>{
+  const handleClick = (e) => {
     console.log(e.markerId)
     setShow(true)
   }
-  const goDetail=()=>{
+  const goDetail = () => {
     Taro.navigateTo({ url: '/pages/machineryDetail/index' });
   }
+  const goList=()=>{
+    Taro.navigateTo({ url: '/pages/machineryList/index' });
+  }
   return (
     <View className='page-index'>
       <View className='index-navbar'>
         <CustomNav title='我的农机' />
       </View>
       <View className='index-container machineryMap'>
-        <Map 
-          longitude={112.116846} 
-          latitude={32.688935} 
-          markers={markers} 
-          className='map' 
+        <Map
+          longitude={112.116846}
+          latitude={32.688935}
+          markers={markers}
+          className='map'
           onMarkerTap={handleClick}
-          onRegionChange={()=>setShow(false)}
+          onRegionChange={() => setShow(false)}
         />
         {
-          show&&
+          show &&
           <View className='showModel'>
-          <View className='title'>
-            <View className='name'>收割机001--S001</View>
-            <View className='action' onClick={goDetail}>详情 {">"}{">"}</View>
-          </View>
-          <View className='position'>
-            <Image src={picon} className='picon' />
-            当前位置：&nbsp;&nbsp;邓州市陈楼
+            <View className='goList' onClick={goList}>{'<'}{'<'} 农机列表</View>
+            <View className='title'>
+              <View className='name'>收割机001--S001</View>
+              <View className='action' onClick={goDetail}>详情 {">"}{">"}</View>
+            </View>
+            <View className='position'>
+              <Image src={picon} className='picon' />
+              当前位置：&nbsp;&nbsp;邓州市陈楼
+            </View>
           </View>
-        </View>
         }
-        
+
       </View>
     </View>
   )

src/pages/machineryMap/style.less

@@ -15,10 +15,13 @@
     font-weight: bold;
     font-size: 30px;
     color: #222222;
+    .goList{
+      color: #666666;
+    }
     .title{
       display: flex;
       align-items: center;
-      margin-bottom: 40px;
+      margin:60px 0 40px;
       .name{
         font-size: 36px;
       }

src/utils/index.js

@@ -56,23 +56,3 @@ export function random(prefix) {
   return prefix ? `${prefix}-${s}` : s
 }
 
-/**
- * 压缩图片
- * @param {*} url 
- * @returns 
- */
-export function compressImage(url, typ) {
-  if (!url) return url;
-
-  // GIF 不压缩
-  if (url.indexOf('.gif') > -1) return url;
-
-  const style = typ || 'cmp80'
-
-  // eslint-disable-next-line no-undef
-  if (url.indexOf(OSS) > -1) {
-    return `${url}?x-oss-process=style/${style}`.replace('http://', 'https://')
-  }
-
-  return url;
-}

src/utils/request.js

@@ -0,0 +1,126 @@
+
+import Taro from '@tarojs/taro'
+import { getQueryString } from '.'
+
+const logger = Taro.getRealtimeLogManager()
+
+export default (url, options) => {
+  const { params, skipError, header, ...leftOptions } = options || {}
+  const queryStr = getQueryString(params)
+
+  const urlWithParams = queryStr ? `${url}?${queryStr}` : url;
+  const nwUrl = `${HOST}/api/wx${urlWithParams}`
+
+  const authToken = Taro.getStorageSync('token')
+  const tokenHeader = authToken ? { 'X-Authorization-JWT': authToken } : {}
+  const nwHeader = {
+    ...(header || {}),
+    ...tokenHeader,
+  }
+
+  return new Promise((resolve, reject) => {
+    Taro.request({
+      ...leftOptions,
+      url: nwUrl,
+      header: nwHeader,
+      success: (res) => {
+        const { code, message, data, token } = res.data
+
+        if (token || data?.token) {
+          Taro.setStorage({ key: 'token', data: token || data?.token })
+        }
+
+        if (code === 1000) {
+          resolve(data)
+
+        } else {
+          console.error(res)
+          logger.error(nwUrl)
+          logger.error(options)
+          logger.error(res)
+
+          if (!skipError) {
+            Taro.showToast({
+              title: message || '网络异常',
+              icon: 'none',
+            })
+          }
+          reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
+        }
+      },
+
+      fail: (err) => {
+        console.error(err)
+
+        logger.error('网络错误')
+        logger.error(nwUrl)
+        logger.error(options)
+        logger.error(err)
+
+        const message = err.message || err.errMsg || err
+
+        if (!skipError) {
+          Taro.showToast({
+            title: message,
+            icon: 'none',
+          })
+        }
+
+        reject(message)
+      }
+    })
+  })
+}
+
+
+export function uploadFile(filePath) {
+
+  const authToken = Taro.getStorageSync('token')
+  const tokenHeader = authToken ? { 'X-Authorization-JWT': authToken } : {}
+
+  return new Promise((resolve, reject) => {
+    Taro.uploadFile({
+      // eslint-disable-next-line no-undef
+      url: `${HOST}/api/wx/image`,
+      filePath,
+      name: 'file',
+      header: tokenHeader,
+      success: (res) => {
+        if (res.errMsg === 'uploadFile:ok') {
+          const { code, message, data, token } = JSON.parse(res.data)
+
+          if (token || data?.token) {
+            Taro.setStorage({ key: 'token', data: token || data?.token })
+          }
+
+          if (code === 1000) {
+            resolve(data)
+          } else {
+            console.error(res)
+
+            logger.error("上传文件失败")
+            logger.error(res)
+
+            reject(message?.indexOf('java') > -1 ? '系统内部错误' : message)
+          }
+        } else {
+          console.error(res)
+
+          logger.error("上传文件失败")
+          logger.error(res)
+
+          reject(res.errMsg)
+        }
+      },
+      fail: (err) => {
+        console.error(err)
+
+        logger.error("上传文件失败")
+        logger.error(err)
+
+        const message = err.message || err.errMsg || err
+        reject(message)
+      }
+    })
+  })
+}