From 1e9c7a02ec2b8caf7dda6000d7f0f79849df6b45 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期四, 09 五月 2024 14:15:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/main.js b/src/main.js
index a66b6be..e0e4031 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,11 +11,21 @@
import api from './assets/api/controller.js'
import swal from 'sweetalert'
-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.11.200:8001';//鏉�
+// const javaApi = 'http://192.168.11.249:8001';//寮�
+const javaApi = 'http://172.20.10.3:8001';//濮�
+// const javaApi = 'http://192.168.11.2:8001';//鏌�
+// const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
+//鑳滀簯鏈嶅姟鍣�
+// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
+// const javaApi = 'http://122.114.52.69:8001';
+
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
}
+Vue.prototype.javaApi = javaApi
Vue.use(VueAxios, axios)
Vue.config.productionTip = false
@@ -56,6 +66,9 @@
})
axios.interceptors.response.use(res => {
+ if(res.data.code === 201){
+ Message.error(res.data.message)
+ }
return res.data
}, async function(err) {
if (JSON.stringify(err).indexOf('timeout of') > -1) {
@@ -80,7 +93,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)
@@ -94,6 +109,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) {
@@ -108,5 +127,9 @@
new Vue({
el: '#app',
router,
- render: h => h(App)
+ render: h => h(App),
+ beforeCreate() {
+ // 闇�瑕佸湪鍏ㄥ眬娣诲姞涓�涓睘鎬�
+ Vue.prototype.$bus = this
+ }
});
--
Gitblit v1.9.3