diff --git a/Pages/yishi/my/index.js b/Pages/yishi/my/index.js
index dc2a552..e3558fd 100644
--- a/Pages/yishi/my/index.js
+++ b/Pages/yishi/my/index.js
@@ -6,6 +6,7 @@ Page({
title: "我的",
navHeight: 0,
stateHeight: 0,
+ doctor_title:'',
user_name: "医师姓名",
iden_auth_status: "0",
idcard_status: "0",
@@ -59,6 +60,7 @@ Page({
api.getDoctorCenter().then(response => {
this.setData({
user_name: response.data.user_name,
+ doctor_title:response.data.doctor_title,
iden_auth_status: response.data.iden_auth_status,
idcard_status: response.data.idcard_status,
multi_point_status: response.data.multi_point_status,
diff --git a/Pages/yishi/my/index.wxml b/Pages/yishi/my/index.wxml
index e635942..9132616 100644
--- a/Pages/yishi/my/index.wxml
+++ b/Pages/yishi/my/index.wxml
@@ -9,7 +9,7 @@
- {{user_name}}
+ {{user_name}} {{doctor_title}}
设置
@@ -17,8 +17,8 @@
- {{iden_auth_status==1?'已医师认证':'未医师认证'}}>
- {{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}>
+ {{iden_auth_status==1?'已医师认证':'未医师认证'}}>
+ {{multi_point_status==1?'已多点执业认证':'未多点执业认证'}}>
@@ -48,17 +48,17 @@
- 当日预计收益金额：
- ￥{{estimate_income}}
+ 当日预计收益金额：
+ ￥{{estimate_income}}
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Pages/yishi/my/index.wxss b/Pages/yishi/my/index.wxss
index 0fa6814..32bb99e 100644
--- a/Pages/yishi/my/index.wxss
+++ b/Pages/yishi/my/index.wxss
@@ -4,7 +4,7 @@ page{
.container{
background: linear-gradient(180deg, #3CC7C0 0%, rgba(60,199,192,0) 50%);
- padding-bottom: 70rpx;
+ padding-bottom: 120rpx;
min-height:100vh;
width: 100vw;
color: #fff;
@@ -22,7 +22,7 @@ page{
text-align: center;
}
.info_box{
- margin-top: 24rpx;
+ margin-top: 110rpx;
width: 100%;
height: 200rpx;
position: relative;
@@ -45,17 +45,17 @@ page{
margin-top: 15rpx;
}
.yishi,.zhiye{
- background-color: #00A59D;
+ background: #999999;
border-radius: 20rpx;
height: 44rpx;
line-height: 44rpx;
padding: 0 20rpx;
margin-right: 20rpx;
}
-.zhiye{
- background: #999999;
+.zhiye.active{
+ background: #FAAD14;
}
-.yishi{
+.yishi.active{
background: #FAAD14;
}
.photo{
@@ -148,7 +148,7 @@ color: rgba(0,0,0,0.65);
line-height: 70rpx !important;
}
.van-cell {
- padding: 30rpx !important;
+ padding: 32rpx !important;
}
diff --git a/Pages/yishi/service_notice/index.wxml b/Pages/yishi/service_notice/index.wxml
index 948895a..9c93255 100644
--- a/Pages/yishi/service_notice/index.wxml
+++ b/Pages/yishi/service_notice/index.wxml
@@ -19,6 +19,10 @@
问诊购药
+
+ 糖组检测
+
+
{{item.notice_send_time}}
diff --git a/TUIKit/components/TUIChat/components/MessageInput/index.wxml b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
index f905fa3..979e3a0 100644
--- a/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+++ b/TUIKit/components/TUIChat/components/MessageInput/index.wxml
@@ -1,7 +1,7 @@
查看完整病历
- 在线开处方
+ 在线开处方
=0){
- if(total_rounds-message_rounds<=0 && this.data.baseInfo.inquiry_status==4){
- wx.showToast({
- title: '沟通已达到限制的'+total_rounds+'个回合',
- icon:"none"
- })
- this.finishConsult();
- }
- }
+ // if(total_rounds>=0){
+ // if(total_rounds-message_rounds<=0 && this.data.baseInfo.inquiry_status==4){
+ // wx.showToast({
+ // title: '沟通已达到限制的'+total_rounds+'个回合',
+ // icon:"none"
+ // })
+ // this.finishConsult();
+ // }
+ // }
},
onChangeTime(e) {
@@ -310,13 +310,13 @@ Component({
this.setData({
"rest_time": countdownTime
});
- if(countdownTime==0){
- wx.showToast({
- title: '沟通时长已超过限制时间',
- icon:"none"
- })
- this.finishConsult();
- }
+ //if(countdownTime==0){
+ // wx.showToast({
+ // title: '沟通时长已超过限制时间',
+ // icon:"none"
+ // })
+ // this.finishConsult();
+ // }
} else {
this.setData({
diff --git a/TUIKit/components/TUIChat/index.wxml b/TUIKit/components/TUIChat/index.wxml
index 924f8d8..047ce8d 100644
--- a/TUIKit/components/TUIChat/index.wxml
+++ b/TUIKit/components/TUIChat/index.wxml
@@ -54,7 +54,8 @@
-
+
+