diff --git a/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js b/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js
index 9a8bbfe..aa46d9a 100644
--- a/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js
+++ b/TUICallKit/TUICallKit/component/SingleCall/SingleCall.js
@@ -44,6 +44,18 @@ Component({
type: Boolean
}
},
+ pageLifetimes: {
+ show: function() {
+ // 页面被展示
+ },
+ hide: function() {
+ // 页面被隐藏
+ this.hangup()
+ },
+ resize: function(size) {
+ // 页面尺寸变化
+ }
+ },
data:{
IMG_DEFAULT_AVATAR:`${PATH}/default_avatar.png`,
IMG_HANGUP:`${PATH}/hangup.png`,
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
index 0687481..a0ca95f 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
@@ -256,7 +256,40 @@ Component({
}];
return renderDom;
}
-
+ if (customMessage.message_type === 16){
+
+ let data = customMessage.data;
+ const renderDom = [{
+ type: 'video_time_16',
+ title: customMessage.title,
+ desc: customMessage.desc,
+
+ }];
+ return renderDom;
+ }
+ //13 赠送对话
+ if (customMessage.message_type ===13){
+ let data = customMessage.data;
+ const renderDom = [{
+ type: 'send_talk',
+ title: customMessage.title,
+ desc: customMessage.desc,
+
+ }];
+ return renderDom;
+ }
+ //17 预约时间
+ if (customMessage.message_type === 17){
+
+ let data = customMessage.data;
+ const renderDom = [{
+ type: 'video_time',
+ title: customMessage.title,
+ desc: customMessage.desc,
+
+ }];
+ return renderDom;
+ }
} catch (error) {}
// 客服咨询
@@ -271,6 +304,7 @@ Component({
}];
return renderDom;
}
+
} catch (error) {}
// 音视频通话消息解析
try {
@@ -344,11 +378,11 @@ Component({
console.log(params);
if(!ismine){//未填写
app.method.navigateTo({
- url:'/pages/inquiryForm/inquiryForm?params='+params+"&order_inquiry_id="+id
+ url:'/patient/pages/inquiryForm/inquiryForm?params='+params+"&order_inquiry_id="+id
})
}else{//已填写
app.method.navigateTo({
- url:'/pages/inquiryForm/inquiryForm?case_filled_fields='+params+"&order_inquiry_id="+id
+ url:'/patient/pages/inquiryForm/inquiryForm?case_filled_fields='+params+"&order_inquiry_id="+id
})
}
// app.go(url);
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
index b36a789..84bbfab 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
@@ -103,5 +103,13 @@
+
+
+
+ {{renderDom[0].desc}}
+
+
+ {{renderDom[0].desc}}
+
\ No newline at end of file
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
index 3bc9c76..f570e7f 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
@@ -422,4 +422,13 @@ color: #666666;
background: rgb(255, 255, 255);
border: 1rpx solid #D8D8D8;
border-style: none none solid solid
- }
\ No newline at end of file
+ }
+ .videotime{
+ font-size: 28rpx;
+ text-align: center;
+ line-height: 44rpx;
+ color: rgba(0,0,0,0.65);
+ }
+ .video_time_16{
+ display: none;
+ }
\ No newline at end of file
diff --git a/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml b/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml
index 6f06d45..7a17240 100644
--- a/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml
+++ b/TUIService/TUIKit/components/TUIChat/components/MessageList/index.wxml
@@ -3,7 +3,7 @@
没有更多啦
-
+
{{messageTime}}
@@ -49,7 +49,7 @@
-
+
diff --git a/api/consultExpert.js b/api/consultExpert.js
index 472637b..47ee1ad 100644
--- a/api/consultExpert.js
+++ b/api/consultExpert.js
@@ -39,6 +39,9 @@ function fllowDoctor(id){
function notfllowDoctor(id){
return request('/patient/doctor/follow/'+id,'DELETE')
}
+function getService(id){//获取医生开启的服务列表
+ return request('/doctor/inquiry/service/'+id,'GET')
+ }
module.exports={
doctorList,
@@ -53,6 +56,8 @@ module.exports={
getCountry,
commentList,
fllowDoctor,
- notfllowDoctor
+ notfllowDoctor,
+ getService
+
}
\ No newline at end of file
diff --git a/app.json b/app.json
index b8ecb89..6ba862e 100644
--- a/app.json
+++ b/app.json
@@ -3,63 +3,62 @@
"pages/index/index",
"pages/message/message",
"pages/my/my"
-
],
"subPackages": [
{
- "root": "patient",
- "name": "patient",
- "pages": [
- "pages/login/login",
- "pages/mobileLogin/mobileLogin",
- "pages/expertConsult/expertConsult",
- "pages/expertDetail/expertDetail",
- "pages/selectPatient/selectPatient",
- "pages/writeSick/writeSick",
- "pages/comment/comment",
- "pages/personCenter/personCenter",
-
- "pages/myWelfare/myWelfare",
- "pages/medinceRecord/medinceRecord",
- "pages/myDoctor/myDoctor",
- "pages/familyDoc/familyDoc",
- "pages/memberDetail/memberDetail",
- "pages/address/address",
- "pages/editAddress/editAddress",
- "pages/consultOrder/consultOrder",
- "pages/orderDetail/orderDetail",
- "components/consultList/consultList",
- "pages/sickInfo/sickInfo",
- "pages/myPrescript/myPrescript",
- "pages/prescriptDetail/prescriptDetail",
- "pages/payInfo/payInfo",
- "pages/payOrder/payOrder",
- "pages/medinceOrder/medinceOrder",
- "pages/medinceOrderDetail/medinceOrderDetail",
- "pages/sysMsgDetail/sysMsgDetail",
- "pages/sysMsgList/sysMsgList",
- "pages/fuliMsgList/fuliMsgList",
- "pages/refundMsgList/refundMsgList",
- "pages/quickConsult/quickConsult",
- "pages/applyMedince/applyMedince",
- "pages/medinceList/medinceList",
- "pages/allotDoctor/allotDoctor",
- "pages/search/search",
- "pages/payPlatform/payPlatform",
- "pages/linkPage/linkPage",
- "pages/expressDetail/expressDetail",
- "pages/medinceSearch/medinceSearch",
- "pages/commonSick/commonSick",
- "pages/agreement/agreement",
- "pages/agreeList/agreeList",
- "pages/imgPreview/imgpreview",
- "pages/notify/notify",
- "pages/inquiryForm/inquiryForm",
- "pages/sickManage/sickManage",
- "pages/sickRecord/sickRecord",
- "pages/sickDetail/sickDetail"
- ],
- "independent": false
+ "root": "patient",
+ "name": "patient",
+ "pages": [
+ "pages/login/login",
+ "pages/mobileLogin/mobileLogin",
+ "pages/expertConsult/expertConsult",
+ "pages/expertDetail/expertDetail",
+ "pages/selectPatient/selectPatient",
+ "pages/writeSick/writeSick",
+ "pages/comment/comment",
+ "pages/personCenter/personCenter",
+ "pages/myWelfare/myWelfare",
+ "pages/medinceRecord/medinceRecord",
+ "pages/myDoctor/myDoctor",
+ "pages/familyDoc/familyDoc",
+ "pages/memberDetail/memberDetail",
+ "pages/address/address",
+ "pages/editAddress/editAddress",
+ "pages/consultOrder/consultOrder",
+ "pages/orderDetail/orderDetail",
+ "components/consultList/consultList",
+ "pages/sickInfo/sickInfo",
+ "pages/myPrescript/myPrescript",
+ "pages/prescriptDetail/prescriptDetail",
+ "pages/payInfo/payInfo",
+ "pages/payOrder/payOrder",
+ "pages/medinceOrder/medinceOrder",
+ "pages/medinceOrderDetail/medinceOrderDetail",
+ "pages/sysMsgDetail/sysMsgDetail",
+ "pages/sysMsgList/sysMsgList",
+ "pages/fuliMsgList/fuliMsgList",
+ "pages/refundMsgList/refundMsgList",
+ "pages/quickConsult/quickConsult",
+ "pages/applyMedince/applyMedince",
+ "pages/medinceList/medinceList",
+ "pages/allotDoctor/allotDoctor",
+ "pages/search/search",
+ "pages/payPlatform/payPlatform",
+ "pages/linkPage/linkPage",
+ "pages/expressDetail/expressDetail",
+ "pages/medinceSearch/medinceSearch",
+ "pages/commonSick/commonSick",
+ "pages/agreement/agreement",
+ "pages/agreeList/agreeList",
+ "pages/imgPreview/imgpreview",
+ "pages/notify/notify",
+ "pages/inquiryForm/inquiryForm",
+ "pages/sickManage/sickManage",
+ "pages/sickRecord/sickRecord",
+ "pages/sickDetail/sickDetail",
+ "pages/videoList/videoList"
+ ],
+ "independent": false
},
{
"root": "TUIService",
@@ -67,33 +66,34 @@
"pages/index"
],
"independent": false
- },
-
- {
- "root": "sugarCheck",
- "name": "sugarCheck",
- "pages": [
- "pages/sugarDetail/sugarDetail",
- "pages/sugarSickInfo/sugarSickInfo",
- "pages/checkOrder/checkOrder",
- "pages/checkOrderDetail/checkOrderDetail"
- ],
- "independent": true
},
{
- "root": "TUICallKit",
- "name": "TUICallKit",
- "pages": [
- "pages/globalCall/globalCall"
- ],
- "independent": false
+ "root": "sugarCheck",
+ "name": "sugarCheck",
+ "pages": [
+ "pages/sugarDetail/sugarDetail",
+ "pages/sugarSickInfo/sugarSickInfo",
+ "pages/checkOrder/checkOrder",
+ "pages/checkOrderDetail/checkOrderDetail"
+ ],
+ "independent": true
+ },
+ {
+ "root": "TUICallKit",
+ "name": "TUICallKit",
+ "pages": [
+ "pages/globalCall/globalCall"
+ ],
+ "independent": false
}
],
"preloadRule": {
"TUICallKit/pages/globalCall/globalCall": {
- "network": "all",
- "packages": ["TUICallKit"]
- }
+ "network": "all",
+ "packages": [
+ "TUICallKit"
+ ]
+ }
},
"window": {
"backgroundTextStyle": "light",
diff --git a/assets/images/addComment.png b/assets/images/addComment.png
new file mode 100644
index 0000000..47a302c
Binary files /dev/null and b/assets/images/addComment.png differ
diff --git a/patient/pages/consultOrder/consultOrder.wxml b/patient/pages/consultOrder/consultOrder.wxml
index 45f7d6a..524eb99 100644
--- a/patient/pages/consultOrder/consultOrder.wxml
+++ b/patient/pages/consultOrder/consultOrder.wxml
@@ -16,8 +16,11 @@
- 专家问诊
- 快速问诊
+ 专家问诊-图文
+ 专家问诊-视频
+ 专家问诊-疑难会诊
+ 快速问诊
+ 快速问诊-附赠回复
公益问诊
问诊购药
报告解读
diff --git a/patient/pages/expertDetail/expertDetail.js b/patient/pages/expertDetail/expertDetail.js
index ead7760..8813dd2 100644
--- a/patient/pages/expertDetail/expertDetail.js
+++ b/patient/pages/expertDetail/expertDetail.js
@@ -6,7 +6,8 @@ import {
isReceivepatient,
commentList,
fllowDoctor,
- notfllowDoctor
+ notfllowDoctor,
+ doctorList
} from "../../../api/consultExpert"
import {throttle} from "../../../utils/util"
Page({
@@ -14,6 +15,7 @@ Page({
* 页面的初始数据
*/
data: {
+ tab3Height:500,
img_host:'https://oss.prod.applets.igandanyiyuan.com/applet/patient/static',
showDialog:false,
avatar: '',
@@ -54,14 +56,31 @@ Page({
expertInquiry_price:'',
recieveStatus:0,
commentList: [],
+ hasVideoList:false,
totalComment:0,
isFinished:false,
- isReceivePatient:false //是否可接诊
+ isReceivePatient:false, //是否可接诊
+ service_content:'【医生填写的服务内容】',
+ service_process:'【医生填写的服务流程】'
+ },
+ getHeight(){
+ wx.createSelectorQuery().select('#swiperitem3').boundingClientRect( (rect)=>{
+ this.setData({
+ tab3Height:rect.height*2
+ })
+ console.log('元素高度为:', rect.height)
+ }).exec()
},
handleThrottle:throttle(function(e){
let {type}=e.currentTarget.dataset;
this.goSelectPatient()
}),
+
+ goVideo:throttle(function(){
+ app.method.navigateTo({
+ url:'/patient/pages/videoList/videoList'
+ })
+ }),
goSelectPatient() {
//判断是否能接诊
@@ -110,10 +129,14 @@ bindchange(e){
inquiry_mode:this.data.current_inquiry_config.inquiry_mode
})
}else if(id==1){
+ let {hasVideoList,canVideo}=this.data;
this.setData({
inquiry_type:1,
inquiry_mode:2
})
+ if(hasVideoList && !canVideo){
+ this.goVideo();
+ }
}else {
this.setData({
inquiry_type:1,
@@ -298,6 +321,26 @@ bindchange(e){
})
},
+ getVideoDoctorList(){
+ doctorList({
+ page:1,
+ inquiry_type:1,
+ inquiry_mode:2,
+ per_page:10
+ }).then((res)=>{
+
+ if(res.data.length==0){
+ this.setData({
+ hasVideoList:false
+ });
+
+ }else{
+ this.setData({
+ hasVideoList:true
+ })
+ }
+ })
+ },
getService(id){
doctorService(id).then(res=>{
let doctor_inquiry_config = res;
@@ -321,6 +364,18 @@ bindchange(e){
this.setData({
isFinished:true
})
+ for (let i = 0; i < res.length; i++) {
+ if(res[i].inquiry_type==1 && res[i].inquiry_mode==6){
+ this.setData({
+ service_content: res[i].service_content ,
+ service_process:res[i].service_process
+ })
+ break;
+ }
+ }
+ wx.nextTick(()=>{
+ this.getHeight()
+ })
})
},
/**
@@ -340,7 +395,8 @@ bindchange(e){
})
this.getDeatil(doctor_id);
this.getService(doctor_id);
- this.getEvaluationList()
+ this.getEvaluationList();
+ this.getVideoDoctorList();
},
diff --git a/patient/pages/expertDetail/expertDetail.wxml b/patient/pages/expertDetail/expertDetail.wxml
index 55bb099..38afb51 100644
--- a/patient/pages/expertDetail/expertDetail.wxml
+++ b/patient/pages/expertDetail/expertDetail.wxml
@@ -97,7 +97,7 @@
视频问诊
¥{{videoPrice}}/次
-
+
视频问诊
暂未开通
@@ -118,12 +118,12 @@
-
+
-
-
+
+
通过文字、图片、语音进行咨询
@@ -149,8 +149,8 @@
-
-
+
+
通过视频面对面进行咨询
@@ -190,20 +190,20 @@
-
-
-
-
+
+
+
+
通过文字、图片、语音进行咨询
- 【医生填写的服务内容】;
+ {{service_content}};
- 【医生填写的服务流程】;
+ {{service_process}};
@@ -289,6 +289,7 @@
立即咨询
立即咨询
+ 暂不接诊
立即咨询
{{currentData==0?'暂不接诊':'暂未开通'}}
diff --git a/patient/pages/expertDetail/expertDetail.wxss b/patient/pages/expertDetail/expertDetail.wxss
index 383967d..ca755ee 100644
--- a/patient/pages/expertDetail/expertDetail.wxss
+++ b/patient/pages/expertDetail/expertDetail.wxss
@@ -598,6 +598,7 @@ border-radius: 50%;
}
.tipbox .tipmsg .msg{
font-size: 28rpx;
+ white-space: pre-wrap;
color: rgba(0,0,0,0.65);
}
.swiperbox .swiper-item:nth-child(1) .circle{
diff --git a/patient/pages/orderDetail/orderDetail.js b/patient/pages/orderDetail/orderDetail.js
index 5269958..49d6e76 100644
--- a/patient/pages/orderDetail/orderDetail.js
+++ b/patient/pages/orderDetail/orderDetail.js
@@ -1,8 +1,8 @@
// pages/orderDetail/orderDetail.js
const app = getApp()
-import {cancelOrder,inquiryDetail,inquiryDel,cancelPay} from "../../../api/consultOrder"
+import {cancelOrder,inquiryDetail,inquiryDel,cancelPay,getRate} from "../../../api/consultOrder"
import {fllowDoctor,notfllowDoctor} from "../../../api/consultExpert"
-import {assignDoctor} from "../../../api/consult"
+import {assignDoctor,evaluation} from "../../../api/consult"
import {throttle} from "../../../utils/util"
import Dialog from '@vant/weapp/dialog/dialog';
Page({
@@ -15,13 +15,134 @@ Page({
timer:null,
order_inquiry_id:'',
order:null,
+ showComment:false,
show:false,
+ is_evaluation:false,
message:'',
fromType:'',
showPadding:false,
prevData:'',
+ comment:{},
+ score:5,
img_host:'https://oss.prod.applets.igandanyiyuan.com/applet/patient/static'
},
+ openComment(){
+ this.setData({
+ showComment:true,
+ })
+ },
+ onChangeContent(event) {
+ this.setData({
+ [comment.content]: event.detail
+ })
+ },
+ handleEvaluation: throttle(function () {
+ let{ order_inquiry_id}=this.data;
+ let doctor_id=this.data.order.user_doctor.doctor_id;
+ let {
+ reply_quality,
+ service_attitude,
+ reply_progress,
+ content
+ } = this.data.comment;
+ if (reply_quality == '') {
+ wx.showToast({
+ title: '请评论回复质量',
+ icon: "none"
+ });
+ return false;
+ };
+ if (service_attitude == '') {
+ wx.showToast({
+ title: '请评论服务态度',
+ icon: "none"
+ });
+ return false;
+ };
+ if (content == '') {
+ wx.showToast({
+ title: '请填写您对医生的印象',
+ icon: "none"
+ });
+ return false;
+ };
+ if (reply_progress == '') {
+ wx.showToast({
+ title: '请评论回复速度',
+ icon: "none"
+ });
+ return false;
+ };
+ evaluation({
+ order_inquiry_id,
+ doctor_id:doctor_id,
+ reply_quality,
+ service_attitude,
+ reply_progress,
+ content,
+ }).then(data => {
+ this.setData({
+ showComment: false,
+ is_evaluation:true
+ });
+
+ wx.showToast({
+ title: '评价成功',
+ icon: "none"
+ })
+ })
+ }),
+ handleClose() {
+ this.setData({
+ showComment:false
+ })
+ },
+ onChange(event) {
+ let obj='comment.'+event.target.dataset.id
+ this.setData({
+ [obj]: event.detail
+ });
+ let {
+ reply_quality,
+ service_attitude,
+ reply_progress
+ } = this.data.comment;
+ if (reply_quality && service_attitude && reply_progress) {
+ let score = (reply_quality * 0.4) + (service_attitude * 0.3) + (reply_progress * 0.3);
+ this.setData({
+ score: Math.floor(score)
+ })
+ }
+ },
+ //获取星级评价
+ handleGetRate(id) {
+ getRate(id).then(data => {
+ let commentDetail = null;
+ if (data) {
+ commentDetail = data
+ this.setData({
+ is_evaluation:true,
+ score:data.avg_score
+ })
+ } else {
+ commentDetail = {
+ avg_score: 5,
+ content: "感谢您的服务",
+ evaluation_id: "",
+ reply_progress: 5,
+ reply_quality: 5,
+ service_attitude: 5
+ }
+ this.setData({
+ is_evaluation:false,
+ })
+
+ }
+ this.setData({
+ comment:commentDetail
+ })
+ })
+ },
copy(event){
let text=event.target.dataset.text;
wx.setClipboardData({
@@ -323,6 +444,7 @@ Page({
order_inquiry_id:options.order_inquiry_id
});
this.handleinquiryDetail();
+ this.handleGetRate(options.order_inquiry_id)
},
/**
diff --git a/patient/pages/orderDetail/orderDetail.json b/patient/pages/orderDetail/orderDetail.json
index 919db87..e4b3604 100644
--- a/patient/pages/orderDetail/orderDetail.json
+++ b/patient/pages/orderDetail/orderDetail.json
@@ -1,6 +1,10 @@
{
"usingComponents": {
"consult-list":"../../../components/consultList/consultList",
+ "van-icon": "@vant/weapp/icon/index",
+ "van-rate": "@vant/weapp/rate/index",
+ "van-field": "@vant/weapp/field/index",
+ "van-popup": "@vant/weapp/popup/index",
"dialog":"../../../components/dialog/dialog",
"van-dialog": "@vant/weapp/dialog/index",
"van-count-down": "@vant/weapp/count-down/index"
diff --git a/patient/pages/orderDetail/orderDetail.wxml b/patient/pages/orderDetail/orderDetail.wxml
index 9637d06..d29dea9 100644
--- a/patient/pages/orderDetail/orderDetail.wxml
+++ b/patient/pages/orderDetail/orderDetail.wxml
@@ -7,6 +7,7 @@
+
订单信息
@@ -42,8 +43,11 @@
问诊类型
:
- 专家问诊
- 快速问诊
+ 专家问诊-图文
+ 专家问诊-视频
+ 专家问诊-疑难会诊
+ 快速问诊
+ 快速问诊-附赠回复
公益问诊
问诊购药
糖组检测
@@ -180,4 +184,67 @@
-
\ No newline at end of file
+
+
+
diff --git a/patient/pages/orderDetail/orderDetail.wxss b/patient/pages/orderDetail/orderDetail.wxss
index 26a96c0..8546e22 100644
--- a/patient/pages/orderDetail/orderDetail.wxss
+++ b/patient/pages/orderDetail/orderDetail.wxss
@@ -433,4 +433,203 @@ color: #333333;
.fenpeitip{
font-size: 28rpx;
color: #333333;
-}
\ No newline at end of file
+}
+.datacell{
+ position: relative;
+}
+.comment{
+ top:340rpx;
+ right:0rpx;
+ width:234rpx;
+ height:80rpx;
+ position: absolute;
+}
+
+.tui-cards-container {
+ position: fixed;
+ width: 100vw;
+ height: 100vh;
+ z-index:9999999;
+ top: 0;
+ background: rgba(0, 0, 0, 0.5);
+ display: flex;
+ align-items: flex-end;
+ }
+ .tui-cards-container.hide{
+ display: none;
+ }
+ .service-evaluation {
+ flex: 1;
+ background: #FFFFFF;
+ padding: 38rpx 40rpx 38rpx;
+ border-radius: 40rpx 40rpx 0 0;
+ }
+
+ .header {
+ display: flex;
+ justify-content: space-between;
+ font-family: PingFangSC-Regular;
+ }
+
+ .btn {
+ width: auto !important;
+ padding: 0;
+ margin: 0 !important;
+ background: none;
+ }
+
+ .header label {
+ font-size: 18px;
+ color: #000000;
+ letter-spacing: 0;
+ line-height: 25px;
+ }
+ .van-field__body--textarea{
+ width:600rpx;
+ }
+ .header .btn {
+ font-size: 16px;
+ color: #006EFF;
+ letter-spacing: 0;
+ line-height: 24px;
+ }
+
+ .main {
+ display: flex;
+ flex-direction: column;
+ padding: 8rpx 0 38rpx;
+ }
+
+ .main-evaluation-score {
+ padding: 0 60rpx 48rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-end;
+ }
+
+ .main-evaluation-score .score-star {
+ width: 72rpx;
+ height: 72rpx;
+ }
+
+ .main textarea {
+ background: #F8F8F8;
+ border: 0 solid #D9D9D9;
+ border-radius: 4px;
+ font-size: 14px;
+ padding: 16rpx 32rpx;
+ }
+
+ .textarea-placeholder {
+ color: #B0B0B0;
+ }
+ .footer .btn{
+ height: 80rpx;
+ width:100%;
+ background: #3CC7C0;
+ color:#fff;
+ display: flex;
+ font-size: 30rpx;
+ align-items: center;
+ justify-content: center;
+ border-radius: 10rpx
+ }
+ .chatclose {
+ width: 30rpx;
+ height: 30rpx;
+ position: absolute;
+ padding:10rpx 30rpx;
+
+ right: 10rpx;
+ }
+
+ .doctorInfo {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ }
+
+ .doctorAvatar {
+ width: 120rpx;
+ height: 120rpx;
+ border-radius: 50%;
+ }
+
+ .tui-cards-container .namebox {
+ display: flex;
+ margin-top: 18rpx;
+ align-items: center!important;
+ justify-content: center;
+ }
+
+ .tui-cards-container .namebox .name {
+ color: #333333;
+ font-size: 32rpx;
+ font-weight: normal;
+ }
+
+ .viewstar {
+ margin-top: 28rpx;
+ }
+
+ .tui-cards-container .namebox .position {
+ color: #333333;
+ font-size: 24rpx;
+ margin-left: 8rpx;
+ }
+ .linebox{
+ display: flex;
+ margin-top: 20rpx;
+ align-items: center;
+ }
+ .linebox .line {
+ flex: 1;
+ height:1rpx;
+ background: #CCCCCC;
+ }
+
+ .linebox .pingjia {
+ margin: 0 40rpx;
+ font-weight: 600;
+ color: #333333;
+ }
+
+ .starbox{
+ margin-bottom: 30rpx;
+ display: flex;
+ align-items: center;
+ color: #333333;
+ font-size: 28rpx;
+ }
+ .ratebox{
+ margin-top: 34rpx;
+ }
+
+ .starbox .name{
+ margin-right:22rpx;
+ }
+ .starbox .quality{
+ margin-left:22rpx;
+ }
+ .ipt{
+ height:165rpx;
+ background-color: transparent!important;
+ padding:8rpx!important;
+ }
+ .commentArea{
+ position: relative;
+ }
+
+ .commentArea .van-field__word-limit{
+ position: absolute!important;
+ left:10rpx;
+ right:10rpx;
+ text-align: right;
+ bottom:5rpx;
+ color: #ccc!important;
+ font-size: 24rpx;
+ }
+ .commentArea textarea{
+ min-height:200rpx;
+ }
+
\ No newline at end of file
diff --git a/patient/pages/payOrder/payOrder.wxml b/patient/pages/payOrder/payOrder.wxml
index 5cf70fc..916a941 100644
--- a/patient/pages/payOrder/payOrder.wxml
+++ b/patient/pages/payOrder/payOrder.wxml
@@ -16,7 +16,9 @@
- 专家问诊
+ 专家问诊-图文
+ 专家问诊-视频
+ 专家问诊-疑难会诊
快速问诊
公益问诊
问诊购药
diff --git a/patient/pages/search/search.wxml b/patient/pages/search/search.wxml
index 576f0d8..b409b9d 100644
--- a/patient/pages/search/search.wxml
+++ b/patient/pages/search/search.wxml
@@ -57,12 +57,7 @@
-
diff --git a/patient/pages/search/search.wxss b/patient/pages/search/search.wxss
index 5a4a0be..4db9c11 100644
--- a/patient/pages/search/search.wxss
+++ b/patient/pages/search/search.wxss
@@ -76,7 +76,7 @@ color: #333333;
display: flex;
overflow: hidden;
box-sizing: border-box;
- padding:40rpx 30rpx 30rpx;
+ padding:40rpx 0rpx 30rpx;
width:100%;
border-radius: 10rpx;
background-color: #fff;
diff --git a/patient/pages/videoList/videoList.js b/patient/pages/videoList/videoList.js
new file mode 100644
index 0000000..6a42239
--- /dev/null
+++ b/patient/pages/videoList/videoList.js
@@ -0,0 +1,115 @@
+// patient/pages/videoList/videoList.js
+const app = getApp()
+import {doctorList} from "../../../api/consultExpert"
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ page:1,
+ pageNumber:10,
+ lock:false,
+ doctorList:[],
+ img_host:'https://oss.prod.applets.igandanyiyuan.com/applet/patient/static',
+ },
+ goExpertDetail(event){
+ app.method.navigateTo({
+ url: '/patient/pages/expertDetail/expertDetail?doctor_id='+event.currentTarget.dataset.doctorid
+ })
+ },
+ onfresh(){
+ this.setData({
+ page:1,
+ doctorList:[],
+ lock:false
+ })
+ this.getDoctorList();
+ },
+ lower(e) {
+ let {lock}=this.data;
+ let addPage=this.data.page+1;
+ if(!lock){
+ this.setData({
+ page:addPage
+ });
+ this.getDoctorList();
+ }
+ },
+ getDoctorList(){
+ let {page,pageNumber}=this.data;
+ doctorList({
+ page:page,
+ inquiry_type:1,
+ inquiry_mode:2,
+ per_page:pageNumber
+ }).then((res)=>{
+ let {doctorList}=this.data;
+ if(res.data.length==0){
+ this.setData({
+ lock:true
+ });
+ return false;
+ }else{
+ this.setData({
+ doctorList:doctorList.concat(res.data)
+ })
+ }
+ })
+ },
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ this.getDoctorList();
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/patient/pages/videoList/videoList.json b/patient/pages/videoList/videoList.json
new file mode 100644
index 0000000..8fdde81
--- /dev/null
+++ b/patient/pages/videoList/videoList.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "nav":"../../../components/nav/nav"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/patient/pages/videoList/videoList.wxml b/patient/pages/videoList/videoList.wxml
new file mode 100644
index 0000000..575b81e
--- /dev/null
+++ b/patient/pages/videoList/videoList.wxml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.user_name}}
+ {{item.hospital.hospital_level_name}}
+ 可处方
+
+
+ {{item.doctor_title_name}}{{item.department_custom_name}}
+ {{item.hospital.hospital_name}}
+ 擅长:{{item.be_good_at}}
+
+
+
+
+ 图文问诊:¥{{itemName.inquiry_price}}¥{{moduleFilter.formatPrice(item.doctor_inquiry_config)}}
+ {{itemName.inquiry_mode==1?'图文问诊':itemName.inquiry_mode==2?'视频问诊':'其他问诊'}}:¥{{itemName.inquiry_price}}
+
+
+
+
+
+
+
+ 暂无数据!
+
+
+
\ No newline at end of file
diff --git a/patient/pages/videoList/videoList.wxss b/patient/pages/videoList/videoList.wxss
new file mode 100644
index 0000000..3da1653
--- /dev/null
+++ b/patient/pages/videoList/videoList.wxss
@@ -0,0 +1,200 @@
+/* patient/pages/videoList/videoList.wxss *//* pages/search/search.wxss */
+.page{
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ }
+
+ .searchIpt{
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #999999;
+ }
+
+ .listUl{
+ margin:30rpx 32rpx 0;
+ display: flex;
+ flex-wrap: wrap;
+ }
+ .listUl .cell{
+ width: 154rpx;
+ padding:0 10rpx;
+ box-sizing: border-box;
+ margin-right: 23rpx;
+ margin-bottom: 30rpx;
+ text-align: center;
+ line-height: 60rpx;
+ height: 60rpx;
+ background: #F4F4F4;
+ border-radius: 30rpx;
+ font-size: 28rpx;
+ color: #666666;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ .titlebox{
+ margin:30rpx 32rpx 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+
+ .titlebox .del{
+ width:32rpx;
+ height:32rpx;
+ }
+ .titlebox .name{
+ font-size: 28rpx;
+ color: #333333;
+ }
+ .listUl .cell:nth-child(4n){
+ margin-right: 0rpx;
+ }
+ .viewcell{
+ display: flex;
+ overflow: hidden;
+ box-sizing: border-box;
+ padding:40rpx 0rpx 30rpx;
+ width:100%;
+ border-radius: 10rpx;
+ background-color: #fff;
+ border-bottom: 1rpx solid #E7E7E7;
+ }
+
+ .viewcell .type{
+ height: 32rpx;
+ margin-bottom: 6rpx;
+ line-height: 32rpx;
+ display: flex;
+ white-space: nowrap;
+ align-items: center;
+ margin-left: 18rpx;
+ padding:0rpx 6rpx;
+ background: #ED9C00;
+ border-radius: 4rpx;
+ color: #FFFFFF;
+ font-size: 24rpx;
+ }
+ .doctor_title{
+ margin-right: 10rpx;
+ }
+ .viewcell .hospital{
+ margin-top: 12rpx;
+ color: #333333;
+ word-break: keep-all;
+ font-size: 30rpx;
+ }
+ .goodjob{
+ color: #666666;
+ margin-top: 28rpx;
+ line-height: 42rpx;
+ font-size: 28rpx;
+ word-break: break-all;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2; /* 这里是超出几行省略 */
+ overflow: hidden;
+ }
+ .price{
+
+ font-size: 24rpx;
+ }
+ .price text{
+ margin-left: 5rpx;
+ font-size: 34rpx;
+ color:#EF4F20;
+ }
+ .viewcell .right{
+ flex:1;
+ margin-left: 20rpx;
+ }
+ .viewcell image{
+ width:80rpx;
+ height:80rpx;
+ border-radius:50%;
+ }
+ .namebox{
+ display: flex;
+ font-size: 34rpx;
+ font-weight: 600;
+ color:#333;
+ align-items: flex-end;
+ }
+ .namebox .position{
+ font-weight: normal;
+ margin-left: 15rpx;
+ font-size: 30rpx;
+ }
+ .diseaseType{
+ height: 40rpx;
+ background: #E2FFFE;
+ border-radius: 20rpx;
+ margin-right: 20rpx;
+ border: 1rpx solid #3CC7C0;
+ color: #3CC7C0;
+ font-size: 24rpx;
+ display: inline-flex;
+ text-align: center;
+ padding:0 15rpx;
+ align-items: center;
+ justify-content: center;
+ margin-top: 20rpx;
+ white-space: nowrap;
+ }
+ .detail{
+ margin-top: 20rpx;
+ display: flex;
+ font-size: 24rpx;
+ }
+ .detail view{
+ margin-right:40rpx;
+ }
+
+ .detail view text{
+ font-size: 28rpx;
+ color:#3CC7C0;
+ }
+ .consultbox{
+ height: 60rpx;
+ margin-top: 28rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ }
+ .consult{
+ height: 60rpx;
+ background: #3CC7C0;
+ border-radius: 30rpx;
+ color: #FFFFFF;
+ display: flex;
+ align-items: center;
+ padding:0 20rpx;
+ font-size: 30rpx;
+ }
+ .wraper{
+ display: flex;
+ flex-direction: column;
+ }
+ .scrollwraper{
+ margin-top: 172rpx;
+ flex: 1;
+ overflow-y: scroll;
+ -webkit-overflow-scrolling: touch;
+ }
+ .viewcell .left{
+ position: relative;
+ }
+ .price .expert_prcie{
+ text-decoration: line-through;
+ color:#999;
+ }
+ .price .expert_prcie .priceactive{
+ color:#999;
+ }
+ .pricecell{
+ display: flex;
+ align-items: center;
+ white-space: nowrap;
+ }
\ No newline at end of file