Domovská stránka Prehľadávať Pomoc
Registrovať Prihlásiť sa
Amoy2
/
sr-iHealthwx
Pridať medzi pozorované 2
Hviezda 0
Fork 1
Súbory
Prechádzať zdrojové kódy

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

raolu 6 rokov pred
rodič
3718e0d2b6 1abb6f4ef1
commit
5ff260b905
23 zmenil súbory, kde vykonal 304 pridanie a 60 odobranie
Rozdelené zobrazenie Ukázať štatistiku rozdielnych dát
  1. 2 2
      html/grzx/js/change-login.js
  2. 1 1
      html/jbsq/html/public-consult-detail.html
  3. 1 0
      html/jkjy/html/article2.html
  4. 1 0
      html/jkjy/html/article_list.html
  5. 1 1
      html/jkjy/js/article.js
  6. 1 1
      html/jkjy/js/article2.js
  7. 1 1
      html/jkjy/js/article_list.js
  8. 77 0
      html/profile/html/index_0.html
  9. 76 0
      html/profile/html/index_1.html
  10. 76 0
      html/profile/html/index_2.html
  11. 1 1
      html/qygl/js/pay_flow.js
  12. 1 1
      html/qygl/js/signing-doctors.js
  13. 2 2
      html/ssgg/js/doctor-homepage-new.js
  14. 1 1
      html/survey/html/survey_info.html
  15. 1 1
      html/wdyy/js/detail-appointment.js
  16. 1 1
      html/wdyy/js/my-appointment.js
  17. 1 1
      html/xuqian/js/information.js
  18. 1 1
      html/yjfk/js/feedback.js
  19. 2 2
      html/yszd/html/guidance-detail.html
  20. 39 38
      html/yszd/js/guidance-detail.js
  21. 1 1
      html/yszd/js/guidance-detail_old.js
  22. 1 1
      html/yszx/js/manyidu.js
  23. 15 3
      js/weixin_common.js

+ 2 - 2
html/grzx/js/change-login.js
Zobraziť súbor 

