From 05085e8e3e537d6cc35d677431086afd747b4eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 19 Aug 2025 13:47:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AF=B7=E6=B1=82=20baseurl=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 5 ++++- src/api/request.js | 14 ++++++++------ src/pages/course/components/talkingItem.vue | 3 +++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.env.development b/.env.development index 3db678a9..14247ed1 100644 --- a/.env.development +++ b/.env.development @@ -20,4 +20,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # 任东 # VITE_APP_BASE_H5_API_Url = 'http://25.64.16.130:9602' # 线上 -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' \ No newline at end of file +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' + +# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.18.122.65:7001' +VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' diff --git a/src/api/request.js b/src/api/request.js index 5fd6a9cb..e8373f95 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -5,16 +5,16 @@ import common from '@/common/common.js' const ENV = import.meta.env -export const get_base_url = url => { +export const get_base_url = (url = '') => { if (ENV.MODE === 'development') { // 开发环境 // H5必须用非https,手机端必须用https // #ifdef H5 - return ENV.VITE_APP_BASE_H5_API_Url || ENV.VITE_APP_BASE_API_Url - const baseUrl = ENV.VITE_APP_BASE_API_Url - if (baseUrl.startsWith('https')) { - return baseUrl.replace('https', 'http') + if (url) { + let _str = (url.split('/')[0] || url.split('/')[1])?.toUpperCase() + return ENV[`VITE_APP_BASE_H5_API_Url_${_str}`] || ENV.VITE_APP_BASE_H5_API_Url || ENV.VITE_APP_BASE_API_Url + } else { + return ENV.VITE_APP_BASE_H5_API_Url || ENV.VITE_APP_BASE_API_Url } - return baseUrl // #endif // #ifdef APP-PLUS return ENV.VITE_APP_BASE_API_Url @@ -80,6 +80,8 @@ export default function request({ headers_base['summary'] = token // 让每个请求携带令牌 } let that = this + + return new Promise((resolve, reject) => { uni.request({ url: `${baseUrl || base_url}${url}`, diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index a4759eb1..737e9149 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -32,6 +32,9 @@ + + 举例:{{ dataInfo.knoExampie }} +