From 38e6f27a8082e1173e3c02a33da5da39b6c6872c Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期三, 31 七月 2024 13:33:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main.js | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main.js b/src/main.js
index e11ae3b..01126d7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,6 +10,9 @@
import axios from 'axios'
import api from './assets/api/controller.js'
import swal from 'sweetalert'
+import Big from 'big.js'
+
+Vue.prototype.$Big = Big;
// 椤圭洰鍒囨崲
Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
@@ -17,19 +20,20 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://192.168.0.104:8001';
+const javaApi = 'http://192.168.92.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
// const javaApi = 'http://114.132.189.42:1234';
-//妫�娴嬩腑蹇冩寮忓簱
-Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
-const javaApi = 'http://10.1.200.86:8001';
+// //妫�娴嬩腑蹇冩寮忓簱
+// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
+// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
// const javaApi = 'http://10.16.173.59:8001';
+// const javaApi = 'http://192.168.92.249:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
@@ -38,6 +42,7 @@
Vue.use(VueAxios, axios)
Vue.config.productionTip = false
+Vue.config.performance = true;
Vue.use(VueRouter);
Vue.use(ElementUI);
Vue.use(qs);
@@ -63,10 +68,10 @@
// config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
// config.headers['Content-Type'] = 'application/json'
}
- if (config.method === 'post' || config.method === 'put') {
+ if ((config.method === 'post' || config.method === 'put')&&!config.noQs) {
config.data = qs.stringify(config.data)
}
- if (config.headers['Content-Type'] == 'application/json') {
+ if (config.headers['Content-Type'] == 'application/json'&&!config.noQs) {
config.data = qs.parse(config.data)
}
return config
@@ -146,3 +151,4 @@
Vue.prototype.$bus = this
}
});
+
--
Gitblit v1.9.3