Ver código fonte

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

raolu 6 anos atrás
pai
commit
99654c0eca

+ 7 - 12
html/grzx/html/my-detail.html

@ -86,20 +86,15 @@
				</div>
				<div class="c-list-value" id="idcard"></div>
			</li>
			<li class="c-list-text c-list-link">
			<li class="c-list-text c-list-link" onclick="updateSSC()">
				<div class="c-list-info" style="width: 180px;">
					<h4>医保卡号</h4>
				</div>
				<div class="c-list-info c-t-right" >
				    <input type="text" id="ssc" class="width-100 text-right" placeholder="">
					<div class="c-list-value" id="ssc"></div>
					<div class="c-arrow-r"></div>
				</div>
			</li>
			<li class="c-list-text c-list-link" >
				<div class="c-list-info">
                    <h4 class="c-nowrap">医疗保险号</h4>
                </div>
                <div class="c-list-value" id="medicareNumber"></div>
			</li>
			<!--<li class="c-list-text c-list-link" id="elecard">
				<div class="c-list-info">
                    <h4 class="c-nowrap">电子社保卡</h4>
@ -114,7 +109,7 @@
                <div class="c-list-value"></div>
                <div class="c-arrow-r"></div>
            </li>-->
			<li class="c-list-text c-list-link" id="selectType">
			<!--<li class="c-list-text c-list-link" id="selectType">
				<div class="c-list-info" style="width: 140px;">
					<h4>所属居委会</h4>
				</div>
@ -122,7 +117,7 @@
					<div class="c-list-value" style="padding-right: 0;" id="committee"></div>
				</div>
				<div class="c-arrow-r"></div>
			</li>
			</li>-->
			<li class="c-list-text c-list-link" onclick="updateAddress()">
				<div class="c-list-info" style="width: 180px;">
					<h4>详细地址</h4>
@ -153,9 +148,9 @@
				<div class="c-arrow-r"></div>
			</li>
		</ul>
		<div class="mt20 mlr15" id="divChangeLogin">
		<!--<div class="mt20 mlr15" id="divChangeLogin">
	        <a id="changeLogin" href="change-login.html" class="c-btn c-btn-full c-btn-radius c-f18" style="background-color: #ff9526">切换家人账号</a>
	    </div>
	    </div>-->
	    <div class="mlr15 mt20">
	        <a id="backLogin" href="javascript:;" class="c-btn c-btn-full c-btn-radius c-f18" style="background-color: #ff6a56">退出当前账号</a>
	    </div>

+ 142 - 0
html/grzx/html/update-ssc.html

