From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 13 六月 2024 18:04:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main.js b/src/main.js
index c3c10c4..c48e4e1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,12 +11,20 @@
import api from './assets/api/controller.js'
import swal from 'sweetalert'
+// 椤圭洰鍒囨崲
+Vue.prototype.PROJECT = '妫�娴嬩腑蹇�' //椤圭洰鍚嶇О锛氭娴嬩腑蹇冦�佽澶囩數缂�
//鏈湴
-Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-const javaApi = 'http://localhost:8001';
+Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
+// const javaApi = 'http://192.168.144.200:8001';//鏉�
+// const javaApi = 'http://192.168.11.249:8001';//寮�
+// const javaApi = 'http://192.168.11.2:8001';//鏌�
+// const javaApi = 'http://127.0.0.1:8001';//鏅�
+const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
// const javaApi = 'http://122.114.52.69:8001';
+// const javaApi = 'http://10.1.200.86:8001';//姝ｅ紡鏈�
+
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
}
@@ -62,7 +70,11 @@
axios.interceptors.response.use(res => {
if(res.data.code === 201){
- Message.error(res.data.message)
+ Message({
+ type: 'error',
+ dangerouslyUseHTMLString: true,
+ message: `${res.data.message}`
+ })
}
return res.data
}, async function(err) {
@@ -88,7 +100,9 @@
if (res.data.code == 201) {
Message.error('璁よ瘉澶辫触锛岄渶瑕侀噸鏂扮櫥褰�')
localStorage.removeItem('autoenter')
- window.location.href = '/enter'
+ next({
+ path: '/enter'
+ })
return Promise.reject(err)
}
sessionStorage.setItem('token', res.data.token)
@@ -102,6 +116,10 @@
})
router.beforeEach((to, from, next) => {
+ if(to.path.indexOf('/test') == 0){
+ next()
+ return
+ }
if (to.path.indexOf('/enter') != 0) {
if (sessionStorage.getItem('token') == null || sessionStorage.getItem('token') == '' || sessionStorage.getItem(
'token') == undefined) {
@@ -116,5 +134,9 @@
new Vue({
el: '#app',
router,
- render: h => h(App)
+ render: h => h(App),
+ beforeCreate() {
+ // 闇�瑕佸湪鍏ㄥ眬娣诲姞涓�涓睘鎬�
+ Vue.prototype.$bus = this
+ }
});
--
Gitblit v1.9.3