vue2-client 1.2.84 → 1.2.85

package/src/utils/map-utils.js

@@ -1,31 +1,31 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap () {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode:'275e59edb26ab1f917cfe7f05bea7979'
-    }
-    Amap = await AMapLoader.load({
-      key: '55a4807a6fc3adca5510f69578b1ae4a', // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '1.4.2', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.ToolBar', 'AMap.Geolocation', 'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.Autocomplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-    })
-  }
-  return Amap
-}
-async function GetLocation (address) {
-  return new Promise(async (resolve, reject) => {
-    new (await GetGDMap()).Geocoder({
-      radius: 500 // 范围，默认：500
-    }).getLocation(address, function (status, result) {
-      console.log(result)
-      if (status === 'complete' && result.geocodes.length) {
-        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-      } else {
-        // eslint-disable-next-line prefer-promise-reject-errors
-        reject('根据经纬度查询地址失败')
-      }
-    })
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap () {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode:'275e59edb26ab1f917cfe7f05bea7979'
+    }
+    Amap = await AMapLoader.load({
+      key: '55a4807a6fc3adca5510f69578b1ae4a', // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '1.4.2', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.ToolBar', 'AMap.Geolocation', 'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.Autocomplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+    })
+  }
+  return Amap
+}
+async function GetLocation (address) {
+  return new Promise(async (resolve, reject) => {
+    new (await GetGDMap()).Geocoder({
+      radius: 500 // 范围，默认：500
+    }).getLocation(address, function (status, result) {
+      console.log(result)
+      if (status === 'complete' && result.geocodes.length) {
+        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+      } else {
+        // eslint-disable-next-line prefer-promise-reject-errors
+        reject('根据经纬度查询地址失败')
+      }
+    })
+  })
+}
+export { GetGDMap, GetLocation }

package/src/utils/request.js

@@ -171,7 +171,16 @@ function loadInterceptors () {
   }, errorHandler)
   // 加载响应拦截器
   axios.interceptors.response.use((response) => {
-    return response.data
+    // 判断是否为V4环境
+    if (setting.compatible === 'V4') {
+      if (response.data.data) {
+        return response.data.data
+      } else {
+        return response.data
+      }
+    } else {
+      return response.data
+    }
   }, errorHandler)
 }
 
@@ -181,12 +190,12 @@ const errorHandler = (error) => {
     const data = error.response.data
     // 从 localstorage 获取 token
     const token = localStorage.getItem(ACCESS_TOKEN)
-    if (error.response.status === 403) {
+    if (error.response.status === 403 || data.code === 403) {
       notification.error({
         message: '禁止访问',
         description: data
       })
-    } else if (error.response.status === 401 && !(data.result && data.result.isLogin)) {
+    } else if ((error.response.status === 401 || data.code === 401) && !(data.result && data.result.isLogin)) {
       notification.error({
         message: '鉴权失败',
         description: data
@@ -198,7 +207,7 @@ const errorHandler = (error) => {
           }, 1500)
         })
       }
-    } else if (error.response.status === 500) {
+    } else if (error.response.status === 500 || data.code === 500) {
       notification.error({
         message: '系统异常',
         description: data