@ -0,0 +1,142 @@
<!doctype html>
<html>
	<head>
		<meta charset="utf-8">
		<title>修改医保卡号</title>
		<meta name="author" content="yihu.com" />
		<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">
		<link rel="stylesheet" href="../../../css/cross.ui.css">
		<link rel="stylesheet" href="../css/shenfenyanzheng.css" type="text/css" />
	</head>
	<body style="background: #f3f3f3;">
		
		<div class="c-main mui-content">
			<div id="update">
				<ul class="n-list edit-list c-border-tb mt10">
					<li class="n-list-cover" style="height: 50px;">
						<div class="n-list-info pl10 mui-input-row">
							<input id='ssc' type="text" class="ajax c-input width-100 mui-input-clear pr40 c-f16" placeholder="请输入医保卡号" />
						</div>
					</li>
				</ul>
			</div>
			
			<div class="plr10 mt15 pb20">
				<a onclick="submit()" class="c-btn c-btn-full c-btn-4dcd70 border-radius-rounded" id="next_step">保存</a>
			</div>
		</div>
		
		<script src="../../../js/jquery/2.1.3/jquery.js"></script>
		<script type="text/javascript" src="../../../js/mui.min.js"></script>
	    <script type="text/javascript" src="../../../js/app.js" ></script>
	    <script type="text/javascript" src="../../../js/weixin_common.js" ></script>
	    <script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
		<script src="../../../js/common_http.js" type="text/javascript" charset="utf-8"></script>
		<script src="../../../js/security.js" type="text/javascript" charset="utf-8"></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?11=11"></script>
		<script>
			var dd = dialog({contentType:'load', skin:'bk-popup', content:'修改中...'});
			var Request = new Object();
			Request = GetRequest(); 
			var openid = Request["openid"];
			var type = Number(Request["type"]);
			var ssc = Request["ssc"];
			var userAgent;
			$("#ssc").val(ssc);
			$(function (){
				userAgent = window.localStorage.getItem(agentName);
		        if(userAgent){
		        	var paurl = "";        	
		        	if(type == 0){
		        		paurl = "wx/html/home/html/login.html?type=0&openid=" + openid;
		        	}
		        	else{
		        		if(ssc){
		        			paurl = "wx/html/home/html/login.html?type=" + type + "&openid=" + openid + "&ssc=" + ssc;
		        		}
		        		else{
		        			paurl = "wx/html/home/html/login.html?type=" + type + "&openid=" + openid;
		        		}
		        	}
		        	//从后台那边获取签名等信息
					var params = {};
					params.pageUrl = window.location.href;
					$.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({		
									//debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
								    appId: appId, // 必填,公众号的唯一标识
								    timestamp: t, // 必填,生成签名的时间戳
								    nonceStr: noncestr, // 必填,生成签名的随机串
								    signature: signature,// 必填,签名,见附录1
								    jsApiList: [
//								    	'closeWindow'
								    ] // 必填,需要使用的JS接口列表,所有JS接口列表见附录2
								});
							} 
						}
					});    	
		        }
		        else{
					if(!openid){
						dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'openid获取失败'}).show();
					}
				}
			})
			
			function submit(){
				var ssc = $.trim($('#ssc').val());
				if(ssc == ""){
					dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'请输入医保卡号!'}).show();
					return;
				}
				dd.showModal();
				//修改医保卡号
				sendPost("patient/updateSsc", {ssc:ssc}, "json", "post", operateFailed, operateSuccesss);
			}
			
			//失败
			function operateFailed(res) {
				dd.close();
				if (res && res.msg) {
					dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.msg}).show();      
				} else {
					dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'修改失败'}).show(); 
				}
			}
			
			//成功调用登录接口
			function operateSuccesss(res) {
				if (res.status == 200) {
					dd.close();
					dialog({
						    content: '修改医保卡号成功',
						    okValue:'确定',
						    ok: function (){				            		
						      	window.location.href = "my-detail.html?type=" + type + "&openid=" + openid;
						    }
				   	}).showModal();
				} else {
					//非200则为失败
					operateFailed(res);
				}
			}
		</script>
	
	</body>
</html>

+ 10 - 7
html/grzx/js/my-detail.js

