Merge branch 'master' of http://192.168.1.220:10080/Amoy2/sr-iHealthwx

html/download/js/download.js

@@ -33,7 +33,7 @@ $(function(){
	        }
	        if (browser.versions.ios) {
	            //是否在IOS浏览器打开
	            window.location.href = "itms-services:///?action=download-manifest&url=https://www.xmtyw.cn/csijk_ios/ssgg_doctor.plist";
	            window.location.href = "https://itunes.apple.com/cn/app/%E5%9F%8E%E5%B8%82i%E5%81%A5%E5%BA%B7/id1397304923?mt=8&from=groupmessage";
//	           var content = "IOS版暂未开放，敬请期待！请下载使用Android版本！";
//	           dialog({
//	               content: content,

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();

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()

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(){

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(){

html/qygl/js/consulting-doctor.js

@@ -50,7 +50,7 @@ var request = GetRequest();
patientcode = request.patientcode;
var patientName = "";
var networkStatus = "";
var consulting = {
    //初始化页面
    getInfo: function(){
@@ -95,7 +95,53 @@ var consulting = {
//      var userAgent1 = JSON.parse(window.localStorage.getItem(agentName1));
//      patientName = userAgent1.name;
    },
    bindEvents: bindConsultEvents
    bindEvents: bindConsultEvents,
    getWeixinSign:function(){
    	//从后台那边获取签名等信息
	    var params = {};
	    var url1 = window.location.href;
	    params.pageUrl = url1;
	    $.ajax(server + "weixin/getSign", {
	        data: params,
	        dataType: "json",
	        type: "post",
	        success: function(res){
	            if (res.status == 200) {        
	                var t = res.data.timestamp;
	                var noncestr = res.data.noncestr;
	                var signature = res.data.signature;
	                wx.config({
	                    appId: appId, // 必填，公众号的唯一标识
	                    timestamp: t, // 必填，生成签名的时间戳
	                    nonceStr: noncestr, // 必填，生成签名的随机串
	                    signature: signature,// 必填，签名，见附录1
	                    jsApiList: [
	                        'chooseImage',
	                        'uploadImage',
	                        'startRecord',
	                        'stopRecord',
	                        'onVoiceRecordEnd',
	                        'playVoice',
	                        'pauseVoice',
	                        'stopVoice',
	                        'onVoicePlayEnd',
	                        'uploadVoice',
	                        'getNetworkType'
	                    ] // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
	                });
	                
	                // config信息验证后会执行ready方法，所有接口调用都必须在config接口获得结果之后，config是一个客户端的异步操作，所以如果需要在页面加载时就调用相关接口，则须把相关接口放在ready函数中调用来确保正确执行。对于用户触发时才调用的接口，则可以直接调用，不需要放在ready函数中。
	                wx.ready(function(){
	                    wx.getNetworkType({
	                        success: function (res) {
	                             networkStatus = res.networkType; // 返回网络类型2g，3g，4g，wifi
	                        }
	                    });
	                });
	            } 
	        }
	    });
    }
};
//请求回调处理
@@ -621,15 +667,17 @@ function viewImg(dom) {
//微信上传图片
function chooseImageWx(){
//  dd.showModal();
    wx.chooseImage({
        count: 1, //限制一次只能上传一张图片
        success: function (res) {
            for (var i in res.localIds) {
                images.push(res.localIds[i]);
            }
            uploadImage();
        }
    });
	wx.ready(function(){ 
	    wx.chooseImage({
	        count: 1, //限制一次只能上传一张图片
	        success: function (res) {
	            for (var i in res.localIds) {
	                images.push(res.localIds[i]);
	            }
	            uploadImage();
	        }
	    });
  })
}
function uploadImage(){
    dd.showModal();

html/qygl/js/sign_info.js

@@ -91,6 +91,7 @@ function getWxSign(){
}
function getFirstTabValue(){
	consulting.getWeixinSign();
    consulting.getInfo();
    consulting.bindEvents();
}

html/yszx/js/add-consult.js

@@ -139,13 +139,15 @@ function validate(data) {
}
function chooseImage(){
    wx.chooseImage({
        count: 9-getImages().length,
        success: function (res) {
            for (var i in res.localIds) {
                appendFile(res.localIds[i]);
            }        
        }
	wx.ready(function(){
	    wx.chooseImage({
	        count: 9-getImages().length,
	        success: function (res) {
	            for (var i in res.localIds) {
	                appendFile(res.localIds[i]);
	            }        
	        }
	    });
    });
}
function uploadImage(data){

html/yszx/js/consulting-doctor.js

@@ -778,16 +778,18 @@ function viewImg(dom) {
var serverId = "";
var images = [];
function chooseImageWx(){
	wx.chooseImage({
		count: 3,
        success: function (res) {
	        for (var i in res.localIds) {
	        	images.push(res.localIds[i]);
			} 
			dd.showModal();
			uploadImage();
        }
    });
	wx.ready(function(){ 
		wx.chooseImage({
			count: 3,
	        success: function (res) {
		        for (var i in res.localIds) {
		        	images.push(res.localIds[i]);
				} 
				dd.showModal();
				uploadImage();
	        }
	    });
  })
}
function uploadImage(){
	if (images.length == 0) {

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/"; //文斌