ljj 6 лет назад
Родитель
Сommit
2d218d7af1
2 измененных файлов с 23 добавлено и 2 удалено
  1. 6 1
      component/common/event-bus.js
  2. 17 1
      js/api/http-request.js

+ 6 - 1
component/common/event-bus.js

@ -1,2 +1,7 @@
var EventBus = new Vue()
var GlobalEventBus = new Vue()
var GlobalEventBus = new Vue()
if(!top.GlobalEventBus) {
	top.GlobalEventBus = GlobalEventBus
}
GlobalEventBus = top.GlobalEventBus

+ 17 - 1
js/api/http-request.js

@ -1,20 +1,26 @@
(function(exports) {
	var publish_version = true;
	var server;
	var getServer;
	var agentName = "useragent"
	var userInfo = "userInfoForPay"
	var isNeedLogin = false
	var openServer,alertUrl;
	var asstoken = sessionStorage.getItem("asstoken") 
	if(publish_version) { // 生产环境配置
		server = "http://jksr.srswjw.gov.cn:1235";
		alertUrl="http://jksr.srswjw.gov.cn:1235/bigScreenShow";
		 getServer=server +'/gateway/pack-analyzer'
	} else { // 测试环境配置
		server = "http://172.19.103.70:1235"; // 测试环境
		server = "http://192.168.131.121:10220/"; // 测试环境
		getServer=server // 如果是测试环境的话也需要加网关
		alertUrl="http://172.19.103.70:1235/bigScreenShow";
//		server = "http://192.168.131.104:9088"; // 测试环境 周杰
//		 server = "http://192.168.131.105:9088"; // 测试环境 兴旺
	}
	//保存userAgent
	function saveUserAgent(obj) {
	    if(window.localStorage.getItem(agentName)){
@ -30,7 +36,8 @@
	}
	function httpGet(url, options, judge) {
		var setService = judge ? openServer : server
		var setService = judge ? openServer : server;
		setService =options.getServer?getServer:setService;
		//发送ajax请求
		return new Promise(function(resolve, reject) {
			$.ajax(setService + url,
@ -40,8 +47,14 @@
					beforeSend: function(request) {
						var userAgent = window.localStorage.getItem(agentName);
						request.setRequestHeader(agentName, userAgent);
						if(asstoken) {
                            request.setRequestHeader("token", asstoken);
                        }
					},
					error: function(res) {
						debugger
						top.toastr.error("网络错误无法请求")
						reject(res)
					},
@ -74,6 +87,9 @@
					beforeSend: function(request) {
						var userAgent = window.localStorage.getItem(agentName);
						request.setRequestHeader(agentName, userAgent);
						if(asstoken) {
                            request.setRequestHeader("token", asstoken);
                        }
					},
					error: function(res) {
						reject(res)