王贵旺 4 gadi atpakaļ
vecāks
revīzija
ffac7d032e
6 mainītis faili ar 24 papildinājumiem un 12 dzēšanām
  1. 1 0
      .env
  2. 1 0
      .env.dev
  3. 1 0
      .env.prod
  4. 1 0
      .env.test
  5. 13 12
      src/views/home/index.vue
  6. 7 0
      vue.config.js

+ 1 - 0
.env

@@ -1,4 +1,5 @@
 VUE_APP_BASE_URL=/api
+VUE_APP_BAIDU_URL=/baiduapi
 VUE_APP_FILE_URL=https://dwx.auyen.com/
 VUE_APP_BASE_URL_T=/t
 VUE_APP_WEBSS_URL=wss://dwx.auyen.com/

+ 1 - 0
.env.dev

@@ -1,4 +1,5 @@
 NODE_ENV=dev
 VUE_APP_BASE_URL=https://dapi.auyen.com/
+VUE_APP_BAIDU_URL=https://api.map.baidu.com/reverse_geocoding/v3/
 VUE_APP_FILE_URL=https://dwx.auyen.com/
 VUE_APP_WEBSS_URL=wss://dwx.auyen.com/

+ 1 - 0
.env.prod

@@ -1,4 +1,5 @@
 NODE_ENV=prod
 VUE_APP_BASE_URL=https://api.auyen.com/
+VUE_APP_BAIDU_URL=https://api.map.baidu.com/reverse_geocoding/v3/
 VUE_APP_FILE_URL=https://wx.auyen.com/
 VUE_APP_WEBSS_URL=wss://wx.auyen.com/

+ 1 - 0
.env.test

@@ -1,4 +1,5 @@
 .NODE_ENV=dev-test
 VUE_APP_BASE_URL=https://tapi.auyen.com/
+VUE_APP_BAIDU_URL=https://api.map.baidu.com/reverse_geocoding/v3/
 VUE_APP_FILE_URL=https://twx.auyen.com/
 VUE_APP_WEBSS_URL=wss://twx.auyen.com/

+ 13 - 12
src/views/home/index.vue

@@ -32,9 +32,9 @@
         <div class="item-info">
           <div class="label item-info__user" style="padding-left: 0" v-if="item.truckDriverList.length > 0">
             <div class="driver-wrap">
-              <div v-for="(driver, driverIndex) in item.truckDriverList" :key="driverIndex" class="driver-list">{{ driver.tmpDriverName || '-' }}</div>
+              <div v-for="(driver, driverIndex) in item.truckDriverList" :key="driverIndex" class="driver-list">{{ truckToDriverUser(driver) }}</div>
             </div>
-            <div>{{ item.truckDriverList[0].tmpDriverMobile || '-' }}</div>
+            <div>{{ truckToDriverMobile(item.truckDriverList[0].driverName) }}</div>
           </div>
           <div class="label speed">
             <span>{{ item.speed || '-' }}</span>公里/小时
@@ -114,6 +114,7 @@ export default {
   watch: {},
   computed: {},
   created() {
+    this.queryCurrAddress(35.7127, 116.23228)
     this.dragendPointer()
     setInterval(() => {
       this.dragendPointer()
@@ -128,9 +129,7 @@ export default {
   },
   methods: {
     async queryCurrAddress(location) {
-      const url = 'https://api.map.baidu.com/reverse_geocoding/v3/'
-
-      const data = await axios.post(url + '?output=json&ak=Zvd6FzmertUwjhZih5Zfq0D8uTUhvqsH&coordtype=wgs84ll&location=' + location).then(response => {
+      const data = await axios.post(process.env.VUE_APP_BAIDU_URL + '?output=json&ak=Zvd6FzmertUwjhZih5Zfq0D8uTUhvqsH&coordtype=wgs84ll&location=' + location).then(response => {
         return response.data
       })
 
@@ -180,14 +179,16 @@ export default {
     mapToListEvent() {
       this.showType = this.showType === 1 ? 2 : 1
     },
-    truckToDriverInfo(item, type = 'user') {
+    truckToDriverUser(driver) {
       // 解释司机个人信息
-      if (item.hasOwnProperty('truckDriverList') && item.truckDriverList.length > 0) {
-        item.truckDriverList.forEach(driver => {
-          const driverUserInfo = driver.driverName ? driver.driverName.split('/') : []
-          driver.tmpDriverName = driverUserInfo.length >= 1 ? driverUserInfo[0] : '-'
-          driver.tmpDriverMobile = driverUserInfo.length >= 2 ? driverUserInfo[1] : '-'
-        })
+      const driverUserInfo = driver.driverName ? driver.driverName.split('/') : []
+      return driverUserInfo.length >= 1 ? driverUserInfo[0] : '-'
+    },
+    truckToDriverMobile(info) {
+      if (info.indexOf('/') !== -1) {
+        const userinfo = info.split('/')
+
+        return userinfo[1] || '-'
       } else {
         return '-'
       }

+ 7 - 0
vue.config.js

@@ -28,6 +28,13 @@ module.exports = {
         pathRewrite: {
           '^/api': '/'
         }
+      },
+      '/baiduapi': {
+        target: 'https://api.map.baidu.com/reverse_geocoding/v3/',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/baiduapi': '/'
+        }
       }
     }
   },