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

html/home/html/login.html

@@ -123,7 +123,7 @@
	var Request = new Object();
	Request = GetRequest();
	var openid = Request["openid"] || '123456';
	var type = Number(Request["type"]) || 4;
	var type = Number(Request["type"]) || 0;
	var mobile1 = Request["mobile"];
	var idcard = Request["idcard"];
	var clock = "";

html/qygl/html/sign_info.html

@@ -22,7 +22,7 @@
                <div class="mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
                    <div class="ui-grid bgc-fff">
                        <div class="ui-col-1">
                            <a class="c-f16 c-333 mui-control-item" href="#item1" data-href="consulting-doctor.html" href-id="consulting-doctor">咨询医生</a>
                            <a class="c-f16 c-333 mui-control-item mui-active" href="#item1" data-href="consulting-doctor.html" href-id="consulting-doctor">咨询医生</a>
                        </div>
                        <div class="ui-col-1">
                            <a class="c-f16 c-333 mui-control-item" href="#item2" data-href="fuwujilu.html" href-id="fuwujilu">服务记录</a>
@@ -94,24 +94,6 @@
                        <div class="xzzx c-hide">
                            <span class="c-f16"><img src="../images/add_icon.png" style="width: 20px;">发起新的咨询</span>
                        </div>
                        <div id="sheet1" class="mui-popover mui-popover-bottom mui-popover-action ">
                            <!-- 可选择菜单 -->
                            <ul class="mui-table-view">
                                <li class="mui-table-view-cell mui-table-view-cell1" style="font-size: 14px;color: #666666;" id="mui-content"></li>
                                <li class="mui-table-view-cell mui-table-view-cell1" id="lijifasong" style="font-size: 16px;color: #47A8EF;">
                                    <a href="javascript:;">立即发送</a>
                                </li>
                                <li class="mui-table-view-cell mui-table-view-cell1" id="buzaitixing" style="font-size: 16px;color: #47A8EF;">
                                    <a href="javascript:;">不再提醒</a>
                                </li>
                            </ul>
                            <!-- 取消菜单 -->
                            <ul class="mui-table-view">
                                <li class="mui-table-view-cell mui-table-view-cell1" style="font-size: 16px;color: #47A8EF;">
                                    <a href="#sheet1">取消发送</a>
                                </li>
                            </ul>
                        </div>
                    </div>
                    <div id="item2" class="mui-slider-item mui-control-content">
                        <div class="bgc-74bf00 plr10 ptb8 mt10">
@@ -135,6 +117,24 @@
                </div>
            </div>
        </div>
        <div id="sheet1" class="mui-popover mui-popover-bottom mui-popover-action ">
            <!-- 可选择菜单 -->
            <ul class="mui-table-view">
                <li class="mui-table-view-cell mui-table-view-cell1" style="font-size: 14px;color: #666666;" id="mui-content"></li>
                <li class="mui-table-view-cell mui-table-view-cell1" id="lijifasong" style="font-size: 16px;color: #47A8EF;">
                    <a href="javascript:;">立即发送</a>
                </li>
                <li class="mui-table-view-cell mui-table-view-cell1" id="buzaitixing" style="font-size: 16px;color: #47A8EF;">
                    <a href="javascript:;">不再提醒</a>
                </li>
            </ul>
            <!-- 取消菜单 -->
            <ul class="mui-table-view">
                <li class="mui-table-view-cell mui-table-view-cell1" style="font-size: 16px;color: #47A8EF;">
                    <a href="#sheet1">取消发送</a>
                </li>
            </ul>
        </div>
        <!--第二个tab页面内容处理-->
        <script type="text/html" id="item1_tmp">
            

html/qygl/js/consulting-doctor.js

