홈 탐색 도움말
가입하기 로그인
Amoy2
/
sr-iHealthwx
Watch 2
Star 0
포크 1
파일
소스 검색

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

lulihong 7 년 전
부모
5eadcdf9b5 bb794dd19f
커밋
592ad0d8d8
21개의 변경된 파일과 324개의 추가작업 그리고 46개의 파일을 삭제
분할 보기 변경상태 보기
  1. 1 1
      html/download/css/download.css
  2. 52 0
      html/introduction/html/hospital.html
  3. BIN
      html/introduction/images/hospital1.png
  4. BIN
      html/introduction/images/hospital2.png
  5. BIN
      html/introduction/images/hospital3.png
  6. BIN
      html/introduction/images/hospital4.png
  7. BIN
      html/introduction/images/hospital5.png
  8. BIN
      html/introduction/images/hospital6.png
  9. BIN
      html/introduction/images/hospital7.png
  10. BIN
      html/introduction/images/hospital8.png
  11. BIN
      html/introduction/images/yszx.png
  12. 1 1
      html/jkjy/js/article_list.js
  13. 71 0
      html/profile/html/index_0.html
  14. 71 0
      html/profile/html/index_1.html
  15. 71 0
      html/profile/html/index_2.html
  16. BIN
      html/qygl/images/guanzhu-info.png
  17. 38 37
      html/yszd/js/guidance-detail.js
  18. 1 1
      html/yszx/html/focused-doctor.html
  19. 3 1
      html/yszx/js/consulting-doctor.js
  20. BIN
      images/logo_dibu_img.png
  21. 15 5
      js/weixin_common.js

+ 1 - 1
html/download/css/download.css
파일 보기 

@ -10,7 +10,7 @@ img {
 
	width: 100%;
 
	max-width: 640px;
 
	height: 100%;
 
	background-image: url(../images/BG.PNG);
 
	background-image: url(../images/BG.png);
 
	background-repeat: no-repeat;
 
	background-position: center top;
 
	background-size: cover;

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 52 - 0
html/introduction/html/hospital.html


BIN
html/introduction/images/hospital1.png
파일 보기


BIN
html/introduction/images/hospital2.png
파일 보기


BIN
html/introduction/images/hospital3.png
파일 보기


BIN
html/introduction/images/hospital4.png
파일 보기


BIN
html/introduction/images/hospital5.png
파일 보기


BIN
html/introduction/images/hospital6.png
파일 보기


BIN
html/introduction/images/hospital7.png
파일 보기


BIN
html/introduction/images/hospital8.png
파일 보기


BIN
html/introduction/images/yszx.png
파일 보기


+ 1 - 1
html/jkjy/js/article_list.js
파일 보기 

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

+ 71 - 0
html/profile/html/index_0.html
파일 보기 

@ -0,0 +1,71 @@
 
<!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
 
		}))
 
		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'
 
		
		location.replace(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>

+ 71 - 0
html/profile/html/index_1.html
파일 보기 

@ -0,0 +1,71 @@
 
<!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
 
		}))
 
		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'
 
		
		location.replace(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>

+ 71 - 0
html/profile/html/index_2.html
파일 보기 

@ -0,0 +1,71 @@
 
<!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
 
		}))
 
		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'
 
		
		location.replace(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>

BIN
html/qygl/images/guanzhu-info.png
파일 보기


+ 38 - 37
html/yszd/js/guidance-detail.js
파일 보기 

@ -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/yszx/html/focused-doctor.html
파일 보기 

@ -2,7 +2,7 @@
 
<html lang="en">
 
    <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"/>
 
        <meta name="apple-mobile-web-app-capable" content="yes"/>

+ 3 - 1
html/yszx/js/consulting-doctor.js
파일 보기 

@ -288,7 +288,9 @@ function querySuccess(res) {
 
	if (res.status == 200) {
 
		if(res.data == 0){
 
		    //未结束的咨询跳转去咨询页面
 
            window.location.href = "../../qygl/html/sign_info.html?doctor="+doctor+"&consult="+consult;
 
//          window.location.href = "../../qygl/html/sign_info.html?doctor="+doctor+"&consult="+consult;
 
		    var url = "../../qygl/html/sign_info.html?doctor="+doctor+"&consult="+consult;
 
		    window.location.replace(url);
 
		}else{
 
			$("#divBottom").hide();
 
			$("#finish_list").hide();

BIN
images/logo_dibu_img.png
파일 보기


+ 15 - 5
js/weixin_common.js
파일 보기 

@ -1,11 +1,11 @@
 
//切换发布版本 true：正式版，连接生产环境；false：测试版，连接测试环境。
 
var publish_version = true;
 
var publish_version = false;
 
//var publish_version = false;
 
if(publish_version){
 
	//正式环境（厦门i健康）
 
    var server = "http://srijk.yihu.com/wlyy/";
 
    var appId = "wx0a06b75a40b28f2a";
 
    var appId = "wx49aa3a51b0aca27d";
 
    var urlName = "wlyy";
 
    var weixinUrl = "srijk.yihu.com";
 
    var agentName = "wlyyAgent";
 
@ -16,15 +16,20 @@ 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://ehr.yihu.com"
 
}else{
 
	//测试环境
 
//	var server = "http://srijk.yihu.com/wlyy/"; 
	var server = "http://172.19.103.72:9096/wlyy/"; 
//	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.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";
 
@ -38,7 +43,10 @@ if(publish_version){
 
    
    var imurl="http://172.19.103.72:3000";
 
//  var imurl="http://192.168.131.24:3000";//仕杰
 
    var imgUrlDomain = 'http://srijk.yihu.com/';
 
    var imgUrlDomain = 'http://172.19.103.54/';
 
    
    // 健康档案（上饶）服务地址
 
    var profileServer = "http://ehr.yihu.com"
 
	
}
 
@ -421,6 +429,8 @@ var pageUrl  = {
 
    "3": "../../yszx/html/select-consult-doctor.html",
 
    //个人中心
 
    "4": "../../grzx/html/my-detail.html",
 
    // 健康档案
 
    "5": "../../profile/html/index.html"
 
///**签约管理首页**/  "-1":"../../qygl/html/signing-doctors.html",//签约管理首页
 
///**医生咨询首页**/     1:"../../yszx/html/doctor-consultation.html",
 
///**医生指导首页**/     3:"../../yszd/html/doctor-guidance.html",//医生指导首页