diff --git a/Pages/yishi/wenzhen_v2/wenzhen.js b/Pages/yishi/wenzhen_v2/wenzhen.js index e5f3c0c..5b85726 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.js +++ b/Pages/yishi/wenzhen_v2/wenzhen.js @@ -320,6 +320,7 @@ Page({ let remaining_quantity=cloudCustomDataJson.remaining_quantity; let service_period=cloudCustomDataJson.service_period; let monthly_frequency=cloudCustomDataJson.monthly_frequency; + let month_inquiry_count=cloudCustomDataJson.month_inquiry_count; let order_inquiry_id = cloudCustomDataJson.order_inquiry_id; if(!order_inquiry_id) return; let inquiry_type = cloudCustomDataJson.inquiry_type; @@ -374,6 +375,7 @@ Page({ session_item.service_period=service_period; session_item.remaining_quantity=remaining_quantity; session_item.monthly_frequency= monthly_frequency; + session_item.month_inquiry_count= month_inquiry_count; session_item.message_type = type; session_item.order_inquiry_id = order_inquiry_id; session_item.inquiry_type = inquiry_type; diff --git a/Pages/yishi/wenzhen_v2/wenzhen.wxml b/Pages/yishi/wenzhen_v2/wenzhen.wxml index 28d6f96..96d25ed 100644 --- a/Pages/yishi/wenzhen_v2/wenzhen.wxml +++ b/Pages/yishi/wenzhen_v2/wenzhen.wxml @@ -49,21 +49,22 @@ {{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }} - - 服务期限:{{item.service_package_start_time}}-{{item.service_package_finish_time}} + 服务内容:服务周期{{item.service_period/30}}个月 + + 服务期限:{{item.service_package_start_time}}-{{item.service_package_finish_time}} 服务进度:不限次数问诊 服务进度:当月剩余{{item.remaining_month_inquiry_count}}次问诊 - 服务内容:服务周期{{item.service_period/30}}个月 - - 服务期限:{{item.service_package_start_time}}-{{item.service_package_finish_time}} + 服务内容:{{item.monthly_frequency==='0'?'不限':item.monthly_frequency}}次问诊/月,30盒肝爽颗粒(步长) + + 服务期限:{{item.service_package_start_time}}-{{item.service_package_finish_time}} 服务进度:当月不限次问诊 当月剩余{{item.remaining_month_inquiry_count}}次问诊,剩余{{item.remaining_quantity}}盒干爽颗粒(步长) - 服务内容:{{item.monthly_frequency==='0'?'不限':item.monthly_frequency}}次问诊/月,30盒肝爽颗粒(步长) + {{item.custommessagetype==13?'[附赠回复]':item.last_message_content.Text}} diff --git a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js index 27e4a43..5d5dace 100644 --- a/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js +++ b/TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js @@ -256,6 +256,7 @@ Component({ is_system: 0, message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, @@ -821,6 +822,7 @@ this.setData({ is_system: 0, message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, @@ -1247,6 +1249,7 @@ this.setData({ is_system: 0, message_rounds: message_rounds, remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count, + month_inquiry_count:serviceInfo.month_inquiry_count, service_package_start_time:serviceInfo.start_time, service_package_finish_time:serviceInfo.finish_time, service_period:serviceInfo.service_period, diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxml b/TUIChatService/TUIKit/components/TUIChat/index.wxml index cb04830..4c73457 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.wxml +++ b/TUIChatService/TUIKit/components/TUIChat/index.wxml @@ -3,7 +3,7 @@ diff --git a/TUIChatService/TUIKit/components/TUIChat/index.wxss b/TUIChatService/TUIKit/components/TUIChat/index.wxss index f015d3d..9cc3438 100644 --- a/TUIChatService/TUIKit/components/TUIChat/index.wxss +++ b/TUIChatService/TUIKit/components/TUIChat/index.wxss @@ -334,8 +334,8 @@ color: #FF9C00; box-sizing: border-box; width:100%; height: 72rpx; - background: #facd91; + background: #FFFCF2; font-size: 28rpx; font-weight: 400; -color: #db0f22; +color: #FF9C00; } \ No newline at end of file