Forráskód Böngészése

修复15号上线测试bug

lulihong 6 éve
szülő
commit
cfb2474d88

+ 1 - 1
html/informationSearch/js/waitingDoctorList.js

@ -87,7 +87,7 @@ var loading = dialog({
			//获取列表数据
			getList: function() {
				var vm = this
				sendPost("patient/diag/waitVisit", {
				sendPost("patient/diag/it", {
					cardNo: vm.data.cardNo
				}, "json", "get", function() {
					loading.close();

+ 16 - 9
html/profile/html/index_0.html

@ -41,7 +41,20 @@
		checkUserAgent();
	} else {
		idCard = queryParam.demographic_id
		redirect()	
		getReqPromises([
			{
				url: profileServer+'/gateway/authentication/oauth/login',
				data: {client_id:'P7dIRS0FvX', username: 'tourists', password: 'tourists123'},
				reqType: 'post'
			}
		]).then(function(ress) {
			var res0 = ress[0];
			accessToken = res0.accessToken
			redirect()
		}).catch(function(e) {
			console && console.error(e) 
		})
		
	}
	
	function redirect() {
@ -51,13 +64,9 @@
			filter: "org_code%3D49229004X"
		}))
		redirectUrl = profileServer+'/gateway/authentication/oauth/sso?response_type=token&client_id=P7dIRS0FvX&state='
						+state+'&scope=read&redirect_uri='+profileServer+'/profile/app/mprofile/html/signin.html?idCardNo='+idCard+'&token='+accessToken
						+state+'&scope=read&redirect_uri=http://jksr.srswjw.gov.cn:1235/profile/app/mprofile/html/signin.html?idCardNo='+idCard+'&token='+accessToken
		
		if(target == "wx") {
			location.replace(redirectUrl)
		} else {
			location.href = redirectUrl
		}
		location.replace(redirectUrl)
		
	}
	
@ -76,9 +85,7 @@
			}
		]).then(function(ress) {
			var res0 = ress[0], res1 = ress[1]
			
			accessToken = res0.accessToken
			
			if(res1.status == 200) {
				idCard = res1.data && res1.data.idcardAll
				redirect()

+ 15 - 7
html/profile/html/index_1.html

@ -41,7 +41,19 @@
		checkUserAgent();
	} else {
		idCard = queryParam.demographic_id
		redirect()	
		getReqPromises([
			{
				url: profileServer+'/gateway/authentication/oauth/login',
				data: {client_id:'P7dIRS0FvX', username: 'tourists', password: 'tourists123'},
				reqType: 'post'
			}
		]).then(function(ress) {
			var res0 = ress[0];
			accessToken = res0.accessToken
			redirect()
		}).catch(function(e) {
			console && console.error(e) 
		})
	}
	
	function redirect() {
@ -51,13 +63,9 @@
			filter: "org_code%3D49229004X"
		}))
		redirectUrl = profileServer+'/gateway/authentication/oauth/sso?response_type=token&client_id=P7dIRS0FvX&state='
						+state+'&scope=read&redirect_uri='+profileServer+'/profile/app/mprofile/html/signin.html?idCardNo='+idCard+'&token='+accessToken
						+state+'&scope=read&redirect_uri=http://jksr.srswjw.gov.cn:1235/profile/app/mprofile/html/signin.html?idCardNo='+idCard+'&token='+accessToken
		
		if(target == "wx") {
			location.replace(redirectUrl)
		} else {
			location.href = redirectUrl
		}
		location.replace(redirectUrl)
	}
	
	function queryInit(){

+ 15 - 7
html/profile/html/index_2.html

@ -41,7 +41,19 @@
		checkUserAgent();
	} else {
		idCard = queryParam.demographic_id
		redirect()	
		getReqPromises([
			{
				url: profileServer+'/gateway/authentication/oauth/login',
				data: {client_id:'P7dIRS0FvX', username: 'tourists', password: 'tourists123'},
				reqType: 'post'
			}
		]).then(function(ress) {
			var res0 = ress[0];
			accessToken = res0.accessToken
			redirect()
		}).catch(function(e) {
			console && console.error(e) 
		})
	}
	
	function redirect() {
@ -51,13 +63,9 @@
			filter: "org_code%3D49229004X"
		}))
		redirectUrl = profileServer+'/gateway/authentication/oauth/sso?response_type=token&client_id=P7dIRS0FvX&state='
						+state+'&scope=read&redirect_uri='+profileServer+'/profile/app/mprofile/html/signin.html?idCardNo='+idCard+'&token='+accessToken
						+state+'&scope=read&redirect_uri=http://jksr.srswjw.gov.cn:1235/profile/app/mprofile/html/signin.html?idCardNo='+idCard+'&token='+accessToken
		
		if(target == "wx") {
			location.replace(redirectUrl)
		} else {
			location.href = redirectUrl
		}
		location.replace(redirectUrl)
	}
	
	function queryInit(){

+ 4 - 4
js/weixin_common.js

@ -1,6 +1,6 @@
//切换发布版本 true:正式版,连接生产环境;false:测试版,连接测试环境。
//var publish_version = true;
var publish_version = false;
var publish_version = true;
if(publish_version){
	//正式环境(城市i健康)
   var server = "http://srijk.yihu.com/wlyy/";
@ -13,9 +13,9 @@ if(publish_version){
    var judgeAgent = "judgeAgent";
    var pageName = "pageurl";
    var wxurl = "http%3a%2f%2fwww.srijk.com%2fwlyy%2fwx%2fhtml";
    var imurl="http://58.22.123.195:3000";
    var imurl="http://27.154.233.186:3030";
    var imgUrlDomain = 'http://srijk.yihu.com/';
    var profileServer = "http://jksr.srswjw.gov.cn:1235"; // 健康档案(上饶)服务地址
    var profileServer = "http://srijk.yihu.com"; // 健康档案(上饶)服务地址
    var registrationServer = "https://wxauth.yihu.com";// 预约挂号服务地址
    var yuYueAppId = "9000424";//预约挂号-应用ID
    var hospitalId = "1025056";//预约挂号-上饶县人民医院的id
@ -25,7 +25,7 @@ if(publish_version){
//	var server = "http://172.19.103.72:9096/wlyy/";
//	var server = "http://192.168.131.24:8082/";//仕杰
//	var server = "http://192.168.131.102:8081/";//伟达
//	var server = "http://192.168.131.127:8070/";//逸祥
//	var server = "http://192.168.131.127:8081/";//逸祥
//	var server = "http://192.168.131.133:8080/";//文杰
 	//var server = "http://192.168.131.250:8081/"; 
    //var server = "http://192.168.131.131:8080/"; //文斌