From c2db28c97e8e5fcd1fa81d6a9887d69b61865184 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 16 十月 2023 08:48:14 +0800
Subject: [PATCH] 1
---
web_standard/.env.lingyang | 2 +-
minipro_standard/util/request/index.js | 1 -
platform_web/src/components/common/CommonHeader.vue | 5 +++--
platform_web/src/views/login.vue | 2 +-
minipro_standard/common/config.js | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/minipro_standard/common/config.js b/minipro_standard/common/config.js
index c1b5459..f20be30 100644
--- a/minipro_standard/common/config.js
+++ b/minipro_standard/common/config.js
@@ -2,7 +2,7 @@
// baseUrl: 'http://106.14.20.42/test_hfznzz/',
// baseUrl: 'https://hefei.dtkey.cn/test_hfznzz/',
// baseUrl: 'http://192.168.0.18:10021',
- baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
+ baseUrl: 'https://www.mes.red/doumeeplant',
phoneRegular: /^1[3456789]\d{9}$/,
mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
positiveInteger: /^[0-9]*[1-9][0-9]*$/,
diff --git a/minipro_standard/util/request/index.js b/minipro_standard/util/request/index.js
index 7bf64c8..4410eb2 100644
--- a/minipro_standard/util/request/index.js
+++ b/minipro_standard/util/request/index.js
@@ -1,6 +1,5 @@
// 寮曞叆閰嶇疆
import { baseUrl } from '@/common/config'
-console.log(baseUrl);
// 鍒濆鍖栬姹傞厤缃�
uni.$u.http.setConfig((defaultConfig) => {
/* defaultConfig 涓洪粯璁ゅ叏灞�閰嶇疆 */
diff --git a/platform_web/src/components/common/CommonHeader.vue b/platform_web/src/components/common/CommonHeader.vue
index 647b628..37f8e15 100644
--- a/platform_web/src/components/common/CommonHeader.vue
+++ b/platform_web/src/components/common/CommonHeader.vue
@@ -149,10 +149,11 @@
logout()
.then(() => {
this.setUserInfo(null)
- this.$router.push({ name: 'login' })
+ // this.$router.push({ path: '/login' })
+ window.location.reload()
})
.catch(e => {
- this.$tip.apiFailed(e)
+ this.$tips.apiFailed(e)
})
}
}
diff --git a/platform_web/src/views/login.vue b/platform_web/src/views/login.vue
index ef2708b..3729f58 100644
--- a/platform_web/src/views/login.vue
+++ b/platform_web/src/views/login.vue
@@ -80,7 +80,7 @@
uuid: this.captcha.uuid
})
.then(() => {
- console.log(process.env.VUE_APP_CONTEXT_PATH);
+ // console.log(process.env.VUE_APP_CONTEXT_PATH);
// b7121c39-e109-472f-bb89-722b91289437
// window.location.href = process.env.VUE_APP_CONTEXT_PATH
window.location.reload()
diff --git a/web_standard/.env.lingyang b/web_standard/.env.lingyang
index 51b6755..3243928 100644
--- a/web_standard/.env.lingyang
+++ b/web_standard/.env.lingyang
@@ -13,4 +13,4 @@
# 鎺ュ彛鍓嶇紑
VUE_APP_API_PREFIX = '/doumeeplant/'
-VITE_BASE_URL = 'https://127.0.0.1/doumeeplant'
+VUE_APP_BASE_URL = 'https://127.0.0.1/doumeeplant'
--
Gitblit v1.9.3