功能变化: 修改baseUrl函数

web/src/settings.ts

@@ -12,6 +12,7 @@ import { FsExtendsEditor,FsExtendsUploader } from '@fast-crud/fast-extends';
 import '@fast-crud/fast-extends/dist/style.css';
 import { successMessage, successNotification } from '/@/utils/message';
 import XEUtils from "xe-utils";
+import {commonCrudConfig} from "/@/utils/commonCrud";
 export default {
 	async install(app: any, options: any) {
 		// 先安装ui
@@ -22,10 +23,8 @@ export default {
 			// 此处配置公共的dictRequest（字典请求）
 			async dictRequest({ dict }: any) {
 				const {isTree} = dict
-				console.log(222222,isTree)
 				//根据dict的url，异步返回一个字典数组
 				return await request({ url: dict.url, params: dict.params || {} }).then((res:any)=>{
-					console.log(XEUtils.toArrayTree(res.data,{parentKey:'parent'}))
 					if(isTree){
 						return XEUtils.toArrayTree(res.data,{parentKey:'parent'})
 					}

web/src/utils/baseUrl.ts

@@ -3,9 +3,9 @@ import { pluginsAll } from '/@/views/plugins/index';
 /**
  * @description 校验是否为租户模式。租户模式把域名替换成 域名 加端口
  */
-export const getBaseURL = function () {
+export const getBaseURL = function (url:string) {
-	var baseURL = import.meta.env.VITE_API_URL as any;
+	let baseURL = import.meta.env.VITE_API_URL as any;
-	var param = baseURL.split('/')[3] || '';
+	let param = baseURL.split('/')[3] || '';
 	// @ts-ignore
 	if (pluginsAll && pluginsAll.indexOf('dvadmin3-tenants-web') !== -1 && (!param || baseURL.startsWith('/'))) {
 		// 1.把127.0.0.1 替换成和前端一样域名
@@ -26,6 +26,16 @@ export const getBaseURL = function () {
 			baseURL = location.protocol + '//' + location.hostname + (location.port ? ':' : '') + location.port + baseURL;
 		}
 	}
+	if(url){
+		const regex = /^(http|https):\/\//;
+		if(regex.test(url)){
+			return url
+		}else{
+			if(url.startsWith('/')){
+				return baseURL + url;
+			}
+		}
+	}
 	if (!baseURL.endsWith('/')) {
 		baseURL += '/';
 	}

web/src/views/system/login/index.vue

@@ -48,9 +48,9 @@
 				|
 				<a :href="getSystemConfig['login.help_url']?getSystemConfig['login.help_url']:'https://django-vue-admin.com'" target="_blank">帮助</a>
 				|
-				<a :href="getSystemConfig['login.privacy_url']?getSystemConfig['login.privacy_url']:'#'">隐私</a>
+				<a :href="getSystemConfig['login.privacy_url']?getBaseURL(getSystemConfig['login.privacy_url']):'#'">隐私</a>
 				|
-				<a :href="getSystemConfig['login.clause_url']?getSystemConfig['login.clause_url']:'#'">条款</a>
+				<a :href="getSystemConfig['login.clause_url']?getBaseURL(getSystemConfig['login.clause_url']):'#'">条款</a>
 			</p>
 		</div>
 	</div>
@@ -65,6 +65,7 @@ import logoMini from '/@/assets/logo-mini.svg';
 import loginMain from '/@/assets/login-main.svg';
 import loginBg from '/@/assets/login-bg.svg';
 import {SystemConfigStore} from '/@/stores/systemConfig'
+import {getBaseURL} from "/@/utils/baseUrl";
 // 引入组件
 const Account = defineAsyncComponent(() => import('/@/views/system/login/component/account.vue'));
 const Mobile = defineAsyncComponent(() => import('/@/views/system/login/component/mobile.vue'));