diff --git a/api/health.js b/api/health.js
index 264be4d..6b7edf3 100644
--- a/api/health.js
+++ b/api/health.js
@@ -26,8 +26,6 @@ function serviceList(data){ //获取患者检测订单列表
};
-
-
module.exports={
cancelCheckPay,
cancelCheckOrder,
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
index 1f85c2a..c7f386a 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.js
@@ -1,6 +1,6 @@
// pages/medinceOrderDetail/medinceOrderDetail.js
const app = getApp()
-import {serviceDetail,bindCheck,cancelCheckPay,delCheckOrder,cancelCheckOrder,checkInquiry} from "../../../api/health"
+import {serviceDetail,cancelCheckPay,delCheckOrder,cancelCheckOrder,checkInquiry} from "../../../api/health"
import {cancelPay} from "../../../api/consultOrder"
import {cancelOrder} from "../../../api/consultOrder"
import {fllowDoctor,notfllowDoctor} from "../../../api/consultExpert"
@@ -155,7 +155,7 @@ Page({
if(url.indexOf('?')!=-1){
goUrl='/'+url+"&fromType="+url;
}else{
- goUrl='/'+url+"?fromType="+url;
+ goUrl='/healthyService/pages/healthyOrder/healthyOrder'
}
console.log(goUrl)
//处理聊天收到消息不及时；
@@ -411,6 +411,12 @@ confirmCancelOrder(){
message:"是否确定要取消订单？"
})
},
+goSickInfo(event){
+ let order_inquiry_id=event.currentTarget.dataset.id;
+ app.method.navigateTo({
+ url: '/patient/pages/sickInfo/sickInfo?order_inquiry_id='+order_inquiry_id
+ })
+ },
confirmDelOrder(){
this.setData({
showDialog:true,
@@ -473,6 +479,7 @@ copy(event){
data:text
})
},
+
goPay:throttle(function(){
let {order_service_id,order_service_no,order_service_type}=this.data.order;
let order_type=order_service_type==1?4:5;
@@ -540,12 +547,7 @@ toggleFllow(){
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- const cover=wx.getStorageSync('showCover');
- if(cover){
- this.setData({
- showCover:false
- })
- }
+
if(options.fromType){
this.setData({
fromType:options.fromType
@@ -558,6 +560,7 @@ toggleFllow(){
order_service_id
});
this.handleServiceDetail();
+
}
},
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
index f2368fb..6916c62 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml
@@ -86,6 +86,26 @@
明细
+
+
+
+ 药 品 费
+ ：
+
+
+ ￥{{order.discount_product_total_amount}}
+
+
+
+
+ 问 诊 费
+ ：
+
+
+ ￥{{(pay_money-order.discount_product_total_amount)}}
+
+
+
备注
@@ -133,8 +153,108 @@
-
+
+
+ 服务权益
+
+
+ 有 效 期
+ ：
+
+ 2012
+
+
+
+ 当月时间
+ ：
+
+ 2012
+
+
+
+ 问诊服务
+
+
+ 内 容
+ ：
+
+ 3个月内，每月2次问诊
+
+
+
+ 药品剩余
+ ：
+
+ 1盒干爽颗粒
+ 收起
+
+
+ 下单时间：2024.12.12
+ 已签收
+
+
+ 下单时间：2024.12.12
+ 已签收
+
+
+
+ 药品服务
+
+
+ 药品剩余
+ ：
+
+ 1盒干爽颗粒
+ 收起
+
+
+ 下单时间：2024.12.12
+ 已签收
+
+
+ 下单时间：2024.12.12
+ 已签收
+
+
+
+ 优惠卷
+
+
+ 内 容
+ ：
+
+
+ 1、 价值5元的全品类药品优惠劵2张
+
+ 2、价值100元的肝胆商城优惠劵1张
+
+
+ 收起
+
+
+ 10元的全品类药品优惠劵
+ 未使用
+
+
+ 100元的肝胆商城优惠劵
+ 注册即发放
+
+
+
+
+
+ 患者信息
+ 查看详情病情信息
+
+
+ {{order.patient_name}}（男女未知，{{order.patient_age}}岁）
+
+ 所患疾病：{{order.case.disease_class_name}}
+ 病情主诉：{{order.case.disease_desc}}
+
+
+
diff --git a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
index 65202ec..cf75460 100644
--- a/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
+++ b/healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss
@@ -3,78 +3,93 @@
.container {
padding-top: 135px;
padding-bottom: 10rpx;
- /* top:280rpx; */
+ /* top:280rpx; */
/* position: absolute; */
- width:100%;
+ width: 100%;
/* overflow-y: scroll; */
background: #F2F2F2;
- }
- input{
+}
+
+input {
font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
- }
- page{
+}
+
+page {
position: relative;
- width:100%;
- height:100%;
+ width: 100%;
+ height: 100%;
font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
- Segoe UI, Arial, Roboto, 'PingFang SC', 'miui', 'Hiragino Sans GB', 'Microsoft Yahei',
- sans-serif;
- }
- .page{
- width:100vw;
- height:100vh;
+ Segoe UI, Arial, Roboto, 'PingFang SC', 'miui', 'Hiragino Sans GB', 'Microsoft Yahei',
+ sans-serif;
+}
+
+.page {
+ width: 100vw;
+ height: 100vh;
background: #f2f2f2;
- }
- .contain{padding: 0 30rpx 0rpx;height: 100%;overflow: hidden;position: relative;}
- ::-webkit-scrollbar {
+}
+
+.contain {
+ padding: 0 30rpx 0rpx;
+ height: 100%;
+ overflow: hidden;
+ position: relative;
+}
+
+::-webkit-scrollbar {
display: none;
width: 0;
height: 0;
color: transparent;
- }
- .van-picker__confirm {
- color:#3CC7C0!important;
- font-size: 32rpx!important;
- }
- .van-picker__title{
- font-weight: 600!important;
- color: rgba(0,0,0,0.9)!important;
- font-size: 32rpx!important;
- }
- .van-picker__cancel{
- color: rgba(0,0,0,0.6)!important;
- font-size: 32rpx!important;
- }
- .nonedata{
- width:100%;
- color:#666;
+}
+
+.van-picker__confirm {
+ color: #3CC7C0 !important;
+ font-size: 32rpx !important;
+}
+
+.van-picker__title {
+ font-weight: 600 !important;
+ color: rgba(0, 0, 0, 0.9) !important;
+ font-size: 32rpx !important;
+}
+
+.van-picker__cancel {
+ color: rgba(0, 0, 0, 0.6) !important;
+ font-size: 32rpx !important;
+}
+
+.nonedata {
+ width: 100%;
+ color: #666;
min-height: 320rpx;
font-size: 28rpx;
display: flex;
justify-content: center;
align-items: center;
- }
- .ui-navigatorbar {
+}
+
+.ui-navigatorbar {
position: fixed;
- z-index:99;
+ z-index: 99;
top: 0;
width: 750rpx;
height: 172rpx;
background: #F2F2F2;
backdrop-filter: blur(20px);
- }
-
- .ui-navigatorbar-back {
+}
+
+.ui-navigatorbar-back {
position: absolute;
- padding-left:40rpx;
- padding-right:40rpx;
- width:30rpx;
- height:60rpx;
+ padding-left: 40rpx;
+ padding-right: 40rpx;
+ width: 30rpx;
+ height: 60rpx;
left: 0rpx;
bottom: 20rpx;
- }
-
- .ui-title {
+}
+
+.ui-title {
position: absolute;
width: 350rpx;
height: 88rpx;
@@ -86,169 +101,184 @@
display: flex;
justify-content: center;
align-items: center;
- }
- .droptitle.active{
- color:#3CC7C0;
- }
- .slotmsg{
+}
+
+.droptitle.active {
+ color: #3CC7C0;
+}
+
+.slotmsg {
-webkit-overflow-scrolling: touch;
- font-size: 28rpx;
- line-height:40rpx;
- max-height:60vh;
- overflow-y: auto;
- padding:48rpx;
- text-align: center;
- }
- .van-dropdown-item__title{
- width:100%!important;
- flex:1;
+ font-size: 28rpx;
+ line-height: 40rpx;
+ max-height: 60vh;
+ overflow-y: auto;
+ padding: 48rpx;
text-align: center;
- }
- .van-dropdown-item__icon{
- z-index:2;
- position: absolute!important;
-
- right:25rpx;
- }
- .van-cell__value{
- flex:none!important;
- z-index:1;
- }
- .onlinebox .icon{
- top:60rpx;
- left:50%;
+}
+
+.van-dropdown-item__title {
+ width: 100% !important;
+ flex: 1;
+ text-align: center;
+}
+
+.van-dropdown-item__icon {
+ z-index: 2;
+ position: absolute !important;
+
+ right: 25rpx;
+}
+
+.van-cell__value {
+ flex: none !important;
+ z-index: 1;
+}
+
+.onlinebox .icon {
+ top: 60rpx;
+ left: 50%;
position: absolute;
margin-left: -48rpx;
- width:96rpx;
- height:34rpx;
- border-radius: 0;
- }
-.page{
- position: relative;
- display: flex;
- flex-direction: column;
- margin-bottom:0rpx;
+ width: 96rpx;
+ height: 34rpx;
+ border-radius: 0;
}
-.outwraper{
- flex:1;
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
- padding-bottom: 200rpx;
+
+.page {
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ margin-bottom: 0rpx;
}
-.outwraper.active{
- padding-bottom: 220rpx;
+
+.outwraper {
+ flex: 1;
+ overflow-y: scroll;
+ -webkit-overflow-scrolling: touch;
+ padding-bottom: 200rpx;
}
+
+.outwraper.active {
+ padding-bottom: 220rpx;
+}
+
.add {
- width: 100%;
- display: flex;
- justify-content: center;
- align-items: center;
- height: 120rpx;
- background: #FFFFFF;
- font-weight: 600;
- color: #ED9C00;
- font-size: 32rpx;
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 120rpx;
+ background: #FFFFFF;
+ font-weight: 600;
+ color: #ED9C00;
+ font-size: 32rpx;
}
-.addicon{
- width: 40rpx;
- height:40rpx;
- flex-shrink: 0;
+
+.addicon {
+ width: 40rpx;
+ height: 40rpx;
+ flex-shrink: 0;
}
+
.addressbox {
- margin-top:172rpx;
- align-items: center;
- display: flex;
- justify-content: space-between;
- padding: 32rpx 32rpx;
- background-color: #fff;
+ margin-top: 172rpx;
+ align-items: center;
+ display: flex;
+ justify-content: space-between;
+ padding: 32rpx 32rpx;
+ background-color: #fff;
}
.addressbox .left {
- display: flex;
- align-items: center;
+ display: flex;
+ align-items: center;
}
.addressbox .icon {
- width: 40rpx;
- flex-shrink: 0;
- height: 47rpx;
+ width: 40rpx;
+ flex-shrink: 0;
+ height: 47rpx;
}
.addressbox .info {
- margin-left: 30rpx;
+ margin-left: 30rpx;
}
.addressbox .ricon {
- width: 24rpx;
- height: 48rpx;
+ width: 24rpx;
+ height: 48rpx;
}
.info .name {
- font-size: 28rpx;
- font-weight: 600;
- color: #333333
+ font-size: 28rpx;
+ font-weight: 600;
+ color: #333333
}
.info .address {
- margin-top: 10rpx;
- color: #333333;
- font-size: 28rpx;
+ margin-top: 10rpx;
+ color: #333333;
+ font-size: 28rpx;
}
+
.row {
- align-items: center;
- padding: 0 32rpx;
- display: flex;
- line-height: 52rpx
+ align-items: center;
+ padding: 0 32rpx;
+ display: flex;
+ line-height: 52rpx
}
.row.first {
- margin-top: 34rpx;
+ margin-top: 34rpx;
}
.rowbox .row .name {
- white-space: nowrap;
- font-size: 28rpx;
- color: #333;
- font-weight: 600;
- display: flex;
- width:114rpx;
- align-items: baseline;
- justify-content: space-between;
+ white-space: nowrap;
+ font-size: 28rpx;
+ color: #333;
+ font-weight: 600;
+ display: flex;
+ width: 114rpx;
+ align-items: baseline;
+ justify-content: space-between;
}
-.row .dot{
- font-weight: 600;
- display: flex;
- align-items: baseline;
+
+.row .dot {
+ font-weight: 600;
+ display: flex;
+ align-items: baseline;
}
+
.row .desc {
- align-items: baseline;
- font-size: 28rpx;
- color: #333;
+ align-items: baseline;
+ font-size: 28rpx;
+ color: #333;
}
.rowdesc {
- align-items: flex-start;
+ align-items: flex-start;
}
.rowdesc .desc {
- text-overflow: -o-ellipsis-lastline;
- overflow: hidden;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-line-clamp: 2;
- line-clamp: 2;
- -webkit-box-orient: vertical
+ text-overflow: -o-ellipsis-lastline;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-line-clamp: 2;
+ line-clamp: 2;
+ -webkit-box-orient: vertical
}
.row .price {
- color: #EF4F20;
- font-weight: bold;
- font-size: 34rpx
+ color: #EF4F20;
+ font-weight: bold;
+ font-size: 34rpx
}
.row.last {
- justify-content: space-between;
+ justify-content: space-between;
}
.copy {
@@ -256,258 +286,281 @@
height: 40rpx;
background: #3CC7C0;
border-radius: 6rpx;
- height: 40rpx;
- color: #fff;width: 80rpx;
-height: 40rpx;
-background: #3CC7C0;
-border-radius: 6rpx;
- font-size: 24rpx;
- display: flex;
- margin-left: 20rpx;
- align-items: center;
- justify-content: center;
- border-radius: 6rpx;
+ height: 40rpx;
+ color: #fff;
+ width: 80rpx;
+ height: 40rpx;
+ background: #3CC7C0;
+ border-radius: 6rpx;
+ font-size: 24rpx;
+ display: flex;
+ margin-left: 20rpx;
+ align-items: center;
+ justify-content: center;
+ border-radius: 6rpx;
}
+
.row .left {
- display: flex;
+ display: flex;
}
.row .right {
- display: flex;
+ display: flex;
}
.titlebox .name {
- color: #000;
- font-size: 34rpx;
+ color: #000;
+ font-size: 34rpx;
}
-.rowbox{
- margin-top: 20rpx;
- background-color: #fff;
- padding-bottom: 30rpx;
+
+.rowbox {
+ margin-top: 20rpx;
+ background-color: #fff;
+ padding-bottom: 30rpx;
}
+
.titlebox {
- padding: 0 32rpx;
- height: 112rpx;
- border-bottom: 1rpx solid #E3E4E5;
- display: flex;
- justify-content: space-between;
- align-items: center;
+ padding: 0 32rpx;
+ height: 112rpx;
+ border-bottom: 1rpx solid #E3E4E5;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
}
-.titlebox .status{
- font-size: 28rpx
+
+.titlebox .status {
+ font-size: 28rpx
}
+
.waitpay {
- text-align: right;
- color: #EF4F20
+ text-align: right;
+ color: #EF4F20
}
.headicon {
- width: 80rpx;
- height: 80rpx;
- border-radius: 50%;
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
}
.van-count-down {
- margin-top: 5rpx;
- color: #EF4F20 !important;
+ margin-top: 5rpx;
+ color: #EF4F20 !important;
}
+
.infobox {
- margin-top: 20rpx;
- background:#fff;
+ margin-top: 20rpx;
+ background: #fff;
}
-.infobox .status{
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
+
+.infobox .status {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #333333;
}
-.infobox .status.wait{
- color: #EF4F20;
+
+.infobox .status.wait {
+ color: #EF4F20;
}
-.infobox .status.timeout{
- color: #EF4F20;
+
+.infobox .status.timeout {
+ color: #EF4F20;
}
+
.infobox .title {
- padding: 0 32rpx;
- background-color: #fff;
- font-size: 34rpx;
- height: 112rpx;
- align-items: center;
- display: flex;
- justify-content: space-between;
- border-bottom: 1rpx solid #E3E4E5;
+ padding: 0 32rpx;
+ background-color: #fff;
+ font-size: 34rpx;
+ height: 112rpx;
+ align-items: center;
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 1rpx solid #E3E4E5;
}
.imgbox {
- border-radius:8rpx;
- border:1rpx solid #ccc;
- width: 200rpx;
- height: 200rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- position: relative;
+ border-radius: 8rpx;
+ border: 1rpx solid #ccc;
+ width: 200rpx;
+ height: 200rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
}
.yaoimg {
- width: 120rpx;
- height: 128rpx;
+ width: 120rpx;
+ height: 128rpx;
}
.imgbox .desc {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- position: absolute;
- top: 50%;
- font-size: 22rpx;
- font-weight: 400;
- color: #666666;
- line-height: 30rpx;
- transform: translateY(-50%);
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ position: absolute;
+ top: 50%;
+ font-size: 22rpx;
+ font-weight: 400;
+ color: #666666;
+ line-height: 30rpx;
+ transform: translateY(-50%);
}
.imgbox .desc .tip {
- text-align: center;
+ text-align: center;
}
.medincebox .cell {
- padding: 30rpx 32rpx;
- display: flex;
- align-items: center;
- border-bottom: 1rpx solid #E3E4E5;
+ padding: 30rpx 32rpx;
+ display: flex;
+ align-items: center;
+ border-bottom: 1rpx solid #E3E4E5;
}
-.medincebox .cell:nth-last-child(2){
- border-bottom:none;
-}
-.rightinfo {
- margin-left: 30rpx;
- flex: 1;
- display: flex;
- flex-direction: column;
- justify-content: center;
+.medincebox .cell:nth-last-child(2) {
+ border-bottom: none;
+}
+
+.rightinfo {
+ margin-left: 30rpx;
+ flex: 1;
+
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
}
.medincebox .cell .name {
- word-break: break-all;
- font-size: 32rpx;
- font-weight: bold;
- color: #333;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
- overflow: hidden;
+ word-break: break-all;
+ font-size: 32rpx;
+ font-weight: bold;
+ color: #333;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ overflow: hidden;
}
-.row.beizhu{
- align-items: flex-start;
+
+.row.beizhu {
+ align-items: flex-start;
}
+
.rightinfo .own {
- margin-top: 47rpx;
- display: flex;
- justify-content: space-between;
- align-items: center;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
+ margin-top: 47rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #333333;
}
-.btnbox{
- display: flex;
- padding:0 32rpx;
- font-size: 30rpx;
- padding-bottom: 30rpx;
- justify-content: flex-end;
+
+.btnbox {
+ display: flex;
+ padding: 0 32rpx;
+ font-size: 30rpx;
+ padding-bottom: 30rpx;
+ justify-content: flex-end;
}
-.btnbox .btn{
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 0 20rpx;
- height:58rpx;
- background: #FFFFFF;
- border-radius: 30rpx;
- margin-left: 20px;
-
+
+.btnbox .btn {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 0 20rpx;
+ height: 58rpx;
+ background: #FFFFFF;
+ border-radius: 30rpx;
+ margin-left: 20px;
+
}
-.btnbox .orderDetail{
- background: #3CC7C0;
- color:#fff;
- border: 1rpx solid #3CC7C0;
+
+.btnbox .orderDetail {
+ background: #3CC7C0;
+ color: #fff;
+ border: 1rpx solid #3CC7C0;
}
-.personinfo{
- margin-top: 20rpx;
- background: #fff;
+
+.personinfo {
+ margin-top: 20rpx;
+ background: #fff;
}
+
.personinfobox {
- padding: 30rpx 32rpx 40rpx;
- background: #fff;
- margin-top: 20rpx;
- margin-bottom:10rpx;
+ padding: 30rpx 32rpx 40rpx;
+ background: #fff;
+ margin-top: 20rpx;
+ margin-bottom: 10rpx;
}
+
.personinfobox .title {
- background-color: #fff;
- font-size: 32rpx;
- height: 112rpx;
- align-items: center;
- display: flex;
- justify-content: space-between;
- border-bottom: 1rpx solid #E3E4E5;
+ background-color: #fff;
+ font-size: 32rpx;
+ height: 112rpx;
+ align-items: center;
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 1rpx solid #E3E4E5;
}
+
.personinfobox .namebox .head {
- width: 80rpx;
- height:80rpx;
- border-radius: 50%;
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
}
.personinfobox .namebox .guanzhu image {
- width: 28rpx;
- height: 26rpx;
+ width: 28rpx;
+ height: 26rpx;
}
.personinfobox .namewraper {
- flex:1;
- display: flex;
+ flex: 1;
+ display: flex;
- justify-content: space-between;
- flex-direction: column;
- margin-left: 20rpx;
+ justify-content: space-between;
+ flex-direction: column;
+ margin-left: 20rpx;
}
-.personinfobox .type {
- height: 32rpx;
- display: flex;
- margin-bottom: 6rpx;
- line-height: 32rpx;
- white-space: nowrap;
- align-items: center;
- margin-left: 18rpx;
- padding: 0rpx 6rpx;
- background: #ED9C00;
- border-radius: 4rpx;
- color: #FFFFFF;
- font-size: 24rpx;
+
+.personinfobox .type {
+ height: 32rpx;
+ display: flex;
+ margin-bottom: 6rpx;
+ line-height: 32rpx;
+ white-space: nowrap;
+ align-items: center;
+ margin-left: 18rpx;
+ padding: 0rpx 6rpx;
+ background: #ED9C00;
+ border-radius: 4rpx;
+ color: #FFFFFF;
+ font-size: 24rpx;
}
.personinfobox .namebox .row {
- display: flex;
- padding:0;
- align-items: flex-end;
+ display: flex;
+ padding: 0;
+ align-items: flex-end;
}
.personinfobox .namebox {
- display: flex;
- align-items:stretch;
+ display: flex;
+ align-items: stretch;
- justify-content: space-between;
+ justify-content: space-between;
}
.personinfobox .namebox .name {
display: inline-block;
overflow: hidden;
- max-width:400rpx;
+ max-width: 400rpx;
text-overflow: ellipsis;
white-space: nowrap;
font-weight: 600;
@@ -516,385 +569,439 @@ border-radius: 6rpx;
}
.personinfobox .position {
- font-size: 30rpx;
- white-space: normal;
- word-break: break-all;
+ font-size: 30rpx;
+ white-space: normal;
+ word-break: break-all;
}
-.doctor_title{
- margin-right: 10rpx;
+
+.doctor_title {
+ margin-right: 10rpx;
}
-.personinfobox .namebox .row{
- line-height: 40rpx;
- align-items: flex-end;
+
+.personinfobox .namebox .row {
+ line-height: 40rpx;
+ align-items: flex-end;
}
+
.personinfobox .hospital {
- margin-top: 12rpx;
- color: #333333;
- font-size: 28rpx;
- white-space: normal;
- word-break: break-all;
+ margin-top: 12rpx;
+ color: #333333;
+ font-size: 28rpx;
+ white-space: normal;
+ word-break: break-all;
}
.personinfobox .namebox .position {
- font-weight: normal;
- white-space: nowrap;
- margin-left: 15rpx;
- font-size: 30rpx;
+ font-weight: normal;
+ white-space: nowrap;
+ margin-left: 15rpx;
+ font-size: 30rpx;
}
+
.personinfobox .goodjob {
- color: #666666;
- margin-top: 38rpx;
- line-height: 42rpx;
- margin-left: 100rpx;
- font-size: 28rpx;
- word-break: break-all;
+ color: #666666;
+ margin-top: 38rpx;
+ line-height: 42rpx;
+ margin-left: 100rpx;
+ font-size: 28rpx;
+ word-break: break-all;
}
-.paybox{
- bottom:0px;
- height: 104rpx;
- background: #FFFFFF;
- position: absolute;
- display: flex;
- z-index:1;
- width:100%;
-}
-.submitbtn{
- width:100%;
- margin:3px 32rpx 0;
- height: 94rpx;
-background: #3CC7C0;
-border-radius: 47rpx;
-display: flex;
-justify-content: center;
-align-items: center;
-font-size: 36rpx;
-color: #FFFFFF;
-}
-.submitbtn.active{
- color: #000000;
- background: rgba(0,0,0,0.1);
-}
-.paybox .left{
- height: 104rpx;
-border-radius: 47rpx;
-font-size: 36rpx;
-color: #999;
- flex:1;
- font-size: 28rpx;
+.paybox {
+ bottom: 0px;
+ height: 104rpx;
+ background: #FFFFFF;
+ position: absolute;
+ display: flex;
+ z-index: 1;
+ width: 100%;
+}
- display: flex;
- align-items: center;
- justify-content: center;
+.submitbtn {
+ width: 100%;
+ margin: 3px 32rpx 0;
+ height: 94rpx;
+ background: #3CC7C0;
+ border-radius: 47rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 36rpx;
+ color: #FFFFFF;
+}
+
+.submitbtn.active {
+ color: #000000;
+ background: rgba(0, 0, 0, 0.1);
+}
+
+.paybox .left {
+ height: 104rpx;
+ border-radius: 47rpx;
+ font-size: 36rpx;
+ color: #999;
+ flex: 1;
+
+ font-size: 28rpx;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
-.orderrow{
- display: flex;
- margin:10rpx 32rpx 0;
- justify-content: flex-end;
+
+.orderrow {
+ display: flex;
+ margin: 10rpx 32rpx 0;
+ justify-content: flex-end;
}
-.freetalk{
- position: absolute;
- width:403rpx;
- height:79rpx;
- top: -53rpx;
- left:25rpx;
+
+.freetalk {
+ position: absolute;
+ width: 403rpx;
+ height: 79rpx;
+ top: -53rpx;
+ left: 25rpx;
}
-.paybox .right{
- position: relative;
+
+.paybox .right {
+ position: relative;
- color: #FFFFFF;
- display: flex;
-
- align-items: center;
- justify-content: center;
- background: #3CC7C0;
- height: 104rpx;
- font-size: 36rpx;
-color: #FFFFFF;
- background: #3CC7C0;
+ color: #FFFFFF;
+ display: flex;
- flex:2;
+ align-items: center;
+ justify-content: center;
+ background: #3CC7C0;
+ height: 104rpx;
+ font-size: 36rpx;
+ color: #FFFFFF;
+ background: #3CC7C0;
+
+ flex: 2;
}
-.express{
-width: 158rpx;
-height: 60rpx;
-display: flex;
-justify-content: center;
-align-items: center;
-background: #F8F8F8;
-font-size: 26rpx;
-font-weight: 400;
-color: #353535;
-border-radius: 6rpx;
-border: 1rpx solid rgba(5,5,5,0.1);
+
+.express {
+ width: 158rpx;
+ height: 60rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #F8F8F8;
+ font-size: 26rpx;
+ font-weight: 400;
+ color: #353535;
+ border-radius: 6rpx;
+ border: 1rpx solid rgba(5, 5, 5, 0.1);
}
-.namenum{
- font-size: 28rpx;
-font-weight: 400;
-color: #333333;
+
+.namenum {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #333333;
}
-.row.wuliu{
- margin-top: 20rpx;
- align-items: flex-start;
+
+.row.wuliu {
+ margin-top: 20rpx;
+ align-items: flex-start;
}
-.row.wuliu .desc{
- margin-left: 20rpx;
+
+.row.wuliu .desc {
+ margin-left: 20rpx;
}
-.desc .dizhi{
- font-size: 28rpx;
-font-weight: 400;
-color: #333333;
-line-height: 28rpx;
+
+.desc .dizhi {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: #333333;
+ line-height: 28rpx;
}
-.wuliucar{
- width:40rpx;
- height:33rpx;
- flex-shrink: 0;
+
+.wuliucar {
+ width: 40rpx;
+ height: 33rpx;
+ flex-shrink: 0;
}
-.row.wuliu .date{
- font-size: 24rpx;
-font-weight: 400;
-color: #666666;
+
+.row.wuliu .date {
+ font-size: 24rpx;
+ font-weight: 400;
+ color: #666666;
}
+
.guanzhu {
- flex-shrink: 0;
- display: flex;
- white-space: nowrap;
- color: #3CC7C0;
- font-size: 30rpx;
- font-weight: 600;
- justify-content: center;
- align-items: center;
- font-size: 24rpx;
+ flex-shrink: 0;
+ display: flex;
+ white-space: nowrap;
+ color: #3CC7C0;
+ font-size: 30rpx;
+ font-weight: 600;
+ justify-content: center;
+ align-items: center;
+ font-size: 24rpx;
}
+
.namebox .guanzhu image {
- width: 35rpx;
- height: 32rpx;
-}
-.patientbox{
- margin-top: 172rpx;
- width:100%;
- box-sizing: border-box;
- padding:0 32rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- height: 109rpx;
-background: #FFFFFF;
-}
-.patient_name{
- font-size: 32rpx;
-font-weight: 400;
-color: rgba(0,0,0,0.85)
-}
-.patientbox .rightcon{
- font-size: 28rpx;
- font-weight: 400;
- color: rgba(0,0,0,0.65)
-}
-.namebox{
- display: flex;
-}
-.rowbox .row{
- /* justify-content: space-between; */
-}
-.bar{
- margin-left: 30rpx;
- color: rgba(0,0,0,0.45);
- height: 40rpx;
- margin-bottom: 5rpx;
- display: flex;
- align-items: center;
-}
-.rightbox{
- display: flex;
- align-items: center;
-}
-.bindbox{
- overflow: hidden;
- padding:0 32rpx 10rpx;
- margin:20rpx 0rpx;
- background: #FFFFFF;
-}
-.errorbox{
- margin-top: 10rpx;
- display: flex;
- height: 80rpx;
-background: #FFF1F0;
-border-radius: 8rpx;
-padding:0 20rpx;
- align-items: center;
- justify-content: space-between;
-}
-.tiptitle{
- height: 80rpx;
- align-items: center;
- display: flex;
- justify-content: space-between;
- margin-top: 10rpx;
-}
-.tipleft{
- font-size: 32rpx;
- color: rgba(0,0,0,0.85);
-}
-.tipright{
- color:#4096FF;
- font-size: 28rpx;
-}
-.iptbox{
- margin-top: 24rpx;
- width:100%;
- height: 78rpx;
-border-radius: 6rpx;
-border: 2rpx solid #3CC7C0;
-display: flex;
-align-items: center;
-}
-.iptbox.active{
- border: 2rpx solid #FF4D4F;
-}
-.mybar{
- height:38rpx;
- margin:0 30rpx;
- width:2rpx;
- background:#3CC7C0 ;
-}
-.ipt{
- margin-left: 20rpx;
- flex:1;
-}
-.scan{
- margin-right: 20rpx;
- width:40rpx;
- height:40rpx;
-}
-.uploadbox{
-
- margin:24rpx 0rpx 0;
- display: flex;
- flex-wrap: wrap ;
-}
-.uploadbox .close{
- z-index:9;
- top:5rpx;
- right:5rpx;
- position: absolute;
- width:30rpx;
- height:30rpx;
-}
-.uploadbox .upload{
- position: relative;
- object-fit: cover;
- display: flex;
- flex-direction: column;
- margin: 5px 19rpx 5px 0;
-}
-.uploadbox .upload:nth-child(4n){
- margin-right: 0;
-}
-.van-icon-plus{
- color:#333;
- font-size: 80rpx!important;
-}
-.upload{
- width: 148rpx;
- height:148rpx;
- display: flex;
- justify-content:center ;
- align-items: center;
- background: #F2F2F2;
- border-radius: 4rpx
-}
-.uploadbox view:first-child{
- margin-left: 0!important;
-}
-.upload .text{
- font-size: 28rpx;
+ width: 35rpx;
+ height: 32rpx;
}
-.errorleft{
- display: flex;
- align-items: center;
+.patientBox {
+ margin-top: 20rpx;
+ width: 100%;
+ box-sizing: border-box;
+
+
+ background: #FFFFFF;
}
-.checkerror{
- margin-right: 10rpx;
- width:40rpx;
- height:40rpx;
+.patientdesc{
+ padding:0 32rpx;
}
-.checkclose{
- width:32rpx;
- height:32rpx;
+.patient_name {
+ font-size: 32rpx;
+ font-weight: 400;
+ color: rgba(0, 0, 0, 0.85)
}
-.wrapper{
- width:100%;
- display: flex;
- align-items: center;
- flex-direction: column;
- justify-content: center;
- margin:285rpx auto;
+
+.patientbox .rightcon {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: rgba(0, 0, 0, 0.65)
}
-.timg1{
- width:694rpx;
+
+.namebox {
+ display: flex;
}
-.timg2{
- width:506rpx;
+
+
+
+.bar {
+ margin-left: 30rpx;
+ color: rgba(0, 0, 0, 0.45);
+ height: 40rpx;
+ margin-bottom: 5rpx;
+ display: flex;
+ align-items: center;
}
-.button{
- display: flex;
- align-items: center;
- justify-content: center;
- width: 224rpx;
- font-size: 32rpx;
-height: 83rpx;
-font-weight: 500;
-margin-top: 72rpx;
-color: #FFFFFF;
-border-radius: 47rpx;
-border: 1rpx solid #FFFFFF;
+
+.rightbox {
+ display: flex;
+ align-items: center;
}
-.contactbox{
- width: 320rpx;
- margin:20rpx auto 0rpx;
-height: 72rpx;
-border-radius: 39rpx;
-border: 2rpx solid rgba(0,0,0,0.15);
-align-items: center;
-color: rgba(0,0,0,0.85);
-font-size: 28rpx;
-justify-content: center;
- display: flex;
+
+.bindbox {
+ overflow: hidden;
+ padding: 0 32rpx 10rpx;
+ margin: 20rpx 0rpx;
+ background: #FFFFFF;
}
-.kefu{
- width: 32rpx;
- margin-right: 10rpx;
- height: 32rpx;
+
+.errorbox {
+ margin-top: 10rpx;
+ display: flex;
+ height: 80rpx;
+ background: #FFF1F0;
+ border-radius: 8rpx;
+ padding: 0 20rpx;
+ align-items: center;
+ justify-content: space-between;
}
-.finish{
- margin-top: 20rpx;
- display: flex;
- justify-content: space-between;
- margin-bottom: 20rpx;
- align-items: center;
+
+.tiptitle {
+ height: 80rpx;
+ align-items: center;
+ display: flex;
+ justify-content: space-between;
+ margin-top: 10rpx;
}
-.finish .left{
- font-size: 32rpx;
-font-weight: 400;
-color: rgba(0,0,0,0.85);
+
+.tipleft {
+ font-size: 32rpx;
+ color: rgba(0, 0, 0, 0.85);
}
-.finish .right{
- font-size: 28rpx;
-font-weight: 400;
-color: rgba(0,0,0,0.45);
+
+.tipright {
+ color: #4096FF;
+ font-size: 28rpx;
}
-.moneydetail{
+
+.iptbox {
+ margin-top: 24rpx;
+ width: 100%;
+ height: 78rpx;
+ border-radius: 6rpx;
+ border: 2rpx solid #3CC7C0;
+ display: flex;
+ align-items: center;
+}
+
+.iptbox.active {
+ border: 2rpx solid #FF4D4F;
+}
+
+.mybar {
+ height: 38rpx;
+ margin: 0 30rpx;
+ width: 2rpx;
+ background: #3CC7C0;
+}
+
+.ipt {
+ margin-left: 20rpx;
+ flex: 1;
+}
+
+.scan {
+ margin-right: 20rpx;
+ width: 40rpx;
+ height: 40rpx;
+}
+
+.uploadbox {
+
+ margin: 24rpx 0rpx 0;
+ display: flex;
+ flex-wrap: wrap;
+}
+
+.uploadbox .close {
+ z-index: 9;
+ top: 5rpx;
+ right: 5rpx;
+ position: absolute;
+ width: 30rpx;
+ height: 30rpx;
+}
+
+.uploadbox .upload {
+ position: relative;
+ object-fit: cover;
+ display: flex;
+ flex-direction: column;
+ margin: 5px 19rpx 5px 0;
+}
+
+.uploadbox .upload:nth-child(4n) {
+ margin-right: 0;
+}
+
+.van-icon-plus {
+ color: #333;
+ font-size: 80rpx !important;
+}
+
+.upload {
+ width: 148rpx;
+ height: 148rpx;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ background: #F2F2F2;
+ border-radius: 4rpx
+}
+
+.uploadbox view:first-child {
+ margin-left: 0 !important;
+}
+
+.upload .text {
+ font-size: 28rpx;
+}
+
+.errorleft {
+ display: flex;
+ align-items: center;
+}
+
+.checkerror {
+ margin-right: 10rpx;
+ width: 40rpx;
+ height: 40rpx;
+}
+
+.checkclose {
+ width: 32rpx;
+ height: 32rpx;
+}
+
+.wrapper {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ flex-direction: column;
+ justify-content: center;
+ margin: 285rpx auto;
+}
+
+.timg1 {
+ width: 694rpx;
+}
+
+.timg2 {
+ width: 506rpx;
+}
+
+.button {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ width: 224rpx;
+ font-size: 32rpx;
+ height: 83rpx;
+ font-weight: 500;
+ margin-top: 72rpx;
+ color: #FFFFFF;
+ border-radius: 47rpx;
+ border: 1rpx solid #FFFFFF;
+}
+
+.contactbox {
+ width: 320rpx;
+ margin: 20rpx auto 0rpx;
+ height: 72rpx;
+ border-radius: 39rpx;
+ border: 2rpx solid rgba(0, 0, 0, 0.15);
+ align-items: center;
+ color: rgba(0, 0, 0, 0.85);
+ font-size: 28rpx;
+ justify-content: center;
+ display: flex;
+}
+
+.kefu {
+ width: 32rpx;
+ margin-right: 10rpx;
+ height: 32rpx;
+}
+
+.finish {
+ margin-top: 20rpx;
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20rpx;
+ align-items: center;
+}
+
+.finish .left {
+ font-size: 32rpx;
+ font-weight: 400;
+ color: rgba(0, 0, 0, 0.85);
+}
+
+.finish .right {
+ font-size: 28rpx;
+ font-weight: 400;
+ color: rgba(0, 0, 0, 0.45);
+}
+
+.moneydetail {
width: 96rpx;
height: 40rpx;
background: #3CC7C0;
- border-radius: 6rpx;
+ border-radius: 6rpx;
font-size: 24rpx;
display: flex;
margin-left: 20rpx;
@@ -902,32 +1009,128 @@ color: rgba(0,0,0,0.45);
justify-content: center;
color: #FFFFFF;
}
-.dealbox{
+
+.dealbox {
display: flex;
- margin:20rpx 30rpx 0;
+ margin: 20rpx 30rpx 0;
justify-content: flex-end;
}
-.linkbtn{
+
+.linkbtn {
width: 168rpx;
display: flex;
height: 60rpx;
justify-content: center;
align-items: center;
font-size: 28rpx;
-color: #FFFFFF;
-border-radius: 29rpx;
-background-color: #3CC7C0;
+ color: #FFFFFF;
+ border-radius: 29rpx;
+ background-color: #3CC7C0;
}
-.cancelbtn{
+
+.cancelbtn {
width: 168rpx;
display: flex;
height: 60rpx;
justify-content: center;
align-items: center;
font-size: 28rpx;
-color: #FFFFFF;
-border-radius: 29rpx;
+ color: #FFFFFF;
+ border-radius: 29rpx;
-background: #CECECE;
+ background: #CECECE;
+}
+
+.quanyibox {
+ border-radius: 20rpx 20rpx 0 0;
+ padding: 10rpx 0rpx;
+ margin-top: 20rpx;
+ background-color: #fff;
+}
+
+.topbox {
+ border-bottom: 1rpx solid #E3E4E5;
+}
+
+.topbox .title {
+ margin: 20rpx 30rpx 16rpx;
+ font-weight: 500;
+ font-size: 34rpx;
+ color: rgba(0, 0, 0, 0.9);
+}
+
+.expand {
+ position: absolute;
+ right: 0;
+ color: #999;
+ font-size: 24rpx;
+}
+
+.medbox .row {
+ margin-right: 30rpx;
+
+}
+
+.usebox {
+ padding: 0 15rpx;
+ height: 78rpx;
+ display: flex;
+ align-items: center;
+ font-size: 28rpx;
+ margin: 0 30rpx 16rpx;
+ justify-content: space-between;
+ background-color: #fafafa;
+}
+
+.medbox .title {
+
+ margin: 26rpx 30rpx 26rpx;
+ font-size: 30rpx;
+ color: #000000;
+}
+
+.medbox .detail {
+ font-size: 28rpx;
+ color: #000000;
+}
+
+.medbox {
+ border-bottom: 1rpx solid #E3E4E5;
+}
+
+.medbox:last-child {
+ border-bottom: none;
+}
+.quanyibox .row .name{
+
+ font-weight: normal;
+}
+.topbox .time{
+ font-size: 30rpx;
+ color: #F06036;
+}
+.usebox .time{
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #666666;
+}
+.titlebox{
+ display: flex;
+}
+.patientdesc .name{
+ font-size: 28rpx;
+ margin-top: 20rpx;
+}
+.nameinfo{
+ font-size: 28rpx;
+color:#999;
+ padding:0rpx 0 15rpx;
+}
+.more{
+ font-size: 28rpx;
+ color: #333333;
+}
+.red{
+ color:#EF4F20
}
\ No newline at end of file
diff --git a/healthyService/pages/visitDetail/visitDetail.js b/healthyService/pages/visitDetail/visitDetail.js
index f09a6c1..c898ac5 100644
--- a/healthyService/pages/visitDetail/visitDetail.js
+++ b/healthyService/pages/visitDetail/visitDetail.js
@@ -11,6 +11,9 @@ Page({
* 页面的初始数据
*/
data: {
+ order_no:'',
+ order_inquiry_id:'',
+ status:'',
follow_package_item_id:'',
message:'',
showWarn:false,
@@ -79,7 +82,22 @@ Page({
})
},
goHasOrder(){
-
+
+ let status=this.data.status;
+ if(status==4){
+ let id=this.data.order_inquiry_id;
+ app.method.navigateTo({
+ url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+id,
+ })
+ }else if(status==2){
+ let id=this.data.order_no;
+ app.method.navigateTo({
+ url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+id,
+ })
+
+ }
+
+
},
addPatient() {
this.setData({
@@ -267,6 +285,8 @@ Page({
}else if(res.status==2){
this.setData({
showWarn:true,
+ order_no:res.data.order_no,
+ status:2,
message:res.message
})
@@ -276,7 +296,13 @@ Page({
})
}else if(res.status==4){
-
+ this.setData({
+ showWarn:true,
+ order_no:res.data.order_no,
+ order_inquiry_id:res.data.order_inquiry_id,
+ status:4,
+ message:res.message
+ })
}else if(res.status==5){
}
diff --git a/healthyService/pages/visitDetail/visitDetail.wxml b/healthyService/pages/visitDetail/visitDetail.wxml
index ba10a95..d2795f2 100644
--- a/healthyService/pages/visitDetail/visitDetail.wxml
+++ b/healthyService/pages/visitDetail/visitDetail.wxml
@@ -167,7 +167,7 @@
theme='green'
show="{{showWarn}}"
confirm-button-color="#3CC7C0"
- cancel-button-text="确定"
+ cancel-button-text="取消"
>
\ No newline at end of file
diff --git a/patient/pages/medinceOrderDetail/medinceOrderDetail.js b/patient/pages/medinceOrderDetail/medinceOrderDetail.js
index 5151c8f..220a0cb 100644
--- a/patient/pages/medinceOrderDetail/medinceOrderDetail.js
+++ b/patient/pages/medinceOrderDetail/medinceOrderDetail.js
@@ -38,7 +38,8 @@ Page({
if(url.indexOf('?')!=-1){
goUrl='/'+url+"&fromType="+url;
}else{
- goUrl='/'+url+"?fromType="+url;
+ // goUrl='/'+url+"?fromType="+url;
+ goUrl='/patient/pages/medinceOrder/medinceOrder'
}
//处理聊天收到消息不及时；
if(url.indexOf("TUIService/pages/index")!=-1){
diff --git a/patient/pages/payOrder/payOrder.js b/patient/pages/payOrder/payOrder.js
index fed9aa6..15f80e1 100644
--- a/patient/pages/payOrder/payOrder.js
+++ b/patient/pages/payOrder/payOrder.js
@@ -530,6 +530,7 @@ Page({
order_inquiry_id,
order_type,
order_id,
+ order_no,
order_product_id,
fromType
} = this.data;
@@ -541,7 +542,11 @@ Page({
app.method.navigateTo({
url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id=' + order_detection_id +"&fromType=" + fromType
})
- }else {
+ }else if(order_type == 4 || order_type == 5){
+ app.method.navigateTo({
+ url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id=' + order_no + "&fromType=" + fromType,
+ })
+}else {
// 订单类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
if (inquiry_type == 1) {
app.method.navigateTo({
diff --git a/patient/pages/payPlatform/payPlatform.js b/patient/pages/payPlatform/payPlatform.js
index f07f296..39a19be 100644
--- a/patient/pages/payPlatform/payPlatform.js
+++ b/patient/pages/payPlatform/payPlatform.js
@@ -147,6 +147,7 @@ Page({
order_inquiry_id,
order_type,
order_id,
+ order_no,
order_product_id,
order_detection_id,
fromType
@@ -160,7 +161,11 @@ Page({
wx.redirectTo({
url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id=' + order_detection_id + "&fromType=" + fromType,
})
- }else {
+ }else if(order_type == 4 || order_type == 5){
+ wx.redirectTo({
+ url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id=' + order_no + "&fromType=" + fromType,
+ })
+ }else {
// 订单类型（1:专家问诊 2:快速问诊 3:公益问诊 4:问诊购药）
if (inquiry_type == 1) {
app.method.navigateTo({
diff --git a/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js b/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js
index d0781d4..19efd73 100644
--- a/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js
+++ b/sugarCheck/pages/checkOrderDetail/checkOrderDetail.js
@@ -153,7 +153,7 @@ Page({
if(url.indexOf('?')!=-1){
goUrl='/'+url+"&fromType="+url;
}else{
- goUrl='/'+url+"?fromType="+url;
+ goUrl='/sugarCheck/pages/checkOrder/checkOrder'
}
//处理聊天收到消息不及时；
if(url.indexOf("TUIService/pages/index")!=-1){