@@ -559,12 +559,14 @@ function finish(){
    dialog({
        content:'是否确认结束该次咨询？结束后医生将无法回复',
        ok: function (){
            d.show();
            var params = {}
            params.code = consultCode;                                
            //发送ajax请求， 查询设备列表信息
            sendPost("patient/consult/finish", params, "json", "post", submitFailed3,finish_Successs);
            function finish_Successs(res){
                if (res.status == 200) {
                    d.close();
                	localStorage.setItem("evaluate",0);//标志未评价
                    location.reload();
                }
@@ -986,7 +988,8 @@ function bindConsultEvents(){
    
    $(".xzzx").on('tap', function(){
    		//获取患者信息 判断该患者是否已经缴费 若缴费则正常咨询 未缴费提示咨询次数信息
      	getPatientInfo();
//    	getPatientInfo();
        checkDocInWork();
    })
    
    ui.boxMsgSound.addEventListener("touchstart", function(e) {
@@ -1161,7 +1164,7 @@ Date.prototype.format = function(fmt) { //author: meizz
}
//未缴费居民限制咨询次数
function	 limitZxTimes(){
function limitZxTimes(){
	//获取剩余家庭咨询次数
	var url = '/patient/consult/remainConsultTimes';
	var remainTimes;//剩余咨询次数
@@ -1251,49 +1254,25 @@ function querySignTypeSuccess(res){
//获取签约医生的工作时间
function checkDocInWork(type, doctor,docQkInfo){
    var url = 'patient/consult/isDoctorWorkWhenconsult',
        params = {doctor:docQkInfo.code,healthDoctor:doctor.code};
        params = {doctor: request.doctor};
    sendPost(url, params, 'json', 'post', queryFailed, function(res){
        if(res.status == 200){
        	//	data:0-医生不接受咨询/1-医生当前接受咨询/2-全科医生和健管师当前都不在工作时间/3-全科医生当前不在工作时间/4-健管师当前不在工作时间		     健管师当前不在工作时间
			if(res.data==2){
			if(!(res.data == "1")){
				dialog({
				    content: '您好，由于您的签约医生工作繁忙，设置了每日回复咨询的时间段，所以，在该时间段外的时间，您的咨询将不会马上获得医生的回复。',
				    content: '您好，由于您关注的医生工作繁忙，设置了每日回复咨询的时间段，所以，在该时间段外的时间，您的咨询将不会马上获得医生的回复。',
				    okValue:'查看医生工作时间',
				    ok: function (){				            		
				      	window.location.href = "../../yszx/html/doctor-work-hours.html?doctor=" + docQkInfo.code+"&healthDoctor="+doctor.code;
				      	window.location.href = "../../yszx/html/doctor-work-hours.html?doctor=" + request.doctor;
				    },
				    cancelValue: '继续新增咨询',
				    cancel: function () {
						window.location.href = "../../yszx/html/add-consult.html?type="+request.type+"&doctorCode=" + request.doctor;
				    }
		   		 }).showModal();
			}else if(res.data==3){
				dialog({
				    content: '您好,由于您的签约全科医生工作繁忙……，您的咨询将不会马上获得全科医生的回复 。',
				    okValue:'查看医生工作时间',
				    ok: function (){				            		
				      	window.location.href = "../../yszx/html/doctor-work-hours.html?doctor=" + docQkInfo.code+"&healthDoctor="+doctor.code;
				    },
				    cancelValue: '继续新增咨询',
				    cancel: function () {
						window.location.href = "../../yszx/html/add-consult.html?type="+request.type+"&doctorCode=" + request.doctor;
				    }
		   		 }).showModal();
			}else if(res.data==4){
				dialog({
				    content: '您好,由于您的签约健康管理师工作繁忙……，您的咨询将不会马上获得健康管理师的回复 。',
				    okValue:'查看医生工作时间',
				    ok: function (){				            		
				      	window.location.href = "../../yszx/html/doctor-work-hours.html?doctor=" + docQkInfo.code+"&healthDoctor="+doctor.code;
				    },
				    cancelValue: '继续新增咨询',
				    cancel: function () {
						window.location.href = "../../yszx/html/add-consult.html?type="+request.type+"&doctorCode=" + request.doctor;
						window.location.href = "../../yszx/html/add-consult.html?doctorCode="+request.doctor;
				    }
		   		 }).showModal();
			}else{
                //跳转到新增咨询页面
                window.location.href = "../../yszx/html/add-consult.html?type="+request.type+"&doctorCode=" + request.doctor;
                window.location.href = "../../yszx/html/add-consult.html?doctorCode=" + request.doctor;
            }
        }else{
            queryFailed(res);

html/qygl/js/sign_info.js

@@ -26,11 +26,11 @@ var request = GetRequest();
            });
        });
    });
    var tab = localStorage.getItem("signInfo_tab");
    if(tab){
        index = tab;
        clickTab(index, 100);
    }
//  var tab = localStorage.getItem("signInfo_tab");
//  if(tab){
//      index = tab;
//      clickTab(index, 100);
//  }
    getFirstTabValue();
    bindEvent();
    getWxSign();

html/yszx/js/add-consult.js

@@ -1,8 +1,7 @@
var d = dialog({contentType:'load', skin:'bk-popup'});
var request = GetRequest(),
    doctorCode = request["doctorCode"],
    doctorName = decodeURI(request["doctorName"]),
    jobName = decodeURI(request["jobName"]),
    docInfo,
    patientInfo = window.localStorage.getItem(agentName1);
var serverId = ""; //微信图片上传获取的图片id
@@ -12,16 +11,35 @@ $(function(){
        patientInfo = JSON.parse(patientInfo);
    }
    $("#lbl_patient").text(patientInfo.name);
    var text = doctorName;
    if(jobName){
        text += "（"+jobName+"）"
    }
    $("#lbl_doctor").text(text);
    
    //获取医生信息
    getDoctorInfo();
    
    bindEvents();
    getWxSign();
})
function getDoctorInfo(){
    d.show();
    var url = "family_contract/homepage/homepage",
        params = {
            doctor: doctorCode
        };
    sendPost(url, params, 'json', 'get', queryFailed, function(res){
        if(res.status == 200){
            d.close();
            docInfo = res.data;
            var text = docInfo.name;
            if(docInfo.jobName){
                text += "（"+docInfo.jobName+"）"
            }
            $("#lbl_doctor").text(text);
        }else{
            queryFailed(res);
        }
    })
}
function bindEvents(){
    //提交咨询
    $("#commit").click(function() {
@@ -190,6 +208,15 @@ function submitSuccess(res) {
    }
}
function queryFailed(res){
    d.close();
    if (res && res.msg) {
        dialog({contentType:'tipsbox', skin:'bk-popup' , content:res.msg,bottom:true}).show();     
    } else {
        dialog({contentType:'tipsbox', skin:'bk-popup' , content:'加载失败',bottom:true}).show(); 
    }
}
function submitFailed(res) {
    $("#commit").css("pointer-events","");
    d.close();

html/yszx/js/consulting-doctor.js

@@ -754,12 +754,14 @@ function finish(){
	dialog({
        content:'是否确认结束该次咨询？结束后医生将无法回复',
        ok: function (){
            d.show();
	        var params = {}
	        params.code = consult;		        		        
			//发送ajax请求， 查询设备列表信息
			sendPost("patient/consult/finish", params, "json", "post", submitFailed3,finish_Successs);
			function finish_Successs(res){
				if (res.status == 200) {
				    d.close();
					location.reload();
//					window.location.href = "doctor-consultation.html";
				}

html/yszx/js/doctor-homepage.js

@@ -214,12 +214,12 @@ function checkDocInWork(){
                    },
                    cancelValue: '继续新增咨询',
                    cancel: function () {
                        window.location.href = "add-consult.html?doctorCode="+docInfo.doctor+"&doctorName="+docInfo.name+"&jobName="+docInfo.jobName;
                        window.location.href = "add-consult.html?doctorCode="+docInfo.doctor;
                    }
                 }).showModal();
            }else{
                //跳转到新增咨询页面
                window.location.href = "add-consult.html?doctorCode="+docInfo.doctor+"&doctorName="+docInfo.name+"&jobName="+docInfo.jobName;
                window.location.href = "add-consult.html?doctorCode="+docInfo.doctor;
            }
        }else{
            queryFailed(res);

js/common_http.js

@@ -1,49 +1,3 @@
//var publish_version = false;
//var jqAjax = $.ajax;
//
//if(publish_version) {
//	$.ajax = function(url, opt) {
//		var userAgent = window.localStorage.getItem(agentName);
//		var ua = null;
//		var opts = opt || {}
//		if(userAgent) {
//			ua = JSON.parse(userAgent);
//		}
//		
//		var param ={};
//		if(ua) {
//			param = {
//					"userAgent_is_switch": "1",
//					"userAgent_id": ua.id,
//					"userAgent_uid": ua.uid,
//					"userAgent_openid": ua.openid,
//					"userAgent_token": ua.token,
//					"userAgent_lastUid": ua.lastUid,
//					"userAgent_platform": ua.platform,
//					"userAgent_represented": ua.represented
//				}
//		}
//		
//		if("object" == typeof url) {
//			opts = $.extend(true, opts , url);
//		}
//		
//		if(opts.type.toUpperCase() == "POST") {
//			opts.data = $.extend(true,{},opts.data, param)
//		} else if(opts.data){
//			if((typeof opts.data == 'string')&& opts.data.constructor == String) {
//				opts.data += "&"+$.param(param)
//			} else {
//				opts.data = $.extend(true,{},opts.data, param)
//			}
//		}
//		
//		opts.beforeSend = function(request,settings) {
//			
//		}
//		return jqAjax(url, opts);
//	}
//}
/**
 * 统一请求ajax发送方法
@@ -232,7 +186,7 @@ function getReqPromises(reqs) {
		});
	}
	return Promise.all(_.map(reqs,function(param){
		return getReqPromise(param.url,param.data,param.dataType, param.reqType);
		return getReqPromise(param.url,param.data, 'json', param.reqType);
	}));
};

js/weixin_common.js

@@ -1,6 +1,6 @@
//切换发布版本 true：正式版，连接生产环境；false：测试版，连接测试环境。
//var publish_version = true;
var publish_version = false;
var publish_version = true;
//var publish_version = false;
if(publish_version){
	//正式环境（厦门i健康）
@@ -168,7 +168,9 @@ function checkUserAgent(){
            if(!userAgent){
                var agentOpenids = window.localStorage.getItem(OpenidAgent);
                agentOpenids = JSON.parse(agentOpenids);
                window.location.href = "../../home/html/login.html?type=" + pagetype + "&openid=" + agentOpenids.openid;
                var url = window.parent.location.href;
                saveAgentPage(url);
                window.location.href = "../../home/html/login.html?type=0&openid=" + agentOpenids.openid;
            }else{
                try{
                    var agentOpenids = window.localStorage.getItem(OpenidAgent);
@@ -189,7 +191,9 @@ function checkUserAgent(){
                //模板消息的情况，模板消息带上openid的值给页面
                var openid = Request['openid'];
                saveAgentOpenid(openid);
                window.location.href = "../../home/html/login.html?type=" + pagetype + "&openid=" + openid;
                var url = window.parent.location.href;
                saveAgentPage(url);
                window.location.href = "../../home/html/login.html?type=0&openid=" + openid;
            }else{
                try{
                    checkCanPayOnline(Request['openid']);
@@ -228,7 +232,9 @@ function checkUserAgent(){
                    saveAgentOpenid(openid);
                    if( agentOpenid == openid){
                        if(!userAgent){
                            window.location.href = "../../home/html/login.html?type=" + pagetype + "&openid=" + openid;
                            var url = window.parent.location.href;
                            saveAgentPage(url);
                            window.location.href = "../../home/html/login.html?type=0&openid=" + openid;
                        }else{
                            try{
                                checkCanPayOnline(openid);
@@ -239,7 +245,9 @@ function checkUserAgent(){
                            }
                        }
                    }else{
                        window.location.href = server + "wx/html/home/html/login.html?type=" + pagetype + "&openid=" + openid;
                        var url = window.parent.location.href;
                        saveAgentPage(url);
                        window.location.href = server + "wx/html/home/html/login.html?type=0&openid=" + openid;
                    }
                } else {
                    openidFailed(res);
@@ -398,7 +406,12 @@ var pageUrl  = {
            var jsonstr = $.parseJSON(agentPage);
            pageurl = jsonstr.pageurl;
        }
        return pageurl;
        if(pageurl){
            return pageurl;
        }else{
            return "../../grzx/html/my-detail.html";
        }
        
    }(),
    //关注咨询列表
    "1": "../../yszx/html/doctor-consultation.html",
@@ -407,7 +420,7 @@ var pageUrl  = {
    //查找医生
    "3": "../../yszx/html/select-consult-doctor.html",
    //个人中心
    "4": "../../grzx/html/my-detail.html"
    "4": "../../grzx/html/my-detail.html",
///**签约管理首页**/  "-1":"../../qygl/html/signing-doctors.html",//签约管理首页
///**医生咨询首页**/     1:"../../yszx/html/doctor-consultation.html",
///**医生指导首页**/     3:"../../yszd/html/doctor-guidance.html",//医生指导首页