Skip to content

W
wechat_lung
Commit ac33ec14 by hanpeng
Options

-mark- 20190930 日常

parent 643ff382
Showing with 636 additions and 341 deletions
app/doctor/freeChat/javaScript/rukou.js
......@@ -75,15 +75,23 @@ define(['zepto', 'medtap'], function($, medtap) {
}); */
var getTalk = setInterval(function() {
chat.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
if (document.documentElement.scrollHeight > document.documentElement.clientHeight) {
setTimeout(function() {
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}, 5000)
$('input').on('focus',function(){
$('input').on('focus', function() {
clearInterval(getTalk);
});
$('input').on('blur',function(){
$('input').on('blur', function() {
var getTalk = setInterval(function() {
chat.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
if (document.documentElement.scrollHeight > document.documentElement.clientHeight) {
setTimeout(function() {
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}, 5000)
});
},
......@@ -187,9 +195,9 @@ define(['zepto', 'medtap'], function($, medtap) {
if (res.success == true) {
//window.location.reload();
chat.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
//window.scrollTo(0, document.documentElement.clientHeight);
$('#sendMsg').val('')
}else{
} else {
medtap.winPop(res.resultDesc)
}
}
......@@ -249,7 +257,7 @@ define(['zepto', 'medtap'], function($, medtap) {
'</div>' +
'</div>' +
'</div>';
} else{
} else {
html += '<div class="chat_item chat_item_left">' +
'<p class="message_time">' + record[i].createTime.substring(5, 16) + '</p>' +
'<div class="chat_info_warp clearfix">' +
......@@ -263,55 +271,64 @@ define(['zepto', 'medtap'], function($, medtap) {
'</div>' +
'</div>';
}
}else if (record[i].contentType == 10) {
var content = JSON.parse(record[i].content);
html += '<div class="service_message img_consult clearfix" style="margin-bottom:0.2rem;" data-id="'+content.orderSn+'">' +
'<div class="service_left_box sevice_img_consult">' +
'<img src="images/consult_order_twzx_png@2x.png" >' +
'<p class="service_title">图文咨询</p>' +
'<p class="service_price">' + content.payFee + '</p>' +
'</div>' +
'<div class="service_right_box service_message_detail">' +
'<p class="detail_patient_name">' + content.texts[0] + '</p>' +
'</div>' +
'</div>';
}else if(record[i].contentType == 11){
} else if (record[i].contentType == 10) {
var content = JSON.parse(record[i].content);
html += '<div class="service_message consult_box clearfix" data-id="'+content.orderSn+'">'+
'<div class="service_left_box sevice_consult">'+
'<img src="images/consult_order_twzx_png@2x.png" >'+
'<p class="service_title">私人医生</p>'+
'<p class="service_price">' + content.payFee + '</p>'+
'</div>'+
'<div class="service_right_box service_message_detail">'+
/* '<p class="detail_patient_name">患者：张天问</p>'+ */
'<p class="detail_question">' + content.texts[1] + '</p>'+
'</div>'+
'</div>';
}else if(type == 3){
html += '<div class="service_message img_consult clearfix" style="margin-bottom:0.2rem;" data-id="' +
content.orderSn + '">' +
'<div class="service_left_box sevice_img_consult">' +
'<img src="images/consult_order_twzx_png@2x.png" >' +
'<p class="service_title">图文咨询</p>' +
'<p class="service_price">' + content.payFee + '</p>' +
'</div>' +
'<div class="service_right_box service_message_detail">' +
'<p class="detail_patient_name">' + content.texts[0] + '</p>' +
'</div>' +
'</div>';
} else if (record[i].contentType == 11) {
var content = JSON.parse(record[i].content);
html += '<div class="service_message consult_box clearfix" data-id="' + content.orderSn + '">' +
'<div class="service_left_box sevice_consult">' +
'<img src="images/consult_order_twzx_png@2x.png" >' +
'<p class="service_title">私人医生</p>' +
'<p class="service_price">' + content.payFee + '</p>' +
'</div>' +
'<div class="service_right_box service_message_detail">' +
/* '<p class="detail_patient_name">患者：张天问</p>'+ */
'<p class="detail_question">' + content.texts[1] + '</p>' +
'</div>' +
'</div>';
} else if (type == 3) {
var content = record[i].content;
content.replace(/\n/g,"<br>");
html += '<p class="system_msg">'+content.replace(/\n/g,"<br>")+'</p>';
content.replace(/\n/g, "<br>");
html += '<p class="system_msg">' + content.replace(/\n/g, "<br>") + '</p>';
}
}
}
if (chat.offset == 1) {
$('.chat_list').html(html);
window.scrollTo(0, document.documentElement.clientHeight);
if (document.documentElement.scrollHeight > document.documentElement.clientHeight) {
setTimeout(function() {
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
} else {
$('.chat_list').prepend(html);
window.scrollTo(0, document.documentElement.clientHeight);
if (document.documentElement.scrollHeight > document.documentElement.clientHeight) {
setTimeout(function() {
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}
$('.consult_box').unbind().bind('click',function(){
$('.consult_box').unbind().bind('click', function() {
var id = $(this).attr('data-id');
//medtap.pushWindow('../../wechat_lung_prvivateDoctor/pages/pmdDetail.html?id=' + id + '&wechatId=' + medtap.getRequest('wechatId'));
window.location.href = 'medtapdoc://medtap.cn/order/detail?orderSn=' + id;
});
$('.img_consult').unbind().bind('click',function(){
$('.img_consult').unbind().bind('click', function() {
var id = $(this).attr('data-id');
//medtap.pushWindow('../../wechat_lung_imgConsult/pages/imgConsultDetail.html?id=' + id + '&wechatId=' + medtap.getRequest('wechatId'));
window.location.href = 'medtapdoc://medtap.cn/order/detail?orderSn='+ id;
window.location.href = 'medtapdoc://medtap.cn/order/detail?orderSn=' + id;
})
}
})
......
app/doctor/img_consult/javaScript/rukou.js
......@@ -18,21 +18,29 @@ define(['zepto', 'medtap'], function($, medtap) {
init: function() {
main.getOrderDetail();
main.bindEve();
var getTalk = setInterval(function() {
main.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
}, 5000)
$('input').on('focus',function(){
clearInterval(getTalk);
});
$('input').on('blur',function(){
var getTalk = setInterval(function() {
main.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}, 5000)
});
$('input').on('focus',function(){
clearInterval(getTalk);
});
$('input').on('blur',function(){
var getTalk = setInterval(function() {
main.getTalkRecord();
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}, 5000)
});
},
bindEve: function() {
$('.close_info_btn').unbind().bind('click', function() {
......@@ -64,7 +72,9 @@ define(['zepto', 'medtap'], function($, medtap) {
//取消订单
$('.refer_btn').unbind().bind('click', function() {
main.rejectOrder();
})
});
},
getOrderDetail: function() {
$.ajax({
......@@ -100,27 +110,60 @@ define(['zepto', 'medtap'], function($, medtap) {
str = '';
}
$('.content_item_imgList').html(str);
$('.content_item_imgList img').unbind().bind('click', function() {
var imgObject = {};
var imgSelect = $(this).index();
var imgIndex = 0;
var urls = [],
picUrl = "";
[].forEach.call($('.content_item_imgList img'),function(item,index){
if($(item).index() == imgSelect){
imgIndex = index;
}
urls.push($(item).attr('src'));
})
imgObject.imgList = urls;
imgObject.imgIndex = imgIndex;
try {
if (!WebAPI) {
}
try {
WebAPI.showImages(imgObject);
} catch (e) {
}
} catch (e) {
}
})
$('.help_area').val(imgConsultDetail.expectationHelp || '');
//订单状态判断
if (detail.status == 0) {
/* if (detail.status == 0) {
} else if (detail.status.key == 1) {
if (imgConsultDetail.serviceStatus.key == 2) {
$('.footer_btn').show();
$('.footer').hide();
} else {
$('.footer_btn').hide();
$('.footer').show();
main.getTalkRecord(imgConsultDetail.clientId);
main.getPmdOrderInfo(imgConsultDetail.clientId);
}
}else if(detail.status.key == 3){
} else if (detail.status.key == 3) {
$('.footer_btn').hide();
$('.footer').hide();
} */
if (imgConsultDetail.serviceStatus.key == 2) {
$('.footer_btn').show();
$('.footer').hide();
} else if (imgConsultDetail.serviceStatus.key == 10) {
$('.footer_btn').hide();
$('.footer').hide();
main.getTalkRecord(imgConsultDetail.clientId);
main.getPmdOrderInfo(imgConsultDetail.clientId);
} else {
$('.footer_btn').hide();
$('.footer').show();
main.getTalkRecord(imgConsultDetail.clientId);
main.getPmdOrderInfo(imgConsultDetail.clientId);
}
var userId = res.content.order.clientId;
$('.go_emr').unbind().bind('click',function(){
$('.go_emr').unbind().bind('click', function() {
medtap.pushNewWindow('../patientInfoByOrder/myEMR.html?userId=' + userId)
})
}
......@@ -168,7 +211,7 @@ define(['zepto', 'medtap'], function($, medtap) {
headers: medtap.getHeaders(),
data: JSON.stringify({
userId: userId,
orderSn:main.orderSn
orderSn: main.orderSn
}),
success: function(res) {
medtap.jzz(0);
......@@ -243,20 +286,28 @@ define(['zepto', 'medtap'], function($, medtap) {
'</div>' +
'</div>' +
'</div>';
} else if (record[i].contentType == 3) {
var content = record[i].content;
content.replace(/\n/g, "<br>");
html += '<p class="system_msg">' + content.replace(/\n/g, "<br>") + '</p>'
}
} else if (record[i].contentType == 3) {
var content = record[i].content;
content.replace(/\n/g, "<br>");
html += '<p class="system_msg">' + content.replace(/\n/g, "<br>") + '</p>'
}
}
}
if (main.offset == 1) {
$('.chat_list').html(html);
window.scrollTo(0, document.documentElement.clientHeight);
if (document.documentElement.scrollHeight > document.documentElement.clientHeight) {
setTimeout(function() {
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
} else {
$('.chat_list').prepend(html);
window.scrollTo(0, document.documentElement.clientHeight);
if (document.documentElement.scrollHeight > document.documentElement.clientHeight) {
setTimeout(function() {
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
};
}
}
})
......@@ -282,7 +333,7 @@ define(['zepto', 'medtap'], function($, medtap) {
main.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
$('#sendMsg').val('')
}else{
} else {
medtap.winPop(res.resultDesc)
}
}
......
app/doctor/userInformation/javaScript/myEMR.js
......@@ -10,7 +10,13 @@ define(['zepto', 'medtap'], function($, medtap) {
//原生路由跳转
//发消息
$('.sendMsg').unbind().bind('click', function() {
window.location.href = 'medtapdoc://medtap.cn/chat/touser?userId=' + myEmr.userId;
//window.location.href = 'medtapdoc://medtap.cn/chat/touser?userId=' + myEmr.userId;
var status = $('.attention').attr('data-attention');
if(status == 'yes'){
window.location.href = 'medtapdoc://medtap.cn/chat/touser?userId=' + myEmr.userId;
}else{
medtap.winPop('相互关注后才可以发消息')
}
});
//反馈互动
$('.feedback').unbind().bind('click', function() {
......
app/doctor/userInformation/myEMR.html
......@@ -181,7 +181,7 @@
</div>
</div>
<div class="sendMsg">
发消息
患者互动
</div>
<div class="dialog dialog-open dialog-modal" data-style="ios" id="showDialog">
<div class="dialog-overlay"></div>
......
medtap_bbs_lung/javaScript/newCard.js
......@@ -225,7 +225,7 @@ define(['zepto', 'medtap'], function($, medtap) {
if(detailInfo.hasOwnProperty('picUrls')){
var imgHtml = ''
for(var i = 0;i < detailInfo.picUrls.length;i++){
imgHtml += '<img src="'+detailInfo.picUrls[i]+'" >';
imgHtml += /* '<img src="'+detailInfo.picUrls[i]+'" >'; */
'<div class="image_files_item">' +
'<img src="'+detailInfo.picUrls[i]+'" class="image_files_img" imgkey="'+detailInfo.picUrls[i]+'">' +
'<img src="../images/post_delete_btn@2x.png" class="image_del" >' +
......
wechat_lung_chat/css/freeChat.css
body{
background:#F6F6FC;
font-size:0.32rem;
body {
background: #F6F6FC;
font-size: 0.32rem;
}
.chat_info{
background:#fff;
padding:0.4rem 0.32rem 0.15rem 0.32rem;
border-bottom:0.01rem solid #f1f1f1
.chat_top_header {
position: fixed;
top: 0;
width: 100%;
}
.chat_info .info_warp{
float:left;
.chat_info {
background: #fff;
padding: 0.4rem 0.32rem 0.15rem 0.32rem;
border-bottom: 0.01rem solid #f1f1f1
}
.chat_info .info_warp .info_profile{
width:0.96rem;
height:0.96rem;
border-radius:50%;
float:left;
.chat_info .info_warp {
float: left;
}
.chat_info .info_warp .info_detail{
float:left;
margin-top:0.08rem;
margin-left:0.2rem;
.chat_info .info_warp .info_profile {
width: 0.96rem;
height: 0.96rem;
border-radius: 50%;
float: left;
}
.chat_info .info_warp .info_detail .info_name{
margin-bottom:0.08rem;
color:#111;
font-weight:600;
.chat_info .info_warp .info_detail {
float: left;
margin-top: 0.08rem;
margin-left: 0.2rem;
}
.chat_info .info_warp .info_detail .assistant_name{
margin-top:0.2rem;
.chat_info .info_warp .info_detail .info_name {
margin-bottom: 0.08rem;
color: #111;
font-weight: 600;
}
.chat_info .info_warp .info_detail .info_title{
color:#999999
.chat_info .info_warp .info_detail .assistant_name {
margin-top: 0.2rem;
}
.assistant_info{
margin-left:0.8rem;
.chat_info .info_warp .info_detail .info_title {
color: #999999
}
.service_btn_list {
width:100%;
float:left;
margin-top:0.1rem;
}
.service_btn_list .service_btn{
width:1.92rem;
height:0.48rem;
line-height:0.48rem;
display:inline-block;
text-align:center;
color:#37D488;
border:0.01rem solid #37D488;
border-radius:0.04rem;
font-size:0.2rem;
margin:0.15rem;
}
.top_btn{
width:100%;
background:#fff;
text-align:center;
padding-top:0.24rem;
padding-bottom:0.24rem;
}
.top_btn span{
color:#1D8AEF;
font-size:0.28rem;
}
.top_btn img{
width:0.24rem;
}
.open_info_btn{
.no_follow {
position: fixed;
width: 0.8rem;
t: fixed;
top: 1.2rem;
font-size: 0.24rem;
left: 0.4rem;
background: #e0e0e0;
text-align: center;
border-radius: 0.08rem;
color: #999;
display:none;
}
.assistant_info {
margin-left: 0.8rem;
}
.service_btn_list {
width: 100%;
float: left;
margin-top: 0.2rem;
}
.service_btn_list .service_btn {
width: 1.92rem;
height: 0.48rem;
line-height: 0.48rem;
display: inline-block;
text-align: center;
color: #37D488;
border: 0.01rem solid #37D488;
border-radius: 0.04rem;
font-size: 0.2rem;
margin: 0.15rem;
}
.top_btn {
width: 100%;
background: #fff;
text-align: center;
padding-top: 0.24rem;
padding-bottom: 0.24rem;
}
.top_btn span {
color: #1D8AEF;
font-size: 0.28rem;
}
.top_btn img {
width: 0.24rem;
}
.open_info_btn {
display: none;
}
/*chat*/
.chat_list{
margin-top:0.8rem;
padding:0 0.32rem;
padding-bottom:1rem;
}
.chat_list .chat_item{
margin-bottom:0.32rem
}
.chat_list .chat_item .message_time{
width:100%;
text-align:center;
color:#999999;
font-size:0.28rem;
}
.chat_list .chat_item .chat_info_warp .chat_profile{
width:0.8rem;
height:0.8rem;
border-radius:50%;
float:left;
}
.chat_list .chat_item .chat_info_warp .chat_message_warp{
float:left;
margin-left:0.16rem;
}
.chat_from_name{
font-size:0.24rem;
color:#333;
}
.chat_message{
max-width:4.66rem;
padding:0.28rem 0.32rem;
margin-top:0.2rem;
font-size:0.3rem;
word-break:break-word;
}
.chat_message_from{
background:#fff;
border-radius:0.24rem 0.24rem 0.24rem 0;
}
.chat_message_send{
background:#2CBCA0;
color:#fff;
border-radius:0.28rem 0.28rem 0 0.28rem;
}
.chat_list .chat_item_right .chat_info_warp .chat_profile{
float:right;
margin-top:0.2rem;
margin-left:0.2rem;
}
.chat_list .chat_item_right .chat_info_warp .chat_message_warp{
float:right;
}
.service_message .service_left_box{
width:1.44rem;
height:1.36rem;
text-align:center;
padding:0.16rem 0;
float:left;
}
.service_message .service_left_box img{
width:0.4rem;
height:0.4rem;
}
.service_message .service_left_box .service_title{
color:#fff;
font-size:0.24rem;
margin-top:0.16rem;
}
.service_message .service_left_box .service_price{
margin-top:0.04rem;
font-size:0.2rem;
color:#fff;
}
.sevice_img_consult{
background:#37D488;
}
.service_message .service_right_box{
width:5.42rem;
height:1.36rem;
background:#fff;
padding:0.2rem;
float:left;
font-size:0.28rem;
color:#333;
}
.service_right_box .detail_patient_name{
margin-bottom:0.2rem
}
.consult_box{
background:#FC624A;
margin-top:0.2rem;
}
.footer{
width:100%;
height:1.12rem;
background:#fff;
padding:0.24rem;
position:fixed;
bottom:0
}
.footer .footer_input{
float:left;
}
.footer .footer_input input{
width:5.3rem;
height:0.64rem;
background:#F9F9F9;
border:none;
border-radius:0.08rem;
padding-left:0.2rem;
font-size:0.3rem;
}
.footer .send{
width:1.28rem;
height:0.64rem;
line-height:0.64rem;
text-align:center;
background:#37D488;
color:#fff;
font-size:0.32rem;
float:left;
border-radius:0.08rem;
margin-left:0.3rem;
}
.system_msg{
text-align:center;
margin-bottom:0.2rem;
font-size:0.24rem;
.chat_list {
margin-top: 3.8rem;
padding: 0 0.32rem;
padding-bottom: 1rem;
}
.chat_list .chat_item {
margin-bottom: 0.32rem
}
.chat_list .chat_item .message_time {
width: 100%;
text-align: center;
color: #999999;
font-size: 0.28rem;
}
.chat_list .chat_item .chat_info_warp .chat_profile {
width: 0.8rem;
height: 0.8rem;
border-radius: 50%;
float: left;
}
.chat_list .chat_item .chat_info_warp .chat_message_warp {
float: left;
margin-left: 0.16rem;
}
.chat_from_name {
font-size: 0.24rem;
color: #333;
}
.chat_message {
max-width: 4.66rem;
padding: 0.28rem 0.32rem;
margin-top: 0.2rem;
font-size: 0.3rem;
word-break: break-word;
}
.chat_message_from {
background: #fff;
border-radius: 0.24rem 0.24rem 0.24rem 0;
}
.chat_message_send {
background: #2CBCA0;
color: #fff;
border-radius: 0.28rem 0.28rem 0 0.28rem;
}
.chat_list .chat_item_right .chat_info_warp .chat_profile {
float: right;
margin-top: 0.2rem;
margin-left: 0.2rem;
}
.chat_list .chat_item_right .chat_info_warp .chat_message_warp {
float: right;
}
.service_message .service_left_box {
width: 1.44rem;
height: 1.36rem;
text-align: center;
padding: 0.16rem 0;
float: left;
}
.service_message .service_left_box img {
width: 0.4rem;
height: 0.4rem;
}
.service_message .service_left_box .service_title {
color: #fff;
font-size: 0.24rem;
margin-top: 0.16rem;
}
.service_message .service_left_box .service_price {
margin-top: 0.04rem;
font-size: 0.2rem;
color: #fff;
}
.sevice_img_consult {
background: #37D488;
}
.service_message .service_right_box {
width: 5.42rem;
height: 1.36rem;
background: #fff;
padding: 0.2rem;
float: left;
font-size: 0.28rem;
color: #333;
}
.service_right_box .detail_patient_name {
margin-bottom: 0.2rem
}
.consult_box {
background: #FC624A;
margin-top: 0.2rem;
}
.footer {
width: 100%;
height: 1.12rem;
background: #fff;
padding: 0.24rem;
position: fixed;
bottom: 0;
z-index: 100;
}
.footerOn {
top: 0;
}
.footer .footer_input {
float: left;
}
.footer .footer_input input {
width: 5.3rem;
height: 0.64rem;
background: #F9F9F9;
border: none;
border-radius: 0.08rem;
padding-left: 0.2rem;
font-size: 0.3rem;
}
.footer .send {
width: 1.28rem;
height: 0.64rem;
line-height: 0.64rem;
text-align: center;
background: #37D488;
color: #fff;
font-size: 0.32rem;
float: left;
border-radius: 0.08rem;
margin-left: 0.3rem;
}
.system_msg {
text-align: center;
margin-bottom: 0.2rem;
font-size: 0.24rem;
}
.card {
border-radius: 0.08rem;
background: #fff;
......@@ -263,16 +327,18 @@ body{
height: 0.96rem;
margin-right: 0.08rem
}
.service_btn_list .service_none{
background:#F9F9F9;
border:none;
color:#999
}
.go_emr{
width:100%;
height:0.6rem;
line-height:0.6rem;
text-align:center;
border-top:0.01rem solid #f1f1f1;
color:#1D8AEF
}
\ No newline at end of file
.service_btn_list .service_none {
background: #F9F9F9;
border: none;
color: #999
}
.go_emr {
width: 100%;
height: 0.6rem;
line-height: 0.6rem;
text-align: center;
border-top: 0.01rem solid #f1f1f1;
color: #1D8AEF
}
wechat_lung_chat/javaScript/freeChat.js
......@@ -17,6 +17,7 @@ define(['zepto', 'medtap'], function($, medtap) {
init: function() {
chat.bindEve();
chat.talkRelation();
chat.getAttention();
/* $(window).scroll(function() {
var scrollTop = $(this).scrollTop(); //滚动条距离顶部的高度
var scrollHeight = $(document).height(); //当前页面的总高度
......@@ -31,9 +32,14 @@ define(['zepto', 'medtap'], function($, medtap) {
chat.refreshRecord(1);
}
}); */
var getTalk = setInterval(function() {
chat.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}, 5000)
$('input').on('focus',function(){
$('body').scrollTop(0);
......@@ -43,20 +49,29 @@ define(['zepto', 'medtap'], function($, medtap) {
$('body').scrollTop(0);
var getTalk = setInterval(function() {
chat.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}, 5000)
});
/* $(window).scroll(function(){
clearInterval(getTalk);
}) */
},
bindEve: function() {
$('.close_info_btn').unbind().bind('click', function() {
$('.chat_info').hide();
$(this).hide();
$('.chat_list').css('margin-top','1rem;')
$('.open_info_btn').show();
});
$('.open_info_btn').unbind().bind('click', function() {
$('.chat_info').show();
$(this).hide();
$('.chat_list').css('margin-top','3.6rem;')
$('.close_info_btn').show();
});
......@@ -69,8 +84,12 @@ define(['zepto', 'medtap'], function($, medtap) {
} else {
chat.sendMsg();
}
//$('.footer').removeClass('footerOn')
});
/* $('#sendMsg').unbind().bind('focus',function(){
$('.footer').addClass('footerOn')
}) */
},
//绑定，获取聊天关系
......@@ -102,6 +121,8 @@ define(['zepto', 'medtap'], function($, medtap) {
//$('.assistant_title').html('')
$('.assistant_profile').attr('src',res.content.talkRealtion.helperProfile);
chat.getTalkRecord();
}else{
chat.getToken()
}
}
})
......@@ -125,7 +146,13 @@ define(['zepto', 'medtap'], function($, medtap) {
//window.location.reload();
chat.getTalkRecord();
$('#sendMsg').val('');
window.scrollTo(0, document.documentElement.clientHeight);
//window.scrollTo(0, document.documentElement.clientHeight);
//$(document).scrollTop($(document).height());
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}else{
medtap.toast({
message:res.resultDesc
......@@ -143,7 +170,7 @@ define(['zepto', 'medtap'], function($, medtap) {
async: false,
data: {
offset: chat.offset,
limit: 10,
limit: 50,
relationId: chat.relationId,
orderSn: '',
},
......@@ -238,9 +265,18 @@ define(['zepto', 'medtap'], function($, medtap) {
//$('.chat_list').html(html);
if (chat.offset == 1) {
$('.chat_list').html(html);
//window.scrollTo(0, document.documentElement.clientHeight);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
} else {
$('.chat_list').prepend(html);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}
$('.consult_box').unbind().bind('click',function(){
var id = $(this).attr('data-id');
......@@ -251,7 +287,8 @@ define(['zepto', 'medtap'], function($, medtap) {
var id = $(this).attr('data-id');
medtap.pushWindow('../../wechat_lung_imgConsult/pages/imgConsultDetail.html?id=' + id + '&wechatId=' + medtap.getRequest('wechatId'));
})
window.scrollTo(0, document.documentElement.clientHeight);
//window.scrollTo(0, document.documentElement.clientHeight);
}
})
},
......@@ -270,7 +307,7 @@ define(['zepto', 'medtap'], function($, medtap) {
async: false,
data: {
offset: chat.offset,
limit: 10,
limit: 50,
relationId: chat.relationId,
orderSn: '',
operateType: operateType,
......@@ -361,6 +398,55 @@ define(['zepto', 'medtap'], function($, medtap) {
}
})
},
getAttention:function(){
medtap.loading(1);
medtap.submitAjax({
url: 'https://testdevgw.medtap.cn/user/friend/getAttention',
type: "get",
async: false,
data: {
doctorId: parseInt(chat.doctorId)
},
success: function(res) {
medtap.loading(0);
if (res.success == true) {
var status = res.content.doctorUserFriendType;
if(status != 'FOLLOW_TYPE_FRIEND'){
$('.no_follow').show();
}else{
$('.no_follow').hide();
}
}
}
})
},
getToken:function(){
localStorage.wxLungToken = '';
medtap.loading(1);
medtap.submitAjax({
url: 'https://testdevgw.medtap.cn/user/auth/token',
type: 'POST',
async: false,
contentType: 'application/json',
data: {
wechatId: medtap.getRequest('wechatId')
},
success: function(res) {
medtap.loading(0);
if (res.success == true) {
var token = res.content.token;
localStorage.setItem('wxLungToken', token);
//main.checkUser();
window.location.reload();
} else {
}
},
error: function(res) {
console.log(res.resultDesc);
}
})
}
}
chat.init();
......
wechat_lung_chat/javaScript/imgConsultChat.js
......@@ -36,7 +36,11 @@ define(['zepto', 'medtap'], function($, medtap) {
var getTalk = setInterval(function() {
chat.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}, 5000)
$('input').on('focus',function(){
$('body').scrollTop(0);
......@@ -46,7 +50,11 @@ define(['zepto', 'medtap'], function($, medtap) {
$('body').scrollTop(0);
var getTalk = setInterval(function() {
chat.getTalkRecord();
window.scrollTo(0, document.documentElement.clientHeight);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}, 5000)
});
},
......@@ -139,23 +147,20 @@ define(['zepto', 'medtap'], function($, medtap) {
$('.help_area').val(imgConsultDetail.expectationHelp || '');
//订单状态判断
if (detail.status == 0) {
/* if (detail.status == 0) {
} else if (detail.status.key == 1) {
if (imgConsultDetail.serviceStatus.key == 2) {
$('.footer_btn').show();
$('.footer').hide();
} /* else {
$('.footer_btn').hide();
$('.footer').show();
} */
else if(imgConsultDetail.serviceStatus.key == 10){
$('.footer_btn').hide();
$('.footer').hide();
}else{
$('.footer_btn').hide();
$('.footer').show();
}
} */
if (imgConsultDetail.serviceStatus.key == 2) {
$('.footer_btn').show();
$('.footer').hide();
} else if(imgConsultDetail.serviceStatus.key == 10){
$('.footer_btn').hide();
$('.footer').hide();
}else{
$('.footer_btn').hide();
$('.footer').show();
}
//病历id
var emrId = imgConsultDetail.emrId;
......@@ -191,6 +196,8 @@ define(['zepto', 'medtap'], function($, medtap) {
$('.doctor_title').html(res.content.talkRealtion.technologyProfessional.value)
chat.getTalkRecord();
}else{
chat.getToken();
}
}
})
......@@ -300,11 +307,20 @@ define(['zepto', 'medtap'], function($, medtap) {
if (chat.offset == 1) {
$('.chat_list').html(html);
//window.scrollTo(0, document.documentElement.clientHeight);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
} else {
$('.chat_list').prepend(html);
if(document.documentElement.scrollHeight > document.documentElement.clientHeight){
setTimeout(function(){
document.documentElement.scrollTop = document.documentElement.scrollHeight;
})
}
}
window.scrollTo(0, document.documentElement.clientHeight);
//window.scrollTo(0, document.documentElement.clientHeight);
}
})
},
......@@ -414,6 +430,33 @@ define(['zepto', 'medtap'], function($, medtap) {
}
})
},
getToken:function(){
localStorage.wxLungToken = '';
medtap.loading(1);
medtap.submitAjax({
url: 'https://testdevgw.medtap.cn/user/auth/token',
type: 'POST',
async: false,
contentType: 'application/json',
data: {
wechatId: medtap.getRequest('wechatId')
},
success: function(res) {
medtap.loading(0);
if (res.success == true) {
var token = res.content.token;
localStorage.setItem('wxLungToken', token);
//main.checkUser();
window.location.reload();
} else {
}
},
error: function(res) {
console.log(res.resultDesc);
}
})
}
}
chat.init();
......
wechat_lung_chat/pages/freeChat.html
......@@ -30,34 +30,39 @@
</head>
<body>
<div id="content">
<div class="chat_info clearfix">
<div class="info_warp doctor_info clearfix">
<img src="" class="info_profile doctor_profile">
<div class="info_detail">
<p class="info_name doctor_name"></p>
<p class="info_title doctor_title"></p>
<div class="chat_top_header">
<div class="chat_info clearfix">
<div class="info_warp doctor_info clearfix">
<img src="" class="info_profile doctor_profile">
<div class="no_follow">
待接入
</div>
<div class="info_detail">
<p class="info_name doctor_name"></p>
<p class="info_title doctor_title"></p>
</div>
</div>
</div>
<div class="info_warp assistant_info clearfix">
<img src="../images/post_title_bg@2x.png" class="info_profile assistant_profile">
<div class="info_detail">
<p class="info_name assistant_name"></p>
<!-- <p class="info_title assistant_title">医生助手</p> -->
<div class="info_warp assistant_info clearfix">
<img src="../images/post_title_bg@2x.png" class="info_profile assistant_profile">
<div class="info_detail">
<p class="info_name assistant_name"></p>
<!-- <p class="info_title assistant_title">医生助手</p> -->
</div>
</div>
<div class="service_btn_list">
<span class="service_btn to_pmd">私人医生</span>
<span class="service_btn to_img_consult">图文咨询</span>
<span class="service_btn to_consult">电话咨询</span>
</div>
</div>
<div class="service_btn_list">
<span class="service_btn pmd">私人医生</span>
<span class="service_btn img_consult">图文咨询</span>
<span class="service_btn consult">电话咨询</span>
<div class="top_btn close_info_btn">
<span>收起团队信息</span>
<img src="../images/up_arrow.png" >
</div>
<div class="top_btn open_info_btn">
<span>展开团队信息</span>
<img src="../images/down_arrow.png" >
</div>
</div>
<div class="top_btn close_info_btn">
<span>收起团队信息</span>
<img src="../images/up_arrow.png" >
</div>
<div class="top_btn open_info_btn">
<span>展开团队信息</span>
<img src="../images/down_arrow.png" >
</div>
<div class="chat_list">
<!-- <div class="chat_item chat_item_left">
......@@ -115,6 +120,9 @@
发送
</div>
</div>
<div class="content_mod">
</div>
</body>
<script type="text/javascript">
require(['../javaScript/freeChat.js'])
......
wechat_lung_chat/pages/imgConsultChat.html
......@@ -84,7 +84,7 @@
</p>
</div>
</div>
<div class="chat_list">
<div class="chat_list" style="margin-top:0.8rem">
</div>
......
wechat_lung_imgConsult/javaScript/index.js
......@@ -198,6 +198,7 @@ define(['zepto','medtap'],function($,medtap){
var result = res.content.result;
imgConsult.isPmd = result.isPmd;
imgConsult.payFee = result.payFee;
$('.img_consult_price').html(result.hasOwnProperty('totalFee') ? result.totalFee + '元 / 次' : '');
if(result.isPmd == true && result.payFee == '0'){
$('.free_tip').show();
$('.needPay').hide();
......
wechat_lung_login/javaScript/createPatientInfo.js
......@@ -728,8 +728,10 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) {
patientInfo.dPicker = new mui.DtPicker({
"type": "date",
"beginYear": 1900,
"endDate": new Date(year, month, day)
"endDate": new Date(year, month, day),
});
patientInfo.dPicker.setSelectedValue("1969-01-01");
patientInfo.dPicker.show(function(rs) {
$('#birth').val(rs.text);
});
......
wechat_lung_myHome/css/myDoctor.css
......@@ -5,6 +5,7 @@ body {
#content{
padding-bottom:1rem;
display:none;
}
.doctor_list_consult_header{
width:100%;
......
wechat_lung_myHome/javaScript/createPatientInfo.js
......@@ -709,6 +709,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) {
"beginYear": 1900,
"endDate": new Date(year, month, day)
});
patientInfo.dPicker.setSelectedValue("1969-01-01");
patientInfo.dPicker.show(function(rs) {
$('#birth').val(rs.text);
});
......
wechat_lung_myHome/javaScript/myDoctor.js
......@@ -35,13 +35,13 @@ define(['zepto','medtap'],function($,medtap){
var html = '';
var attentionHtml = '';
if(data.hasOwnProperty('inviteDoctor') || data.hasOwnProperty('buddyDoctorList') ||data.hasOwnProperty('attentionDoctorList')){
/* if(data.hasOwnProperty('inviteDoctor') || data.hasOwnProperty('buddyDoctorList') ||data.hasOwnProperty('attentionDoctorList')){
$('#content').show();
$('.no_doctor').hide();
}else{
$('#content').hide();
$('.no_doctor').show();
}
} */
if(data.hasOwnProperty('inviteDoctor')){
var str1 = '';
......@@ -180,7 +180,13 @@ define(['zepto','medtap'],function($,medtap){
$('.myAttention').hide();
}
if(html == '' && attentionHtml == ''){
$('.no_doctor').show();
$('#content').hide();
}else{
$('#content').show();
$('.no_doctor').hide();
}
}
})
}
......
wechat_lung_prvivateDoctor/javaScript/pmdDetail.js
......@@ -116,7 +116,8 @@ define(['zepto','medtap'],function($,medtap){
}else{
medtap.pushWindow('../../wechat_lung_consult/rukou.html?doctorId=' + medtap.getRequest('doctorId') + '&pmdOrderSn=' + detail.orderSn + '&wechatId=' + medtap.getRequest('wechatId') + '&doctorname=' + detail.orderDoctorname)
}
})
});
$('.consult').html('电话咨询('+pmd.consultCount +'次)');
}
}
})
......
wechat_lung_prvivateDoctor/pages/pmdDetail.html
......@@ -94,7 +94,7 @@
取消订单
</div>
<div class="footer_btn consult_now">
<span class="btn_orange imgConsult">图文咨询</span>
<span class="btn_orange imgConsult">图文咨询(不限次)</span>
<span class="btn_green consult">电话咨询</span>
</div>
</div>
......
wechat_lung_push_doctor/javaScript/createPatientInfo.js
......@@ -616,7 +616,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) {
if(patientInfo.canSkip == 'true'){
$('.skip').show();
$('.skip').unbind().bind('click',function(){
medtap.pushWindow('doctorHomePage.html?doctorId=' + medtap.getRequest('doctorId') + '&operationType=' + medtap.getRequest('operationType'))
medtap.pushWindow('doctorHomePage.html?doctorId=' + medtap.getRequest('doctorId') + '&operationType=' + medtap.getRequest('operationType') + '&needAttention=attention')
})
}else{
$('.skip').hide();
......@@ -713,6 +713,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) {
"beginYear": 1900,
"endDate": new Date(year, month, day)
});
patientInfo.dPicker.setSelectedValue("1969-01-01");
patientInfo.dPicker.show(function(rs) {
$('#birth').val(rs.text);
});
......@@ -948,7 +949,7 @@ define(['zepto', 'medtap', 'mui', 'mui.picker'], function($, medtap, mui) {
if(patientInfo.notLung == true){
window.location.replace('createTreatmentInfo.html?emrId=' + emrId + '&doctorId=' + medtap.getRequest('doctorId') + '&operationType=' + medtap.getRequest('operationType'));
}else{
window.location.replace('doctorHomePage.html?doctorId=' + medtap.getRequest('doctorId') + '&operationType=' + medtap.getRequest('operationType'));
window.location.replace('doctorHomePage.html?doctorId=' + medtap.getRequest('doctorId') + '&operationType=' + medtap.getRequest('operationType') + '&needAttention=attention');
}
},1500)
}
......
wechat_lung_push_doctor/javaScript/createTreatmentInfo.js
......@@ -396,7 +396,7 @@ define(['zepto', 'medtap'], function($, medtap) {
time: 1500
});
setTimeout(function() {
window.location.replace('doctorHomePage.html?doctorId=' + medtap.getRequest('doctorId') + '&operationType=' + medtap.getRequest('operationType')); //跳转至医生主页
window.location.replace('doctorHomePage.html?doctorId=' + medtap.getRequest('doctorId') + '&operationType=' + medtap.getRequest('operationType') + '&needAttention=attention'); //跳转至医生主页
}, 1500)
}, 2000)
}
......
wechat_lung_push_doctor/javaScript/doctorHomePage.js
......@@ -5,7 +5,13 @@ define(['zepto', 'medtap'], function($, medtap) {
attention: false,
doctorName: '',
pmdOrderSn: '',
needAttention:medtap.getRequest('needAttention'),
init: function() {
if(!doctor.needAttention){
}else{
doctor.attentionDoctor();
}
doctor.getPmdOrderStatus();
doctor.getDoctorDetail();
doctor.getAttention();
......
wechat_lung_push_doctor/javaScript/rukou.js
......@@ -104,13 +104,13 @@ define(['zepto','medtap'],function($,medtap){
if(patientInfo.length == 0){
//未完善患者信息
if(main.healthType == 'HE1'){
window.location.replace('pages/doctorHomePage.html?wechatId=' + main.wechatId + '&doctorId=' + main.doctorId + '&operationType=' + main.operationType);
window.location.replace('pages/doctorHomePage.html?wechatId=' + main.wechatId + '&doctorId=' + main.doctorId + '&operationType=' + main.operationType + '&needAttention=attention');
}else{
window.location.replace('pages/createPatientInfo.html?wechatId=' + main.wechatId + '&doctorId=' + main.doctorId + '&operationType=' + main.operationType + '&canSkip=false');
}
}else{
//跳转至医生主页
window.location.replace('pages/doctorHomePage.html?wechatId=' + main.wechatId + '&doctorId=' + main.doctorId + '&operationType=' + main.operationType);
window.location.replace('pages/doctorHomePage.html?wechatId=' + main.wechatId + '&doctorId=' + main.doctorId + '&operationType=' + main.operationType + '&needAttention=attention');
}
}
}
......
wechat_lung_push_doctor/pages/doctorHomePage.html
......@@ -121,7 +121,7 @@
</div>
</div>
<div class="sendMsg">
发消息
联系医生
</div>
</div>
<div class="dialog dialog-open dialog-modal" data-style="ios" id="showDialog">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment