From ff7e5f562a45f0d4e13fe8336ee8b290643b3ae4 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 20 五月 2024 18:18:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main.js b/src/main.js
index 72d3324..580b072 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,16 +14,14 @@
//鏈湴
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://192.168.11.50:8001';//濮�
+// const javaApi = 'http://10.20.102.168:8001';//寮�
+// const javaApi = 'http://172.20.10.3:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
-// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
+ 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';
-//浜戞湇鍔″櫒
-// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:39901";
-// const javaApi = 'http://114.132.189.42:9006';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
@@ -130,5 +128,9 @@
new Vue({
el: '#app',
router,
- render: h => h(App)
+ render: h => h(App),
+ beforeCreate() {
+ // 闇�瑕佸湪鍏ㄥ眬娣诲姞涓�涓睘鎬�
+ Vue.prototype.$bus = this
+ }
});
--
Gitblit v1.9.3