4.12患者

This commit is contained in:
zoujiandong 2024-04-12 17:42:34 +08:00
parent ce704785b4
commit e42276f343
9 changed files with 180 additions and 191 deletions

View File

@ -12,14 +12,14 @@ function serviceList(data){ //获取患者检测订单列表
return request('/patient/order/service','GET',data)
};
function serviceDetail(id){ //获取患者检测订单详情
return request('/patient/order/detection/'+id,'GET',{})
return request('/patient/order/service/'+id,'GET',{})
};
function cancelCheckPay(id){ //取消支付
return request('/patient/order/detection/cancel-pay/'+id,'PUT')
return request('/patient/order/cancel-pay/'+id,'PUT')
};
function cancelCheckOrder(id){ //取消支付
return request('/patient/order/detection/cancel/'+id,'PUT')
return request('/patient/order/cancel/'+id,'PUT')
};
function delCheckOrder(id){
return request('/patient/order/detection/'+id,'DELETE')
@ -29,6 +29,9 @@ function serviceList(data){ //获取患者检测订单列表
module.exports={
cancelCheckPay,
cancelCheckOrder,
serviceDetail,
serviceList,
getItems,
getServiceDetail,

View File

@ -83,7 +83,7 @@ Page({
},
goExpertList(){
app.method.navigateTo({
url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail' //'/pages/expertConsult/expertConsult',
url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail' //'/pages/expertConsult/expertConsult',
})
},
changeStatus({ detail }){
@ -172,7 +172,7 @@ Page({
goDetail(event){
let id=event.currentTarget.dataset.id;
app.method.navigateTo({
url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id='+id,
url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+id,
})
},
/**
@ -214,7 +214,7 @@ Page({
let {delId,orderList,changeStatus,changeId}=this.data;
if(delId){
let list=orderList.filter((item)=>{
return item.order_detection_id!=delId
return item.order_service_id!=delId
})
this.setData({
orderList:list
@ -222,7 +222,7 @@ Page({
}else if(changeStatus && changeId){
for (let i = 0; i < orderList.length; i++) {
const item =orderList[i];
if(item.order_detection_id==changeId){
if(item.order_service_id==changeId){
let currentitem=`orderList[${i}].order_service_status`
this.setData({
[currentitem]:changeStatus

View File

@ -14,21 +14,21 @@
</view>
<scroll-view scroll-y="true" bindrefresherrefresh="handleRefresher" refresher-triggered="{{isTriggered}}" refresher-threshold="100" refresher-enabled="true" class="hasdata" bindscrolltolower="lower" wx:if="{{orderList.length>0}}">
<view class="databox">
<view class="datacell" bindtap="goDetail" wx:for="{{orderList}}" wx:key="order_detection_id" data-id="{{item.detection_no}}">
<view class="datacell" bindtap="goDetail" wx:for="{{orderList}}" wx:key="order_service_id" data-id="{{item.order_service_no}}">
<view class="titlebox">
<view class="name" >糖组检测</view>
<view class="name" >{{item.order_service_type==1?'健康包':'随访包'}}</view>
<view class="status" wx:if="{{item.detection_status==1 && item.detection_pay_status==1}}">
<view class="status" wx:if="{{item.order_service_status==1 && item.pay_status==1}}">
<view class="waitpay">待支付</view>
<view class="countdown">
<van-count-down time="{{timeModule.countDown(item.created_at)}}" />
</view>
</view>
<view class="status waitpay" wx:elif="{{item.detection_status==2}}">待绑定</view>
<view class="status waitpay" wx:elif="{{item.detection_status==3}}">检测中</view>
<view class="status" wx:elif="{{item.detection_status==4}}" style="color:#3CC7C0">已开具报告</view>
<view class="status" wx:elif="{{item.detection_status==5 && item.detection_pay_status!=5 }}">已取消</view>
<view class="status" wx:elif="{{item.detection_status==5 && item.detection_pay_status==5}}">
<view class="status waitpay" wx:elif="{{item.order_service_status==2}}">待接诊</view>
<view class="status waitpay" wx:elif="{{item.order_service_status==3}}">服务中</view>
<view class="status" wx:elif="{{item.order_service_status==4}}" >已完成</view>
<view class="status" wx:elif="{{item.order_service_status==5 && item.pay_status!=5 }}">已取消</view>
<view class="status" wx:elif="{{item.order_service_status==5 && item.pay_status==5}}">
<view class="waitpay">支付超时</view>
</view>
@ -40,7 +40,7 @@
<image src="{{img_host+'/doctor_avatar.png'}}" class="headicon" wx:else></image>
<view class="namebox">
<view class="name" wx:if="{{item.user_doctor.user_name}}">{{item.user_doctor.user_name}} <text class="position">{{item.user_doctor.doctor_title}}</text></view>
<view class="name" wx:elif="{{item.detection_status==2}}">平台分配医生中</view>
<view class="name" wx:elif="{{item.order_service_status==2}}">平台分配医生中</view>
<view class="name" wx:else>接诊医生</view>
<view class="hospital" wx:if="{{item.user_doctor.hospital_name}}">
{{item.user_doctor.hospital_name}}
@ -48,6 +48,7 @@
</view>
</view>
</view>
<div class="validatetime" wx:if="{{item.order_service_status==3}}">有效期:{{item.start_time+"-"+item.finish_time}}</div>
<view class="row first">
<view class="name"><text>就</text><text>诊</text><text>人</text></view>
<view class="dot"></view>
@ -56,7 +57,7 @@
{{item.patient_name}}<text wx:if="{{item.patient_sex==0}}">未知</text><text wx:if="{{item.patient_sex==1}}">男</text><text wx:else>女</text><text decode="true" class="agebar"></text><text>{{item.patient_age}}岁)</text></view>
</view>
</view>
<!-- <view class="row rowdesc" wx:if="{{item.detection_status!=1}}">
<!-- <view class="row rowdesc" wx:if="{{item.order_service_status!=1}}">
<view class="name">病情描述</view>
<view class="dot"></view>
<view class="desc">{{item.disease_desc}}</view>
@ -67,7 +68,7 @@
<view class="desc">{{item.created_at}}</view>
</view> -->
<view class="row last" wx:if="{{item.detection_status!=1}}">
<view class="row last" wx:if="{{item.order_service_status!=1}}">
<view class="left">
<view class="name">下单时间</view>
<view class="dot"></view>
@ -78,12 +79,12 @@
<image src="{{img_host+'/righticon.png'}}" class="righticon"> </image>
</view>
</view>
<view class="row rowdesc" wx:if="{{item.detection_status==1}}">
<view class="row rowdesc" wx:if="{{item.order_service_status==1}}">
<view class="name">下单时间</view>
<view class="dot"></view>
<view class="desc">{{item.created_at}}</view>
</view>
<view class="row last" wx:if="{{item.detection_status==1}}">
<view class="row last" wx:if="{{item.order_service_status==1}}">
<view class="left">
<view class="name">待付金额</view>
<view class="dot"></view>

View File

@ -246,6 +246,17 @@ color: #333333;
.infobox .position{
font-weight:normal;
}
.validatetime{
height: 64rpx;
display: flex;
background: #FAFAFA;
padding: 10rpx;
font-size: 28rpx;
color: #333;
margin:20rpx 32rpx 0;
align-items: center;
border-radius: 8rpx;
}
.row{
align-items: center;
padding:0 32rpx;

View File

@ -1,6 +1,6 @@
// pages/medinceOrderDetail/medinceOrderDetail.js
const app = getApp()
import {detectionDetail,bindCheck,cancelCheckPay,delCheckOrder,cancelCheckOrder,checkInquiry} from "../../../api/checkSugar.js"
import {serviceDetail,bindCheck,cancelCheckPay,delCheckOrder,cancelCheckOrder,checkInquiry} from "../../../api/health"
import {cancelPay} from "../../../api/consultOrder"
import {cancelOrder} from "../../../api/consultOrder"
import {fllowDoctor,notfllowDoctor} from "../../../api/consultExpert"
@ -26,7 +26,7 @@ Page({
checkmessage:'',
detection_bar_code:'',
detection_code:'',
order_detection_id:'',
order_service_id:'',
showDialog:false,
message:'',
fromType:'',
@ -137,7 +137,9 @@ Page({
},
goBack(){
let {fromType}=this.data;
console.log(fromType)
if(app.globalData.origion==1){
wx.reLaunch({
url: '/pages/index/index',
@ -155,6 +157,7 @@ Page({
}else{
goUrl='/'+url+"?fromType="+url;
}
console.log(goUrl)
//处理聊天收到消息不及时;
if(url.indexOf("TUIService/pages/index")!=-1){
app.method.navigateTo({
@ -225,7 +228,7 @@ Page({
})
},
handleCheckInquiry:throttle(function(){
let id=this.data.order.order_detection_id;
let id=this.data.order.order_service_id;
checkInquiry(id).then(data=>{
console.log(data);
if(data.status==1){
@ -300,39 +303,7 @@ Page({
// url:"/pages/linkPage/linkPage?url="+encodeURIComponent(url)
// })
}),
handleBindCheck:throttle(function(){
let id=this.data.order.order_detection_id;
let detection_status=this.data.order.detection_status;
if(detection_status==3){
wx.showToast({
title: '您已提交,请等待结果',
icon:"none"
})
return false
}
const {detection_bar_code,fileList}=this.data;
const reg=/^SDB[A-Z](?:2[3-9]|2[0-2])[SP](?:1688[6-9]|1689\d|169\d\d|1[7-9]\d\d\d|[2-9][0-9]{4}|99999)$/;
if(!reg.test(detection_bar_code)){
wx.showToast({
title: '检测码格式不正确',
icon:"none"
})
this.setData({
showError:true
})
return false
}
bindCheck(id,{
detection_bar_code,
detection_pic:fileList
}).then(data=>{
this.handleDetectionDetail();
wx.showToast({
title: '提交成功',
icon:"none"
})
})
}),
goChat:throttle(function(){
let {user_id}=this.data.user_doctor;
let order_inquiry_id=this.data.order.order_inquiry_id;
@ -381,9 +352,9 @@ Page({
url: '/patient/pages/expertDetail/expertDetail?doctor_id='+id,
})
}),
handleDetectionDetail(flag=false){
let id =this.data.order_detection_id;
detectionDetail(id).then(data=>{
handleServiceDetail(flag=false){
let id =this.data.order_service_id;
serviceDetail(id).then(data=>{
if(flag){
let pages = getCurrentPages();
let prevPage = pages[pages.length - 2]; //上一页
@ -437,7 +408,7 @@ confirmCancelOrder(){
this.setData({
showDialog:true,
cancelBtn:true,
message:"是否确定要取消检测"
message:"是否确定要取消订单"
})
},
confirmDelOrder(){
@ -459,7 +430,7 @@ confirm:throttle(function(event){
this.handelDelProduct();
}else if(event.detail && this.data.message=="您确定取消支付么?"){
this.handelCancelPayProduct();
}else if(event.detail && this.data.message=="是否确定要取消检测"){
}else if(event.detail && this.data.message=="是否确定要取消订单"){
this.handelCancelCheckOrder();
}
}),
@ -474,20 +445,17 @@ confirmCheck:throttle(function(){
}
}),
handelCancelCheckOrder(flag=true){
let id =this.data.order.order_detection_id;
let id =this.data.order.order_service_no;
cancelCheckOrder(id).then(data=>{
wx.showToast({
title: '取消成功',
icon:"none"
})
if(!flag){
this.goChat();
}
this.handleDetectionDetail();
this.handleServiceDetail();
})
},
handelCancelPayProduct(flag=true){
let id =this.data.order.order_detection_id;
let id =this.data.order.order_service_no;
cancelCheckPay(id).then(data=>{
wx.showToast({
title: '取消支付成功',
@ -496,7 +464,7 @@ handelCancelPayProduct(flag=true){
if(!flag){
this.handleCheckInquiry();
}
this.handleDetectionDetail();
this.handleServiceDetail();
})
},
copy(event){
@ -506,13 +474,14 @@ copy(event){
})
},
goPay:throttle(function(){
let {order_detection_id,detection_no}=this.data.order;
let {order_service_id,order_service_no,order_service_type}=this.data.order;
let order_type=order_service_type==1?4:5;
app.method.navigateTo({
url: '/patient/pages/payOrder/payOrder?inquiry_no='+ detection_no +"&order_detection_id="+order_detection_id+"&order_type=3&fromType="+encodeURIComponent('/sugarCheck/pages/checkOrder/checkOrder')
url: '/patient/pages/payOrder/payOrder?inquiry_no='+ order_service_no +"&order_service_id="+order_service_no+"&order_type="+order_type+"&fromType="+encodeURIComponent('healthyService/pages/healthyOrder/healthyOrder')
})
}),
handelDelProduct(){
let id =this.data.order.order_detection_id;
let id =this.data.order.order_service_id;
delCheckOrder(id).then(data=>{
let pages = getCurrentPages();
//获取所需页面
@ -582,13 +551,13 @@ toggleFllow(){
fromType:options.fromType
})
}
let order_detection_id=options.order_detection_id;
console.log(order_detection_id)
if(order_detection_id){
let order_service_id=options.order_service_id;
console.log(order_service_id)
if(order_service_id){
this.setData({
order_detection_id
order_service_id
});
this.handleDetectionDetail();
this.handleServiceDetail();
}
},

View File

@ -6,74 +6,33 @@
</view>
<view class="page">
<view class="outwraper {{order.detection_status==2?'active':''}}">
<view class="patientbox">
<view class="outwraper {{order.order_service_status==2?'active':''}}">
<!-- <view class="patientbox">
<view class="patient_name">
就诊人信息
</view>
<view class="rightcon">
{{order.patient_name}}<text wx:if="{{order.patient_sex==1}}">男</text><text wx:elif="{{order.patient_sex==2}}">女</text><text wx:else>未知</text>{{order.patient_age}}岁)
</view>
</view>
<view class="bindbox" wx:if="{{order.detection_status==2 || order.detection_status==3 || order.detection_status==4}}">
<view class="tiptitle" wx:if="{{!showError}}">
<view class="tipleft">
绑定检测码
</view>
<!-- <view class="tipright">
查看手册
</view> -->
</view>
<view class="errorbox" wx:else="{{showError}}">
<view class="errorleft">
<image src="{{img_host+'/check_error.png'}}" class="checkerror" mode=""/>
<text>检测码有误,请重新输入</text>
</view>
<image src="{{img_host+'/check_close.png'}}" class="checkclose" mode="" bindtap="closeError"/>
</view>
<view class="iptbox {{showError?'active':''}}" >
<input type="text" value="{{detection_bar_code}}" class="ipt" placeholder="请输入检测码或扫描条形码绑定" bindinput="chnageIpt" bindblur="bluript" disabled="{{order.detection_status==3 || order.detection_status==4}}"/>
<view class="mybar" wx:if="{{order.detection_status==2}}"></view>
<image src="{{img_host+'/scancode.png'}}" class="scan" mode="" bindtap="goScan" wx:if="{{order.detection_status==2}}"/>
</view>
<view class="tiptitle" hidden="{{(order.detection_status==3 && fileList.length==0)|| (order.detection_status==4 && fileList.length==0)}}">
<view class="tipleft">
检测管照片
</view>
</view>
<view class="uploadbox">
<image wx:for="{{fileList}}" src="{{item}}" mode="aspectFill" class="upload" bindtap="previewImage" data-id="{{idx}}" wx:for-index="idx" wx:key="idx">
<image src="{{img_host+'/xiaoclose.png'}}" class="close" catchtap="delImg" data-id="{{idx}}"></image>
</image>
<view class="upload" bindtap="upload" wx:if="{{order.detection_status==2}}">
<van-icon name="plus" />
<view class="text">
上传
</view>
</view>
</view>
<view class="finish" wx:if="{{order.detection_status==3 || order.detection_status==4 }}">
<view class="left">预计检测完成时间</view>
<view class="right">{{order.detection_success_time}}</view>
</view>
</view>
<view class="rowbox">
</view> -->
<view class="rowbox" style="margin-top: 172rpx;">
<view class="titlebox">
<view class="name">订单信息</view>
<!-- 检测订单状态(1:待支付 2:待绑定 3:检测中 4:检测完成 5:已取消) -->
<!-- 支付状态1:未支付 2:已支付 3:支付中 4:支付失败 5:支付超时 6:支付关闭 7:已撤销 8:转入退款) -->
<view class="status" wx:if="{{order.detection_status==1}}">
<view class="status" wx:if="{{order.order_service_status==1}}">
<view class="waitpay">待支付</view>
<view class="countdown">
<van-count-down time="{{filter.countDown(order.created_at)}}" />
</view>
</view>
<view class="status waitpay" wx:elif="{{order.detection_status==2}}">待绑定</view>
<view class="status waitpay" wx:elif="{{order.detection_status==3}}">检测中</view>
<view class="status" wx:elif="{{order.detection_status==4}}" style="color:#3CC7C0">检测完成</view>
<view class="status" wx:elif="{{order.detection_status==5 && order.detection_pay_status!=5 }}">取消检测</view>
<view class="status waitpay" wx:elif="{{order.detection_status==5 && order.detection_pay_status==5}}">支付超时</view>
<view class="status waitpay" wx:elif="{{order.order_service_status==2}}">待接诊</view>
<view class="status waitpay" wx:elif="{{order.order_service_status==3}}">服务中</view>
<view class="status" wx:elif="{{order.order_service_status==4}}" style="color:#3CC7C0">服务完成</view>
<view class="status" wx:elif="{{order.order_service_status==5 && order.pay_status!=5 }}">服务取消</view>
<view class="status waitpay" wx:elif="{{order.order_service_status==5 && order.pay_status==5}}">支付超时</view>
</view>
<view class="row first">
<view class="namebox">
@ -81,11 +40,11 @@
<view class="dot"></view>
</view>
<view class="rightbox">
<view class="desc">{{order.detection_no}}</view>
<view class="desc">{{order.order_service_no}}</view>
<view class="bar">
|
</view>
<view class="copy" bindtap="copy" data-text="{{order.detection_no}}">复制</view>
<view class="copy" bindtap="copy" data-text="{{order.order_service_no}}">复制</view>
</view>
</view>
<view class="row">
@ -97,9 +56,9 @@
</view>
<view class="row">
<view class="namebox">
<view class="name">问诊类型</view>
<view class="name">订单类型</view>
<view class="dot"></view></view>
<view class="desc">糖组检测</view>
<view class="desc">{{order.order_service_type==1?"健康包":'随访包'}}</view>
</view>
<view class="row">
<view class="namebox">
@ -107,6 +66,7 @@
<view class="dot"></view>
</view>
<view class="desc rightbox">¥{{order.amount_total}}</view>
</view>
<view class="row">
<view class="namebox">
@ -124,6 +84,7 @@
<view class="desc price rightbox">
¥{{pay_money}}
</view>
<view class="moneydetail">明细<van-icon name="arrow-down" color="#fff" size="12"/></view>
</view>
<view class="row beizhu" wx:if="{{order.cancel_reason}}">
<view class="namebox">
@ -161,16 +122,16 @@
</view>
</view>
<!-- 检测订单状态(1:待支付 2:待绑定 3:检测中 4:检测完成 5:已取消) -->
<view class="contactbox" wx:if="{{order.detection_status==3 || order.detection_status==4}}" bindtap="orderMsg">
<image src="{{img_host+'/kefu.png'}}" class="kefu" mode=""/>
<text>联系客服</text>
<view class="dealbox">
<view class="cancelbtn" wx:if="{{order.order_service_status==2}}" bind:tap="confirmCancelOrder">取消订单</view>
<view class="linkbtn" style="margin-left: 20rpx;" wx:if="{{order.order_service_status==2 || order.order_service_status==3 || order.order_service_status==4 || (order.order_service_status==5 && order.refund_status==2)}}" bindtap="orderMsg">
联系客服
</view>
<view class="contactbox" wx:if="{{order.detection_status==2}}" bindtap="confirmCancelOrder">
<text>取消检测</text>
</view>
<view class="contactbox" wx:if="{{order.detection_status==5}}" bindtap="confirmDelOrder">
<text>删除订单</text>
</view>
</view>
</view>
@ -205,54 +166,30 @@
</view>
<!-- <view class="borderbox">
<view class="goodjob" style="margin-top: 30rpx;">
擅长:{{user_doctor.be_good_at}}
</view>
</view> -->
</view>
<view class="contactbox" style="border:none;" wx:if="{{order.detection_status==2}}" bindtap="orderMsg">
<image src="{{img_host+'/kefu.png'}}" class="kefu" mode=""/>
<text>联系客服</text>
</view>
</view>
</view>
<!-- 检测订单状态(1:待支付 2:待绑定 3:检测中 4:检测完成 5:已取消) -->
<view class="paybox" wx:if="{{order.detection_pay_status==1}}">
<view class="paybox" wx:if="{{order.pay_status==1&& order.order_service_status!=5}}">
<view class="left" bindtap="confirmCancelPay">取消支付</view>
<view class="right" bindtap="goPay">
立即支付
<!-- :¥{{order.payment_amount_total}} -->
</view>
</view>
<view class="paybox" wx:if="{{order.detection_status==2 || order.detection_status==3}}">
<view class="submitbtn {{order.detection_status==3?'active':''}}" bindtap="handleBindCheck">提交</view>
<view class="paybox" style="background-color: transparent;" wx:if="{{order.order_service_status==3 }}">
<view class="submitbtn" bindtap="handleBindCheck">去使用</view>
</view>
<view class="paybox" wx:if="{{order.detection_status==4}}">
<view class="left" bindtap="goReport">查看报告</view>
<view class="right" bindtap="handleCheckInquiry">
<text>报告解读</text>
<image src="{{img_host+'/freetalk.png'}}" class="freetalk" alt=""/>
</view>
</view>
<view class="paybox" wx:if="{{order.detection_status==5}}">
<view class="submitbtn" bindtap="goSugar">重新检测</view>
<view class="paybox" style="background-color: transparent;" wx:if="{{order.order_service_status==4 }}">
<view class="submitbtn" bindtap="handleBindCheck">去续费</view>
</view>
<dialog bind:confirm="confirm" cancelBtn="{{cancelBtn}}" showDialog="{{showDialog}}" message="{{message}}"></dialog>
<van-dialog id="van-dialog" confirm-button-color="#3CC7C0" />
<van-overlay show="{{ showCover }}" wx:if="{{order.detection_status==2}}">
<view class="wrapper">
<image src="{{img_host+'/mask_check1.png'}}" mode="widthFix" class="timg1" lazy-load/>
<image src="{{img_host+'/mask_check2.png'}}" mode="widthFix" class="timg2" lazy-load/>
<view class="button" bindtap="onClickHide">
知道了
</view>
</view>
</van-overlay>
<van-dialog id="van-dialog" confirm-button-color="#3CC7C0" />
<dialog bind:confirm="confirmCheck" cancelBtn="{{true}}" showDialog="{{showCheckDialog}}" message="{{checkmessage}}" confirmtext="继续"></dialog>

View File

@ -252,9 +252,15 @@
}
.copy {
width: 80rpx;
height: 40rpx;
background: #3CC7C0;
border-radius: 6rpx;
height: 40rpx;
color: #000;
color: #fff;width: 80rpx;
height: 40rpx;
background: #3CC7C0;
border-radius: 6rpx;
font-size: 24rpx;
display: flex;
margin-left: 20rpx;
@ -546,7 +552,7 @@
}
.paybox{
bottom:0px;
height: 186rpx;
height: 104rpx;
background: #FFFFFF;
position: absolute;
display: flex;
@ -555,7 +561,7 @@
}
.submitbtn{
width:100%;
margin:16px 32rpx 0;
margin:3px 32rpx 0;
height: 94rpx;
background: #3CC7C0;
border-radius: 47rpx;
@ -570,15 +576,14 @@ color: #FFFFFF;
background: rgba(0,0,0,0.1);
}
.paybox .left{
height: 94rpx;
height: 104rpx;
border-radius: 47rpx;
font-size: 36rpx;
color: rgba(0,0,0,0.85);
border: 1rpx solid rgba(0,0,0,0.65);
margin-left: 32rpx;
color: #999;
flex:1;
font-size: 28rpx;
margin-top: 16rpx;
display: flex;
align-items: center;
justify-content: center;
@ -598,19 +603,19 @@ margin-top: 16rpx;
}
.paybox .right{
position: relative;
margin-right: 32rpx;
margin-top: 16rpx;
color: #FFFFFF;
display: flex;
margin-left: 24rpx;
align-items: center;
justify-content: center;
background: #3CC7C0;
height: 94rpx;
height: 104rpx;
font-size: 36rpx;
color: #FFFFFF;
background: #3CC7C0;
border-radius: 47rpx;
flex:2;
}
.express{
@ -695,7 +700,7 @@ color: rgba(0,0,0,0.85)
display: flex;
}
.rowbox .row{
justify-content: space-between;
/* justify-content: space-between; */
}
.bar{
margin-left: 30rpx;
@ -884,4 +889,45 @@ color: rgba(0,0,0,0.85);
font-size: 28rpx;
font-weight: 400;
color: rgba(0,0,0,0.45);
}
.moneydetail{
width: 96rpx;
height: 40rpx;
background: #3CC7C0;
border-radius: 6rpx;
font-size: 24rpx;
display: flex;
margin-left: 20rpx;
align-items: center;
justify-content: center;
color: #FFFFFF;
}
.dealbox{
display: flex;
margin:20rpx 30rpx 0;
justify-content: flex-end;
}
.linkbtn{
width: 168rpx;
display: flex;
height: 60rpx;
justify-content: center;
align-items: center;
font-size: 28rpx;
color: #FFFFFF;
border-radius: 29rpx;
background-color: #3CC7C0;
}
.cancelbtn{
width: 168rpx;
display: flex;
height: 60rpx;
justify-content: center;
align-items: center;
font-size: 28rpx;
color: #FFFFFF;
border-radius: 29rpx;
background: #CECECE;
}

View File

@ -43,6 +43,7 @@ Page({
address_id: '',
product_ids: [],
order_detection_id:'',
order_service_id:'',
order_product_id: '',
fromType: '',
showDing:false,
@ -78,8 +79,10 @@ Page({
order_inquiry_id,
order_type,
order_detection_id,
order_service_id,
fromType
} = this.data;
console.log( order_type, order_service_id)
if (order_type == 1) {
if (fromType) {
if (fromType == "detail") {
@ -103,7 +106,7 @@ Page({
})
}
}else if(order_type==3){
console.log("2222");
if (fromType) {
wx.redirectTo({
url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id=' + order_detection_id + "&fromType=" + fromType,
@ -113,6 +116,16 @@ Page({
delta: 1,
})
}
}else if(order_type==4 || order_type==5){
if (fromType) {
wx.redirectTo({
url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id=' + order_service_id + "&fromType=" + fromType,
})
} else {
wx.navigateBack({
delta: 1,
})
}
}else {
if (fromType) {
wx.redirectTo({
@ -268,6 +281,11 @@ Page({
this.setData({
order_detection_id:data.order_no
})
}else if(order_type==4 || order_type==5){
this.setData({
order_service_id:data.order_no
})
}
let {
@ -621,21 +639,25 @@ Page({
})
}else if(options.order_type==4){//随访包订单
let order_service_id=options.order_service_id;
this.setData({
order_type: 4,
doctor_id: options.doctor_id,
inquiry_type:options.inquiry_type,
order_no: options.inquiry_no,
chat_id: options.chat_id,
order_service_id:order_service_id?order_service_id:'',
inquiry_mode: options.inquiry_mode
})
}else if(options.order_type==5){//健康包订单
let order_service_id=options.order_service_id;
this.setData({
order_type:5,
doctor_id: options.doctor_id,
inquiry_type:options.inquiry_type,
order_no: options.inquiry_no,
chat_id: options.chat_id,
order_service_id:order_service_id?order_service_id:'',
inquiry_mode: options.inquiry_mode
})
}else {

View File

@ -508,7 +508,7 @@ copy(event){
goPay:throttle(function(){
let {order_detection_id,detection_no}=this.data.order;
app.method.navigateTo({
url: '/patient/pages/payOrder/payOrder?inquiry_no='+ detection_no +"&order_detection_id="+order_detection_id+"&order_type=3&fromType="+encodeURIComponent('/sugarCheck/pages/checkOrder/checkOrder')
url: '/patient/pages/payOrder/payOrder?inquiry_no='+ detection_no +"&order_detection_id="+order_detection_id+"&order_type=3&fromType="+encodeURIComponent('sugarCheck/pages/checkOrder/checkOrder')
})
}),
handelDelProduct(){