From 4ff3eee77b41466d08117970970d01be6e48ffe1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 28 Mar 2025 19:02:30 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/pilot-h5
---
src/api/http/request.ts | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/api/http/request.ts b/src/api/http/request.ts
index 6488409..153b0a9 100644
--- a/src/api/http/request.ts
+++ b/src/api/http/request.ts
@@ -11,7 +11,7 @@
import router from '@/router';
import { serialize } from '@/utils/common'
import { getToken } from '@/utils/auth';
-import { ElMessage } from 'element-plus';
+import { showNotify } from 'vant';
import website from '@/config/website';
import { Base64 } from 'js-base64'
// import NProgress from 'nprogress';
@@ -67,10 +67,8 @@
url: string
authorization: boolean
}) => {
- if(config.url.includes('h5')) {
- config.url = '/drone-h5' + config.url
- } else if (!config.url.includes('/blade-') && !config.url.includes('https://') && !config.url.includes('http://')) {
- config.url = '/drone-yw' + config.url
+ if (!config.url.includes('/blade-') && !config.url.includes('https://') && !config.url.includes('http://')) {
+ config.url = '/drone-device-core' + config.url
}
const authorization = config.authorization === false
if (!authorization) {
@@ -81,6 +79,9 @@
const isToken = meta.isToken === false
if (getToken() && !isToken) {
config.headers[website.tokenHeader] = 'bearer ' + getToken()
+ } else {
+ // 为了兼容分享页面
+ config.headers[website.tokenHeader] = 'bearer ' + getAuthToken()
}
if (meta.noCookie) {
delete config.headers.cookie
@@ -126,7 +127,7 @@
return Promise.reject(new Error(message))
}
if (message === '缺失令牌,鉴权失败') {
- ElMessage.warning('登录信息已过期，请重新登录')
+ showNotify({ type: 'warning', message: '登录信息已过期，请重新登录' })
}
if (
![
@@ -138,7 +139,7 @@
'缺失令牌,鉴权失败',
].includes(message)
) {
- ElMessage.warning(message)
+ showNotify({ type: 'warning', message: message })
}
return Promise.reject(new Error(message))
}
@@ -162,16 +163,16 @@
description = err.response.data.result.message
}
if (!err.response || !err.response.status) {
- ElMessage.error('网络异常，请检查后端服务后重试')
+ showNotify({ type: 'danger', message: '网络异常，请检查后端服务后重试' })
return
}
if (err.response?.status !== 200) {
if (err.response.data?.msg) {
- ElMessage.error(err.response.data?.msg)
+ showNotify({ type: 'danger', message: err.response.data?.msg })
} else if (err.response.data?.error_description) {
- ElMessage.error(err.response.data?.error_description)
+ showNotify({ type: 'danger', message: err.response.data?.error_description })
} else {
- ElMessage.error(`错误码: ${err.response?.status}`)
+ showNotify({ type: 'danger', message: `错误码: ${err.response?.status}` })
}
}
if (err.response?.status == 401) {
--
Gitblit v1.9.3