4.26
This commit is contained in:
parent
b3bb9ab9e1
commit
af075ad342
@ -243,6 +243,7 @@ Component({
|
||||
message_rounds:this.data.msgData.msg_round,
|
||||
patient_family_data:this.data.patient_family_data,
|
||||
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,
|
||||
monthly_frequency:serviceInfo.monthly_frequency,
|
||||
@ -570,6 +571,7 @@ pageLifetimes:{
|
||||
message_rounds:this.data.msgData.msg_round,
|
||||
patient_family_data:this.data.patient_family_data,
|
||||
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,
|
||||
@ -916,6 +918,7 @@ pageLifetimes:{
|
||||
message_rounds:this.data.msgData.msg_round,
|
||||
patient_family_data:this.data.patient_family_data,
|
||||
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,
|
||||
@ -981,6 +984,7 @@ pageLifetimes:{
|
||||
message_rounds:this.data.msgData.msg_round,
|
||||
patient_family_data:this.data.patient_family_data,
|
||||
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,
|
||||
|
||||
@ -14,6 +14,15 @@ Page({
|
||||
confirmNext:'确定',
|
||||
order_inquiry_id:'',
|
||||
chat_id:'',
|
||||
showPicker:false,
|
||||
columns:[
|
||||
{text:"本人",value:1},
|
||||
{text:"父母",value:2},
|
||||
{text:"爱人",value:3},
|
||||
{text:"子女",value:4},
|
||||
{text:"亲戚",value:5},
|
||||
{text:"其他 ",value:6}
|
||||
],
|
||||
showWarn:false,
|
||||
status:'',
|
||||
active:0,
|
||||
@ -63,6 +72,25 @@ Page({
|
||||
this.handleCreateServiceChatOrder(order_no)
|
||||
}
|
||||
},
|
||||
onConfirm(event) {
|
||||
const { value} = event.detail;
|
||||
this.setData({
|
||||
relationId: `${value.value}`,
|
||||
relation:`${value.text}`,
|
||||
showPicker:false
|
||||
});
|
||||
},
|
||||
openPicker(){
|
||||
this.setData({
|
||||
showPicker:true
|
||||
})
|
||||
},
|
||||
closePicker(){
|
||||
this.setData({
|
||||
showPicker:false
|
||||
})
|
||||
},
|
||||
|
||||
inputChange(e) {
|
||||
this.setData({
|
||||
[e.target.dataset.id]: e.detail.value
|
||||
|
||||
@ -166,4 +166,9 @@
|
||||
cancel-button-text="取消"
|
||||
>
|
||||
|
||||
</van-dialog>
|
||||
</van-dialog>
|
||||
<van-popup show="{{ showPicker }}" round position="bottom"
|
||||
z-index="9999"
|
||||
custom-style="height:auto" bind:close="closePicker">
|
||||
<van-picker show-toolbar title="选择与患者之间的关系" columns="{{ columns }}" bind:cancel="closePicker" bind:confirm="onConfirm" />
|
||||
</van-popup>
|
||||
@ -15,6 +15,7 @@ Page({
|
||||
data: {
|
||||
confirmText:'确定',
|
||||
restProduct:0,
|
||||
columns:[],
|
||||
showMoneyDetail:true,
|
||||
status:'',
|
||||
order_no:'',
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<wxs src="../../../filters/filter.wxs" module="filter"></wxs>
|
||||
<view class="ui-navigatorbar" style="border-bottom: 1rpx solid #E3E4E5;background:#fff;">
|
||||
<image class="ui-navigatorbar-back" bindtap="goBack" src="{{img_host+'/back.png'}}" />
|
||||
<view class="ui-title">订单详情</view>
|
||||
<view class="ui-title">服务包订单详情</view>
|
||||
</view>
|
||||
<view class="page">
|
||||
|
||||
@ -142,7 +142,7 @@
|
||||
退款关闭
|
||||
</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view class="row" wx:if="{{order.order_refund.length>0}}">
|
||||
<view class="namebox">
|
||||
<view class="name">退款金额</view>
|
||||
<view class="dot">:</view>
|
||||
@ -163,7 +163,7 @@
|
||||
|
||||
|
||||
</view>
|
||||
<view class="quanyibox rowbox " wx:if="{{(order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">
|
||||
<view class="quanyibox rowbox " wx:if="{{(order.order_service_status==1 || order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.pay_status!=5))}}">
|
||||
<view class="topbox">
|
||||
<view class="title">服务权益</view>
|
||||
<view class="row" wx:if="{{order.order_service_status==2 || order.order_service_status==3 || order.order_service_status==4}}">
|
||||
@ -184,7 +184,7 @@
|
||||
</view>
|
||||
<view class="medbox" wx:if="{{equity.order_service_package.order_service_type==2}}">
|
||||
<view class="title">问诊服务</view>
|
||||
<view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order.order_service_status==1 || order.order.order_service_status==2 || (order.order_service_status==5)}}">
|
||||
<view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==1 || order.order_service_status==2 || (order.order_service_status==5)}}">
|
||||
<view class="namebox">
|
||||
<view class="name"><text decode>内 容</text></view>
|
||||
<view class="dot">:</view>
|
||||
@ -193,7 +193,7 @@
|
||||
|
||||
</view>
|
||||
<view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==3 || order.order_service_status==4 }}">
|
||||
<view class="namebox" wx:if="{{!(equity.order_inquiry.length==0 && equity.product.length==0)}}">
|
||||
<view class="namebox" wx:if="{{!(equity.order_inquiry.length==0 && equity.product.length==0) }}">
|
||||
<view class="name">当月剩余</view>
|
||||
<view class="dot">:</view>
|
||||
</view>
|
||||
@ -208,7 +208,7 @@
|
||||
</view>
|
||||
<view class="medbox" wx:if="{{equity.order_service_package.order_service_type==1}}">
|
||||
<view class="title">问诊服务</view>
|
||||
<view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order.order_service_status==1 || order.order.order_service_status==2 || (order.order_service_status==5 && order.pay_status==5)}}">
|
||||
<view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==1 || order.order_service_status==2 || (order.order_service_status==5 && order.pay_status==5)}}">
|
||||
<view class="namebox">
|
||||
<view class="name"><text decode>内 容</text></view>
|
||||
<view class="dot">:</view>
|
||||
@ -217,7 +217,7 @@
|
||||
|
||||
</view>
|
||||
<view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==3}}">
|
||||
<view class="namebox" wx:if="{{!(equity.order_inquiry.length==0 && equity.product.length==0)}}">
|
||||
<view class="namebox" wx:if="{{!(equity.order_inquiry.length==0 && equity.product.length==0) }}">
|
||||
<view class="name">当月剩余</view>
|
||||
<view class="dot">:</view>
|
||||
</view>
|
||||
|
||||
@ -11,6 +11,14 @@ Page({
|
||||
*/
|
||||
data: {
|
||||
order_no:'',
|
||||
columns:[
|
||||
{text:"本人",value:1},
|
||||
{text:"父母",value:2},
|
||||
{text:"爱人",value:3},
|
||||
{text:"子女",value:4},
|
||||
{text:"亲戚",value:5},
|
||||
{text:"其他 ",value:6}
|
||||
],
|
||||
order_inquiry_id:'',
|
||||
chat_id:'',
|
||||
confirmText:'确定',
|
||||
@ -43,6 +51,25 @@ Page({
|
||||
chat_id:'',
|
||||
img_host:app.hostConfig().imghost
|
||||
},
|
||||
onConfirm(event) {
|
||||
const { value} = event.detail;
|
||||
this.setData({
|
||||
relationId: `${value.value}`,
|
||||
relation:`${value.text}`,
|
||||
showPicker:false
|
||||
});
|
||||
},
|
||||
openPicker(){
|
||||
this.setData({
|
||||
showPicker:true
|
||||
})
|
||||
},
|
||||
closePicker(){
|
||||
this.setData({
|
||||
showPicker:false
|
||||
})
|
||||
},
|
||||
|
||||
inputChange(e) {
|
||||
this.setData({
|
||||
[e.target.dataset.id]: e.detail.value
|
||||
|
||||
@ -171,4 +171,8 @@
|
||||
confirm-button-text="{{confirmText}}"
|
||||
>
|
||||
|
||||
</van-dialog>
|
||||
</van-dialog>
|
||||
<van-popup show="{{ showPicker }}" round position="bottom"
|
||||
z-index="9999" custom-style="height:auto" bind:close="closePicker">
|
||||
<van-picker show-toolbar title="选择与患者之间的关系" columns="{{ columns }}" bind:cancel="closePicker" bind:confirm="onConfirm" />
|
||||
</van-popup>
|
||||
@ -27,6 +27,7 @@ Page({
|
||||
prevData: null,
|
||||
pathography_id:'',
|
||||
showdialog: false,
|
||||
order_no:'',
|
||||
showAgreeDialog: false,
|
||||
message: '',
|
||||
order_inquiry_id:'',
|
||||
@ -49,7 +50,6 @@ Page({
|
||||
hideFamilysick: false,
|
||||
showBack: false,
|
||||
is_exist:false,
|
||||
columns: [],
|
||||
fileList: [],
|
||||
lockBtn: false,
|
||||
checkSign: false,
|
||||
@ -521,6 +521,7 @@ Page({
|
||||
service_type:service_type,
|
||||
follow_package_item_id:follow_package_item_id
|
||||
}).then((data) => {
|
||||
console.log(data);
|
||||
let {
|
||||
order_no
|
||||
} = data.data;
|
||||
@ -538,10 +539,11 @@ Page({
|
||||
url: '/patient/pages/payOrder/payOrder?doctor_id=' + doctor_id + '&inquiry_no=' + order_no + "&chat_id=" + chat_id + "&inquiry_type=" + inquiry_type + "&inquiry_mode=" + inquiry_mode + "&fromType=chat&&order_type="+order_type
|
||||
})
|
||||
}else if(data.status==2){
|
||||
|
||||
this.setData({
|
||||
showdialog:true,
|
||||
messageTitle:"当前患者存在进行中问诊订单",
|
||||
order_inquiry_id: order_inquiry_id,
|
||||
order_no: order_no,
|
||||
cancelBtn:true
|
||||
})
|
||||
}
|
||||
@ -685,9 +687,9 @@ Page({
|
||||
})
|
||||
}
|
||||
if(this.data.messageTitle=="当前患者存在进行中问诊订单"){
|
||||
let {order_inquiry_id}=this.data;
|
||||
let {order_no}=this.data;
|
||||
app.method.navigateTo({
|
||||
url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+ order_inquiry_id,
|
||||
url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+order_no,
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user