@ -147,9 +147,9 @@ function querySuccess(res) {
	d.close();
	if (res.status == 200) {
		setValue(res.data);	
		if($("#ssc").val() != ""){
			$("#ssc").attr("readonly","readonly");
		}
//		if($("#ssc").val() != ""){
//			$("#ssc").attr("readonly","readonly");
//		}
		//取药码
		if(res.data.prescription == 1){
			$('#myMedicine').show()
@ -177,7 +177,7 @@ function  bindEvents(){
                    if(res.status==200){
                        clearAgent();
                        window.localStorage.removeItem("isTiXingVideoFaSong");//清除咨询详情移动网络下,用户点击不再提醒后的处理,换账号登陆后,还可以重新提醒
                        location.replace("../../home/html/zhmm-login.html?type=11&openid="+openid);
                        location.replace("../../home/html/login.html?type=11&openid="+openid+"&loginType=password");
                    }else{
                        if (res && res.msg) {
                            dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:res.msg}).show();      
@ -235,7 +235,6 @@ function setValue(data){
	var idcard = data.idcard;
	var ssc = data.ssc;
	var address = data.address;
	var medicareNumber = data.medicareNumber || "";
	var sign = Number(data.sign);
	
	var sexName = "女";
@ -256,8 +255,7 @@ function setValue(data){
	document.getElementById("sex").innerHTML = sexName;
	document.getElementById("mobile").innerHTML = mobile;
	document.getElementById("idcard").innerHTML = idcard;
	document.getElementById("medicareNumber").innerHTML = medicareNumber;
	document.getElementById("ssc").value = ssc;
	document.getElementById("ssc").innerHTML = ssc;
	document.getElementById("address").innerHTML = address;
	$('#committee').text(data.countryName);
}
@ -449,3 +447,8 @@ function updateMobile(){
	else
		window.location.href = "shenfenyz.html?type=" + pagetype + "&openid=" + openid + "&mobile="+ mobile + "&1=1";
}
function updateSSC(){
	var ssc = $.trim($('#ssc').html());
	window.location.href = "update-ssc.html?type=" + pagetype + "&openid=" + openid + "&ssc="+ ssc + "&1=1";
}

+ 6 - 6
html/home/html/forgetPwd.html

@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8">
    <title>身份验证</title>
    <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"/>
@ -152,10 +152,10 @@
        </ul>
        <div class="mb15 mlr15 mt20">
            <a id="phoneBtn" href="javascript:;" style="font-size: 18px;"
               class="c-btn c-btn-dcdcdc c-btn-full c-btn-radius c-f16">下一步</a>
               class="c-btn c-btn-dcdcdc c-btn-full c-btn-radius c-f16">完成</a>
        </div>
    </div>
    <p style="font-size: 16px;text-align: center;color: #323232;" class="mr15 c-t-right">返回<span style="font-size: 17px;font-style: italic;color: #17b3ec;"  onclick="changeLogin()">登录</span></p>
    <p style="font-size: 16px;text-align: center;color: #323232;" class="mr15 c-t-right">返回<span style="font-size: 17px;font-style: italic;color: #17b3ec;"  onclick="accountShenshu()">账号申诉</span></p>
  
</div>
@ -437,7 +437,7 @@
    function operateSuccesss(res) {
        var idcard = $('#idcardTxt').val();
        if (res.status == 200) {
            window.location.href = "reset-password.html?type=" + type + "&openid=" + openid + "&mobile=" + mobile + '&idcard=' + idcard;
            window.location.href = "login.html?type=" + type + "&openid=" + openid + "&mobile=" + mobile + '&idcard=' + idcard;
            dd.close();
        } else {
            //非200则为失败
@ -454,8 +454,8 @@
			}
		});
	})
    function changeLogin(){
		window.location.href = "login.html?type=" + type + "&openid=" + openid;
    function accountShenshu(){
		window.location.href = "../../yjfk/html/account_back.html?type=" + type + "&openid=" + openid;
	}
</script>
</html>

+ 2 - 11
html/home/html/regist-info.html

@ -266,7 +266,7 @@
		clock = setInterval(doLoop, 1000); //一秒执行一次
		var data = {};
		data.mobile = mobile;
		data.type = 4;
		data.type = 1;//1微信端注册,2微信端找回密码,3医生端找回密码,4患者登录,5医生登录 .6患者签约验证 7用户变更手机号验证 8用户新手机号验证 9绑定手机号 10 家庭成员添加验证
		sendPost("common/captcha", data, "json", "post", sendFailed, sendSuccesss);
	}
	function sendFailed(res) {
@ -334,9 +334,8 @@
		var captcha = document.getElementById("txtCode").value;
		var pwd = validPwd();
		var apwd = $("#apwd").val();
		debugger
		var agreement = $("#agreement").prop('checked');
		if(name == "" && idcard == "" && ssc == "" && mobile == ""){
		if(name == "" && idcard == "" && mobile == ""){
			dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'补充相关信息'}).show();
			return;
		}
@ -352,14 +351,6 @@
			dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'输入正确的身份证号'}).show();
			return;
		}
		if (ssc == "") {
			dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'医保卡号不能为空'}).show();
			return;
		}
		if (ssc != "" && !isSsc(ssc)) {
			dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'输入正确的医保卡号'}).show();
			return;
		}
		if (mobile == "") {
			dialog({contentType:'tipsbox',bottom:true, skin:'bk-popup' , content:'手机号不能为空'}).show();
			return;

+ 1 - 1
html/home/html/reset-password.html

@ -207,7 +207,7 @@
				    content: '重置密码成功',
				    okValue:'确定',
				    ok: function (){				            		
				      	window.location.href = "zhmm-login.html?type=" + type + "&openid=" + openid;
				      	window.location.href = "login.html?type=" + type + "&openid=" + openid+"&loginType=password";
				    }
		   	}).showModal();
		} else {