@ -30,7 +30,7 @@ var scroller1 = new IScrollPullUpDown('wrapper',{
 
$(function(){
 
	$(".tips a").on("click", function () {
 
		window.location.href = server + "wx/html/home/html/zhmm-login.html?type=11&openid=" + openid;
 
		window.location.href = server + "wx/html/home/html/login.html?type=11&openid=" + openid;
 
	});
 
	// 判断是否登录
 
	checkUserAgent();
 
@ -252,7 +252,7 @@ function changeSuccesss(res) {
 
	// 				ok: function (){
 
	// 					var jsonstr = $.parseJSON(agentOpenid);
 
	// 				    var openid = jsonstr.openid;
 
	// 				    window.location.href = server + "wx/html/home/html/zhmm-login.html?type=11&openid=" + openid;
 
	// 				    window.location.href = server + "wx/html/home/html/login.html?type=11&openid=" + openid;
 
	// 				},
 
	// 				cancelValue: "不了，谢谢",
 
	// 				cancel: function () {

+ 1 - 1
html/jbsq/html/public-consult-detail.html
Zobraziť súbor 

@ -76,7 +76,7 @@
 
	$(function(){
 
		if(!userAgent) {
 
			localStorage.setItem("toUser",toUser);
 
	        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;
 
			return false;	
		}
 
		var newUaObj = JSON.parse(window.localStorage.getItem(agentName))

+ 1 - 0
html/jkjy/html/article2.html
Zobraziť súbor 

@ -8,6 +8,7 @@
 
        <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 
        <meta name="apple-mobile-web-app-capable" content="yes"/>
 
        <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
 
        <meta name="referrer" content="no-referrer" />
 
        <link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
 
        <link rel="stylesheet" type="text/css" href="../../../css/cross.ui.css">
 
        <link rel="stylesheet" type="text/css" href="../../../iconfont/iconfont.css" />

+ 1 - 0
html/jkjy/html/article_list.html
Zobraziť súbor 

@ -8,6 +8,7 @@
 
        <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 
        <meta name="apple-mobile-web-app-capable" content="yes"/>
 
        <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
 
        <meta name="referrer" content="no-referrer" />
 
        <link rel="stylesheet" type="text/css" href="../../../css/mui.min.css"/>
 
        <link rel="stylesheet" type="text/css" href="../../../css/cross.css" />
 
        <link rel="stylesheet" type="text/css" href="../../../css/cross.ui.css">

+ 1 - 1
html/jkjy/js/article.js
Zobraziť súbor 

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

+ 1 - 1
html/jkjy/js/article2.js
Zobraziť súbor 

@ -13,7 +13,7 @@ $(function(){
 
	dataId = Request["dataId"];
 
	articleId = Request.articleId || dataId;
 
	type = Request.type;
 
	window.localStorage.setItem("article2",dataId);
 
	window.localStorage.setItem("article",dataId);
 
	article.closeWindow();
 
    if(!userAgent) {
 
        window.localStorage.setItem("toUser",toUser);

+ 1 - 1
html/jkjy/js/article_list.js
Zobraziť súbor 

@ -281,7 +281,7 @@ function bindEvents(){
 
                getMyCollection(index,true);
 
            }
 
        }
 
    });
 
    },{ passive: false });
 
      
    //tab内item的点击事件
 
    $("#recordList0").on('tap', 'li', function(){

+ 77 - 0
html/profile/html/index_0.html
Zobraziť súbor 

@ -0,0 +1,77 @@
 
<!doctype html>
 
<html>
 
<head>
 
    <meta charset="utf-8">
 
    <title>就诊记录</title>
 
    <meta name="format-detection" content="telephone=no"/>
 
    <meta name="viewport"
 
          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 
    <meta name="apple-mobile-web-app-capable" content="yes"/>
 
    <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
 
    <link rel="stylesheet" href="../../../css/cross.css" type="text/css"/>
 
    <link rel="stylesheet" href="../../../css/cross.ui.css" type="text/css"/>
 
    <link rel="stylesheet" type="text/css" href="../../../css/ss-style.css">
 
    <link rel="stylesheet" type="text/css" href="../../../iconfont/iconfont.css" />
 
</head>
 
<body>
 
</body>
 
<script type="text/javascript" src="../../../js/jquery/2.1.3/jquery.js"></script>
 
<script type="text/javascript" src="../../../js/app.js" ></script>
 
<script type="text/javascript" src="../../../js/mui.min.js" ></script>
 
<script type="text/javascript" src="../../../js/common_http.js" ></script>
 
<script type="text/javascript" src="../../../js/weixin_common.js" ></script>
 
<link rel="stylesheet" type="text/css" href="../../../widget/artDialog/6.0.5/css/ui-dialog.min.css">
 
<script src="../../../widget/artDialog/6.0.5/js/dialog-plus.min.js"></script>
 
<script src="../../../js/underscore.js"></script>
 
<script src="../../../js/es6-promise.js"></script>
 
<script type="text/javascript">
 
	var queryParam = GetRequest()
 
	var redirectUrl = ""
 
	var pagetype = 5;
 
	var d = dialog({contentType:'load', skin:'bk-popup'});
 
	
	var target = "wx", idCard = ""
 
	if(queryParam.target == "app") {
 
		target = queryParam.target
 
	}
 
	
	if(target == "wx") {
 
		checkUserAgent();
 
	} else {
 
		idCard = queryParam.demographic_id
 
		redirect()	
	}
 
	
	function redirect() {
 
		var state = encodeURIComponent(JSON.stringify({
 
			itemIndex: 0,
 
			target: target,
 
			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+'&user=tourists'
 
		
		if(target == "wx") {
 
			location.replace(redirectUrl)
 
		} else {
 
			location.href = redirectUrl
 
		}
 
		
	}
 
	
	function queryInit(){
 
		getReqPromise("patient/baseinfo", {}, 'json', 'post').then(function(res){
 
			if(res.status == 200) {
 
				idCard = res.data && res.data.idcardAll
 
				redirect()
 
			} else {
 
				dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.msg}).show();      
			}
 
		}).catch(function(e) {
 
			console && console.error(e)
 
		})
 
	}
 
</script>
 
</html>

+ 76 - 0
html/profile/html/index_1.html
Zobraziť súbor 

@ -0,0 +1,76 @@
 
<!doctype html>
 
<html>
 
<head>
 
    <meta charset="utf-8">
 
    <title>检查检验</title>
 
    <meta name="format-detection" content="telephone=no"/>
 
    <meta name="viewport"
 
          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 
    <meta name="apple-mobile-web-app-capable" content="yes"/>
 
    <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
 
    <link rel="stylesheet" href="../../../css/cross.css" type="text/css"/>
 
    <link rel="stylesheet" href="../../../css/cross.ui.css" type="text/css"/>
 
    <link rel="stylesheet" type="text/css" href="../../../css/ss-style.css">
 
    <link rel="stylesheet" type="text/css" href="../../../iconfont/iconfont.css" />
 
</head>
 
<body>
 
</body>
 
<script type="text/javascript" src="../../../js/jquery/2.1.3/jquery.js"></script>
 
<script type="text/javascript" src="../../../js/app.js" ></script>
 
<script type="text/javascript" src="../../../js/mui.min.js" ></script>
 
<script type="text/javascript" src="../../../js/common_http.js" ></script>
 
<script type="text/javascript" src="../../../js/weixin_common.js" ></script>
 
<link rel="stylesheet" type="text/css" href="../../../widget/artDialog/6.0.5/css/ui-dialog.min.css">
 
<script src="../../../widget/artDialog/6.0.5/js/dialog-plus.min.js"></script>
 
<script src="../../../js/underscore.js"></script>
 
<script src="../../../js/es6-promise.js"></script>
 
<script type="text/javascript">
 
	var queryParam = GetRequest()
 
	var redirectUrl = ""
 
	var pagetype = 5;
 
	var d = dialog({contentType:'load', skin:'bk-popup'});
 
	
	var target = "wx", idCard = ""
 
	if(queryParam.target == "app") {
 
		target = queryParam.target
 
	}
 
	
	if(target == "wx") {
 
		checkUserAgent();
 
	} else {
 
		idCard = queryParam.demographic_id
 
		redirect()	
	}
 
	
	function redirect() {
 
		var state = encodeURIComponent(JSON.stringify({
 
			itemIndex: 1,
 
			target: target,
 
			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+'&user=tourists'
 
		
		if(target == "wx") {
 
			location.replace(redirectUrl)
 
		} else {
 
			location.href = redirectUrl
 
		}
 
	}
 
	
	function queryInit(){
 
		getReqPromise("patient/baseinfo", {}, 'json', 'post').then(function(res){
 
			if(res.status == 200) {
 
				idCard = res.data && res.data.idcardAll
 
				redirect()
 
			} else {
 
				dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.msg}).show();      
			}
 
		}).catch(function(e) {
 
			console && console.error(e)
 
		})
 
	}
 
</script>
 
</html>

+ 76 - 0
html/profile/html/index_2.html
Zobraziť súbor 

@ -0,0 +1,76 @@
 
<!doctype html>
 
<html>
 
<head>
 
    <meta charset="utf-8">
 
    <title>用药记录</title>
 
    <meta name="format-detection" content="telephone=no"/>
 
    <meta name="viewport"
 
          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
 
    <meta name="apple-mobile-web-app-capable" content="yes"/>
 
    <meta name="apple-mobile-web-app-status-bar-style" content="black"/>
 
    <link rel="stylesheet" href="../../../css/cross.css" type="text/css"/>
 
    <link rel="stylesheet" href="../../../css/cross.ui.css" type="text/css"/>
 
    <link rel="stylesheet" type="text/css" href="../../../css/ss-style.css">
 
    <link rel="stylesheet" type="text/css" href="../../../iconfont/iconfont.css" />
 
</head>
 
<body>
 
</body>
 
<script type="text/javascript" src="../../../js/jquery/2.1.3/jquery.js"></script>
 
<script type="text/javascript" src="../../../js/app.js" ></script>
 
<script type="text/javascript" src="../../../js/mui.min.js" ></script>
 
<script type="text/javascript" src="../../../js/common_http.js" ></script>
 
<script type="text/javascript" src="../../../js/weixin_common.js" ></script>
 
<link rel="stylesheet" type="text/css" href="../../../widget/artDialog/6.0.5/css/ui-dialog.min.css">
 
<script src="../../../widget/artDialog/6.0.5/js/dialog-plus.min.js"></script>
 
<script src="../../../js/underscore.js"></script>
 
<script src="../../../js/es6-promise.js"></script>
 
<script type="text/javascript">
 
	var queryParam = GetRequest()
 
	var redirectUrl = ""
 
	var pagetype = 5;
 
	var d = dialog({contentType:'load', skin:'bk-popup'});
 
	
	var target = "wx", idCard = ""
 
	if(queryParam.target == "app") {
 
		target = queryParam.target
 
	}
 
	
	if(target == "wx") {
 
		checkUserAgent();
 
	} else {
 
		idCard = queryParam.demographic_id
 
		redirect()	
	}
 
	
	function redirect() {
 
		var state = encodeURIComponent(JSON.stringify({
 
			itemIndex: 2,
 
			target: target,
 
			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+'&user=tourists'
 
		
		if(target == "wx") {
 
			location.replace(redirectUrl)
 
		} else {
 
			location.href = redirectUrl
 
		}
 
	}
 
	
	function queryInit(){
 
		getReqPromise("patient/baseinfo", {}, 'json', 'post').then(function(res){
 
			if(res.status == 200) {
 
				idCard = res.data && res.data.idcardAll
 
				redirect()
 
			} else {
 
				dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.msg}).show();      
			}
 
		}).catch(function(e) {
 
			console && console.error(e)
 
		})
 
	}
 
</script>
 
</html>

+ 1 - 1
html/qygl/js/pay_flow.js
Zobraziť súbor 

@ -19,7 +19,7 @@ var signInfo;
 
$(function(){
 
    //判断接收者是否是本人
 
    if(!userAgent) {
 
        window.location.href = server + "wx/html/home/html/zhmm-login.html?openid=" + openid+"&type="+pagetype;
 
        window.location.href = server + "wx/html/home/html/login.html?openid=" + openid+"&type="+pagetype;
 
        return false;
 
    }
 
    //判断是否可以在线支付

+ 1 - 1
html/qygl/js/signing-doctors.js
Zobraziť súbor 

@ -97,7 +97,7 @@ wxInit= function(){
 
$(function(){
 
	wxInit();
 
	if(!userAgent) {
 
        window.location.href = server + "wx/html/home/html/zhmm-login.html?openid=" + openid+"&type="+pagetype;
 
        window.location.href = server + "wx/html/home/html/login.html?openid=" + openid+"&type="+pagetype;
 
        return false;
 
    }else{
 
    	queryInit();

+ 2 - 2
html/ssgg/js/doctor-homepage-new.js
Zobraziť súbor 

@ -95,7 +95,7 @@ function handleBusiness(){
 
				localStorage.setItem("doccode",invitationState);
 
			}
 
			
			//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;
 
		}
 
		
		data = { doctor: doctor };
 
@ -576,7 +576,7 @@ function startSign() {
 
			if(!userAgent) {
 
				var params = JSON.stringify({doctor: doctor});
 
				localStorage.setItem("doccode",doctor);
 
				window.location.href = server + "wx/html/home/html/zhmm-login.html?type=" + pagetype + "&openid=" + openid+"&loginParams="+params;
 
				window.location.href = server + "wx/html/home/html/login.html?type=" + pagetype + "&openid=" + openid+"&loginParams="+params;
 
			}
 
			
			if(isQr != false) {

+ 1 - 1
html/survey/html/survey_info.html
Zobraziť súbor 

@ -42,7 +42,7 @@
 
            localStorage.setItem("survey_id",dataId);
 
            if(!userAgent) {
 
                localStorage.setItem("toUser",toUser);
 
                window.location.href = server + "wx/html/home/html/zhmm-login.html?openid=" + openid+"&type=30";
 
                window.location.href = server + "wx/html/home/html/login.html?openid=" + openid+"&type=30";
 
                return false;
 
            }else{
 
                queryInit();

+ 1 - 1
html/wdyy/js/detail-appointment.js
Zobraziť súbor 

@ -22,7 +22,7 @@ var pagetype = 23;
 
 		if(!userAgent) {
 
 			localStorage.setItem("toUser",toUser);
 
 			localStorage.setItem("id",id);
 
			window.location.href = server + "wx/html/home/html/zhmm-login.html?openid=" + openid+"&type=23";
 
			window.location.href = server + "wx/html/home/html/login.html?openid=" + openid+"&type=23";
 
			return false;	
		}
 
		var newUaObj = JSON.parse(window.localStorage.getItem(agentName))

+ 1 - 1
html/wdyy/js/my-appointment.js
Zobraziť súbor 

@ -29,7 +29,7 @@ function queryInit(){
 
	var userAgent = window.localStorage.getItem(agentName);
 
		if(!userAgent) {
 
 			localStorage.setItem("toUser",toUser);
 
			window.location.href = server + "wx/html/home/html/zhmm-login.html?openid=" + openid+"&type="+pagetype;
 
			window.location.href = server + "wx/html/home/html/login.html?openid=" + openid+"&type="+pagetype;
 
			return false;	
		}
 
		var newUaObj = JSON.parse(window.localStorage.getItem(agentName))

+ 1 - 1
html/xuqian/js/information.js
Zobraziť súbor 

@ -12,7 +12,7 @@ $(function(){
 
	var openid = Request["openid"];
 
	var represented = Request["represented"];
 
	if(!userAgent) {
 
        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;
 
		return false;	
	}
 
	var newUaObj = JSON.parse(userAgent)

+ 1 - 1
html/yjfk/js/feedback.js
Zobraziť súbor 

@ -72,7 +72,7 @@ function checkUserAgent(){
 
		else{
 
			var jsonstr = $.parseJSON(agentOpenid);
 
			var openid = jsonstr.openid;
 
			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;
 
		}
 
	}
 
}

+ 2 - 2
html/yszd/html/guidance-detail.html
Zobraziť súbor 

@ -13,11 +13,11 @@
 
		<div class="main ptb10 plr10" style="margin-bottom: 70px;">
 
            <p class="c-f14 c-333" id="content_text"></p>
 
		</div>
 
		<div id="footer" style="position: fixed;">
 
		<!-- <div id="footer" style="position: fixed;">
 
			<div class="mlr15 mtb10">
 
				<a href="javascript:;" class="c-btn c-btn-full c-btn-radius btn-green" id="detail">对指导有疑问？点击发起医生咨询</a>
 
			</div>
 
		</div>
 
		</div> -->
 
	</body>
 
	<script src="../../../js/jquery/2.1.3/jquery.js"></script>
 
	<script type="text/javascript" src="../../../js/mui.min.js"></script>

+ 39 - 38
html/yszd/js/guidance-detail.js
Zobraziť súbor 

@ -18,7 +18,7 @@ $(function(){
 
	if(!userAgent) {
 
		localStorage.setItem("toUser",toUser);
 
		localStorage.setItem("id",id);
 
		window.location.href = server + "wx/html/home/html/zhmm-login.html?openid=" + openid+"&type="+pagetype;
 
		window.location.href = server + "wx/html/home/html/login.html?openid=" + openid+"&type="+pagetype;
 
		return false;
 
	}
 
	var newUaObj = JSON.parse(window.localStorage.getItem(agentName))
 
@ -301,46 +301,47 @@ function checkDocInWork(type, doctor, id){
 
//未缴费时，判断剩余咨询次数
 
function limitZxTimes(){
 
	window.location.href = "../../qygl/html/signing_management.html";
 
    //获取剩余家庭咨询次数
 
    var url = '/patient/consult/remainConsultTimes';
 
    var remainTimes;//剩余咨询次数
 
    var countTimes;//总咨询次数
 
    var zxTimes;//已咨询次数
 
    d.show();
 
    sendPost(url, {}, 'json', 'get', queryFailed, function(res){
 
        if(res.status == 200){
 
                d.close();
 
            remainTimes = res.data.amount;
 
            countTimes = res.data.count;
 
            zxTimes = countTimes - remainTimes;
 
            if(zxTimes == countTimes){
 
                //未缴费的总咨询次数已达上限 提示去缴费
 
                dialog({
 
                    content: '您本年度家庭医生签约暂未缴费,当前10次免费健康咨询已全部使用.如果需要家庭医生继续为您提供服务,请尽快完成缴费操作',
 
                    okValue:'前往缴费',
 
                    ok: function (){  
                        window.location.href = "../../qygl/html/signing_management.html";
 
                    }
 
                }).showModal();
 
            }else{
 
    // var url = '/patient/consult/remainConsultTimes';
 
    // var remainTimes;//剩余咨询次数
 
    // var countTimes;//总咨询次数
 
    // var zxTimes;//已咨询次数
 
    // d.show();
 
    // sendPost(url, {}, 'json', 'get', queryFailed, function(res){
 
    //     if(res.status == 200){
 
    //             d.close();
 
    //         remainTimes = res.data.amount;
 
    //         countTimes = res.data.count;
 
    //         zxTimes = countTimes - remainTimes;
 
    //         if(zxTimes == countTimes){
 
    //             //未缴费的总咨询次数已达上限 提示去缴费
 
    //             dialog({
 
    //                 content: '您本年度家庭医生签约暂未缴费,当前10次免费健康咨询已全部使用.如果需要家庭医生继续为您提供服务,请尽快完成缴费操作',
 
    //                 okValue:'前往缴费',
 
    //                 ok: function (){  
    //                     window.location.href = "../../qygl/html/signing_management.html";
 
    //                 }
 
    //             }).showModal();
 
    //         }else{
 
                
                dialog({
 
                    content: '您本年度家庭医生签约暂未缴费,可使用10次免费健康咨询,当前剩余:'+remainTimes+'次.为避免影响您的服务体验,请尽快完成缴费操作',
 
                    okValue:'前往缴费',
 
                    ok: function (){    
                          window.location.href = "../../qygl/html/signing_management.html";
 
                    },
 
                    cancelValue: '开始咨询',
 
                    cancel: function () {
 
                        querySignType2();
 
                    }
 
                }).showModal();
 
    //             dialog({
 
    //                 content: '您本年度家庭医生签约暂未缴费,可使用10次免费健康咨询,当前剩余:'+remainTimes+'次.为避免影响您的服务体验,请尽快完成缴费操作',
 
    //                 okValue:'前往缴费',
 
    //                 ok: function (){    
    //                       window.location.href = "../../qygl/html/signing_management.html";
 
    //                 },
 
    //                 cancelValue: '开始咨询',
 
    //                 cancel: function () {
 
    //                     querySignType2();
 
    //                 }
 
    //             }).showModal();
 
            
            }
 
        }else{
 
            queryFailed(res);
 
        }
 
    });
 
    //         }
 
    //     }else{
 
    //         queryFailed(res);
 
    //     }
 
    // });
 
}

+ 1 - 1
html/yszd/js/guidance-detail_old.js
Zobraziť súbor 

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

+ 1 - 1
html/yszx/js/manyidu.js
Zobraziť súbor 

@ -13,7 +13,7 @@ var pagetype = 0;
 
$(function() {
 
	if(!userAgent) {
 
		window.localStorage.setItem(pageName, JSON.stringify({pageurl: location.href}))
 
		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;	
		return false;
 
	}
 
	var newUaObj = JSON.parse(window.localStorage.getItem(agentName))

+ 15 - 3
js/weixin_common.js
Zobraziť súbor 

@ -3,8 +3,8 @@ var publish_version = true;
 
//var publish_version = false;
 
if(publish_version){
 
	//正式环境（厦门i健康）
 
    var server = "http://srijk.yihu.com/wlyy/";
 
	//正式环境（城市i健康）
 
   var server = "http://srijk.yihu.com/wlyy/";
 
    var appId = "wx49aa3a51b0aca27d";
 
    var urlName = "wlyy";
 
    var weixinUrl = "srijk.yihu.com";
 
@ -16,15 +16,18 @@ if(publish_version){
 
    var wxurl = "http%3a%2f%2fwww.srijk.com%2fwlyy%2fwx%2fhtml";
 
    var imurl="http://58.22.123.195:3000";
 
    var imgUrlDomain = 'http://srijk.yihu.com/';
 
    var profileServer = "http://jksr.srswjw.gov.cn:1235"; // 健康档案（上饶）服务地址
 
}else{
 
	//测试环境
 
	var server = "http://172.19.103.72:9096/wlyy/"; 
	var server = "http://172.19.103.72:9096/csijk/"; 
//	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.133:8080/";//文杰
 
 	//var server = "http://192.168.131.250:8081/"; 
    //var server = "http://192.168.131.131:8080/"; //文斌 
	var appId = "wx0a06b75a40b28f2a";
 
    var urlName = "wlyy";
 
@ -39,6 +42,8 @@ if(publish_version){
 
    var imurl="http://172.19.103.72:3000";
 
//  var imurl="http://192.168.131.24:3000";//仕杰
 
    var imgUrlDomain = 'http://172.19.103.54/';
 
    
    var profileServer = "http://ehr.yihu.com"; // 健康档案（上饶）服务地址
 
	
}
 
@ -396,6 +401,7 @@ var toUsers  =  localStorage.getItem("toUser");
 
var curId  =  localStorage.getItem("id");
 
var toName = localStorage.getItem("toName");
 
var consultCode = localStorage.getItem("consultCode");
 
var article = localStorage.getItem("article");
 
var pageUrl  = {
 
/**通用跳转**/        
@ -421,6 +427,12 @@ var pageUrl  = {
 
    "3": "../../yszx/html/select-consult-doctor.html",
 
    //个人中心
 
    "4": "../../grzx/html/my-detail.html",
 
    // 健康档案
 
    "5": "../../profile/html/index.html",
 
    /**医生指导详情**/ 
    "25":"../../yszd/html/guidance-detail.html?openid="+0+"&toUser="+toUsers+"&id="+curId+"&toName="+toName,
 
    // /**新的健康教育详情**/   
    "50":"../../jkjy/html/article2.html?dataId="+article+"&toUser="+toUsers+"&toName="+toName,
 
///**签约管理首页**/  "-1":"../../qygl/html/signing-doctors.html",//签约管理首页
 
///**医生咨询首页**/     1:"../../yszx/html/doctor-consultation.html",
 
///**医生指导首页**/     3:"../../yszd/html/doctor-guidance.html",//医生指导首页