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

html/grzx/js/change-login.js

@@ -53,7 +53,7 @@ $(function(){
	// 点击登录
	$("#login").on("click", function () {
			clearAgent();
			window.location.href = "../../home/html/zhmm-login.html?type=11&openid="+openid;
			window.location.href = "../../home/html/login.html?type=11&openid="+openid;
	});
});

html/jkjy/js/article2.js

@@ -17,7 +17,7 @@ $(function(){
	article.closeWindow();
    if(!userAgent) {
        window.localStorage.setItem("toUser",toUser);
        window.location.href = "../../home/html/zhmm-login.html?openid=" + openid+"&type="+pagetype;
        window.location.href = "../../home/html/login.html?openid=" + openid+"&type="+pagetype;
    }else{
        queryInit();
    }

html/prescription/js/order_tracking.js

@@ -16,7 +16,7 @@ $(function(){
    if(!userAgent) {
        localStorage.setItem("toUser",toUser);
        localStorage.setItem("prescriptionCode",code);
        window.location.href = "../../home/html/zhmm-login.html?openid=" + openid+"&type="+pagetype;
        window.location.href = "../../home/html/login.html?openid=" + openid+"&type="+pagetype;
        return false;    
    }
    userInfo = JSON.parse(userAgent);

html/qygl/js/doctor-homepage.js

@@ -39,7 +39,7 @@ $(function() {
					if(res.status == 200) {
						openid = res.openid;
						window.localStorage.setItem(pageName, "{\"pageurl\":\"" + window.location.href + "\"}");
						window.location.href = "../../home/html/zhmm-login.html?type=0&openid=" + openid;
						window.location.href = "../../home/html/login.html?type=0&openid=" + openid;
					} else {
						queryFailed(res);
					}

html/ssgg/html/doctor-home-page.html

@@ -248,7 +248,7 @@
			$(function() {	
				var userAgent = window.localStorage.getItem(agentName);
			    if(!userAgent){	
					window.location.href = "../../home/html/zhmm-login.html?type=7&openid=" + openid;
					window.location.href = "../../home/html/login.html?type=7&openid=" + openid;
				}
			    else{
					queryInit();

html/ssgg/html/doctor-homepage.html

@@ -259,7 +259,7 @@
							if(res.status==200){
								openid = res.openid;
			    				window.localStorage.setItem(pageName,"{\"pageurl\":\""+window.location.href+"\"}");
			    				window.location.href = "../../home/html/zhmm-login.html?type=0&openid=" + openid;			    		
			    				window.location.href = "../../home/html/login.html?type=0&openid=" + openid;			    		
							}else{
								queryFailed(res);							
							}

html/yszx/js/consulting-doctor.js

@@ -29,7 +29,7 @@ $(function() {
	if(!userAgent) {
		localStorage.setItem("toUser",toUser);
		localStorage.setItem("consultCode",consult);
        window.location.href = "../../home/html/zhmm-login.html?openid=" + openid+"&type="+pagetype;
        window.location.href = "../../home/html/login.html?openid=" + openid+"&type="+pagetype;
		return false;	
	}
	

js/weixin_common.js

@@ -198,7 +198,7 @@ function checkUserAgent(){
            if(!userAgent){
                var agentOpenids = window.localStorage.getItem(OpenidAgent);
                agentOpenids = JSON.parse(agentOpenids);
                window.location.href = "../../home/html/zhmm-login.html?type=" + pagetype + "&openid=" + agentOpenids.openid;
                window.location.href = "../../home/html/login.html?type=" + pagetype + "&openid=" + agentOpenids.openid;
            }else{
                try{
                    var agentOpenids = window.localStorage.getItem(OpenidAgent);
@@ -219,7 +219,7 @@ function checkUserAgent(){
                //模板消息的情况，模板消息带上openid的值给页面
                var openid = Request['openid'];
                saveAgentOpenid(openid);
                window.location.href = "../../home/html/zhmm-login.html?type=" + pagetype + "&openid=" + openid;
                window.location.href = "../../home/html/login.html?type=" + pagetype + "&openid=" + openid;
            }else{
                try{
                    checkCanPayOnline(Request['openid']);
@@ -258,7 +258,7 @@ function checkUserAgent(){
                    saveAgentOpenid(openid);
                    if( agentOpenid == openid){
                        if(!userAgent){
                            window.location.href = "../../home/html/zhmm-login.html?type=" + pagetype + "&openid=" + openid;
                            window.location.href = "../../home/html/login.html?type=" + pagetype + "&openid=" + openid;
                        }else{
                            try{
                                checkCanPayOnline(openid);
@@ -269,7 +269,7 @@ function checkUserAgent(){
                            }
                        }
                    }else{
                        window.location.href = server + "wx/html/home/html/zhmm-login.html?type=" + pagetype + "&openid=" + openid;
                        window.location.href = server + "wx/html/home/html/login.html?type=" + pagetype + "&openid=" + openid;
                    }
                } else {
                    openidFailed(res);
@@ -308,7 +308,7 @@ function checkUserAgent1(){
            }
                
//          window.location.href = server + "wx/html/home/html/zhmm-login.html?type=" + pagetype + "&openid=" + openid;
            window.location.href = "../../home/html/zhmm-login.html?type=" + pagetype //+ "&openid=" + openid;
            window.location.href = "../../home/html/login.html?type=" + pagetype //+ "&openid=" + openid;
       }        
    }
    else{