服务包跳转

api/health.js

@@ -26,8 +26,6 @@ function serviceList(data){ //获取患者检测订单列表
   };
 
 
-
-
 module.exports={
     cancelCheckPay,
     cancelCheckOrder,

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();
+      
      }
   },
 

healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml

@@ -86,6 +86,26 @@
       </view>
       <view class="moneydetail">明细<van-icon name="arrow-down" color="#fff" size="12"/></view>
     </view>
+    <view class="detaibox">
+      <view class="row">
+        <view class="namebox">
+        <view class="name">药 品 费</view>
+      <view  class="dot">：</view>
+       </view>
+       <view class="desc  ">
+      ￥{{order.discount_product_total_amount}}
+      </view>
+      </view>
+      <view class="row">
+        <view class="namebox">
+        <view class="name">问 诊 费</view>
+      <view  class="dot">：</view>
+       </view>
+       <view class="desc  ">
+      ￥{{(pay_money-order.discount_product_total_amount)}}
+      </view>
+      </view>
+    </view>
     <view class="row beizhu" wx:if="{{order.cancel_reason}}">
       <view class="namebox">
         <view class="name"><text>备</text><text>注</text></view>
@@ -133,8 +153,108 @@
    
   
 </view>
+<view class="quanyibox rowbox ">
+   <view class="topbox">
+    <view class="title">服务权益</view>
+    <view class="row">
+        <view class="namebox">
+      <view class="name">有 效 期</view>
+      <view  class="dot">：</view>
+     </view>
+     <view class="desc time">2012</view>
+    </view>
+    <view class="row">
+        <view class="namebox">
+      <view class="name">当月时间</view>
+      <view  class="dot">：</view>
+     </view>
+     <view class="desc time">2012</view>
+    </view>
+   </view>
+   <view class="medbox">
+     <view class="title">问诊服务</view>
+     <view class="row" style="position: relative;margin-bottom: 22rpx;">
+        <view class="namebox">
+      <view class="name"><text 	decode>内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容</text></view>
+      <view  class="dot">：</view>
+     </view>
+     <view class="desc"><text class="red">3个</text>月内，每月<text class="red">2次</text>问诊</view>
   
+    </view>
+     <view class="row" style="position: relative;margin-bottom: 22rpx;">
+        <view class="namebox">
+      <view class="name">药品剩余</view>
+      <view  class="dot">：</view>
+     </view>
+     <view class="desc"><text class="red">1盒</text>干爽颗粒</view>
+     <view class="expand">收起 <van-icon name="arrow-up" /></view>
+    </view>
+    <view class="usebox">
+        <view class="time">下单时间：2024.12.12</view>
+        <view class="detail">已签收</view>
+    </view>
+    <view class="usebox">
+        <view class="time">下单时间：2024.12.12</view>
+        <view class="detail">已签收</view>
+    </view>
+   </view>
+   <view class="medbox">
+     <view class="title">药品服务</view>
+     <view class="row" style="position: relative;margin-bottom: 22rpx;">
+        <view class="namebox">
+      <view class="name">药品剩余</view>
+      <view  class="dot">：</view>
+     </view>
+     <view class="desc"><text class="red">1盒</text>干爽颗粒</view>
+     <view class="expand">收起 <van-icon name="arrow-up" /></view>
+    </view>
+    <view class="usebox">
+        <view class="time">下单时间：2024.12.12</view>
+        <view class="detail">已签收</view>
+    </view>
+    <view class="usebox">
+        <view class="time">下单时间：2024.12.12</view>
+        <view class="detail">已签收</view>
+    </view>
+   </view>
+   <view class="medbox">
+     <view class="title">优惠卷</view>
+     <view class="row" style="position: relative;margin-bottom: 22rpx;align-items: flex-start;">
+        <view class="namebox">
+      <view class="name"><text 	decode>内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容</text></view>
+      <view  class="dot">：</view>
+     </view>
+     <view class="desc">
+         <view>1、 价值5元的全品类药品优惠劵2张</view>
+         <view >
+         2、价值100元的肝胆商城优惠劵1张</view>
+        </view>
      
+     <view class="expand">收起 <van-icon name="arrow-up" /></view>
+    </view>
+    <view class="usebox">
+        <view class="time">10元的全品类药品优惠劵</view>
+        <view class="detail">未使用</view>
+    </view>
+    <view class="usebox">
+        <view class="time">100元的肝胆商城优惠劵</view>
+        <view class="detail">注册即发放</view>
+    </view>
+   </view>
+</view>
+  <view class="patientBox">
+    <view class="titlebox">
+        <view class="title">患者信息</view>
+        <view class="more">查看详情病情信息<van-icon name="arrow" /></view>
+    </view>
+    <view class="patientdesc">
+        <view class="name">{{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 class="nameinfo">
+        <view class="name">所患疾病：{{order.case.disease_class_name}}</view>
+        <view class="name">病情主诉：{{order.case.disease_desc}}</view>
+      </view>
+    </view>
+  </view>
   <view class="personinfobox" bindtap="goExpert" wx:if="user_doctor && user_doctor.doctor_id">
 
     <view class="namebox" style="justify-content: flex-start;">

healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxss

@@ -9,9 +9,11 @@
     /* overflow-y: scroll; */
     background: #F2F2F2;
 }
+
 input {
     font-family: -apple-system, BlinkMacSystemFont, 'Helvetica Neue', Helvetica,
 }
+
 page {
     position: relative;
     width: 100%;
@@ -20,31 +22,43 @@
         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;}
+
+.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;
@@ -54,6 +68,7 @@
     justify-content: center;
     align-items: center;
 }
+
 .ui-navigatorbar {
     position: fixed;
     z-index: 99;
@@ -87,9 +102,11 @@
     justify-content: center;
     align-items: center;
 }
+
 .droptitle.active {
     color: #3CC7C0;
 }
+
 .slotmsg {
     -webkit-overflow-scrolling: touch;
     font-size: 28rpx;
@@ -99,21 +116,25 @@
     padding: 48rpx;
     text-align: center;
 }
+
 .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%;
@@ -123,21 +144,25 @@
     height: 34rpx;
     border-radius: 0;
 }
+
 .page {
     position: relative;
     display: flex;
     flex-direction: column;
     margin-bottom: 0rpx;
 }
+
 .outwraper {
     flex: 1;
     overflow-y: scroll;
     -webkit-overflow-scrolling: touch;
     padding-bottom: 200rpx;
 }
+
 .outwraper.active {
     padding-bottom: 220rpx;
 }
+
 .add {
     width: 100%;
     display: flex;
@@ -149,11 +174,13 @@
     color: #ED9C00;
     font-size: 32rpx;
 }
+
 .addicon {
     width: 40rpx;
     height: 40rpx;
     flex-shrink: 0;
 }
+
 .addressbox {
     margin-top: 172rpx;
     align-items: center;
@@ -195,6 +222,7 @@
     color: #333333;
     font-size: 28rpx;
 }
+
 .row {
     align-items: center;
     padding: 0 32rpx;
@@ -216,11 +244,13 @@
     align-items: baseline;
     justify-content: space-between;
 }
+
 .row .dot {
     font-weight: 600;
     display: flex;
     align-items: baseline;
 }
+
 .row .desc {
     align-items: baseline;
     font-size: 28rpx;
@@ -257,7 +287,8 @@
     background: #3CC7C0;
     border-radius: 6rpx;
     height: 40rpx;
-  color: #fff;width: 80rpx;
+    color: #fff;
+    width: 80rpx;
     height: 40rpx;
     background: #3CC7C0;
     border-radius: 6rpx;
@@ -268,6 +299,7 @@ border-radius: 6rpx;
     justify-content: center;
     border-radius: 6rpx;
 }
+
 .row .left {
     display: flex;
 }
@@ -280,11 +312,13 @@ border-radius: 6rpx;
     color: #000;
     font-size: 34rpx;
 }
+
 .rowbox {
     margin-top: 20rpx;
     background-color: #fff;
     padding-bottom: 30rpx;
 }
+
 .titlebox {
     padding: 0 32rpx;
     height: 112rpx;
@@ -293,9 +327,11 @@ border-radius: 6rpx;
     justify-content: space-between;
     align-items: center;
 }
+
 .titlebox .status {
     font-size: 28rpx
 }
+
 .waitpay {
     text-align: right;
     color: #EF4F20
@@ -311,22 +347,27 @@ border-radius: 6rpx;
     margin-top: 5rpx;
     color: #EF4F20 !important;
 }
+
 .infobox {
     margin-top: 20rpx;
     background: #fff;
 
 }
+
 .infobox .status {
     font-size: 28rpx;
     font-weight: 400;
     color: #333333;
 }
+
 .infobox .status.wait {
     color: #EF4F20;
 }
+
 .infobox .status.timeout {
     color: #EF4F20;
 }
+
 .infobox .title {
     padding: 0 32rpx;
     background-color: #fff;
@@ -378,9 +419,11 @@ border-radius: 6rpx;
     align-items: center;
     border-bottom: 1rpx solid #E3E4E5;
 }
+
 .medincebox .cell:nth-last-child(2) {
     border-bottom: none;
 }
+
 .rightinfo {
     margin-left: 30rpx;
     flex: 1;
@@ -401,9 +444,11 @@ border-radius: 6rpx;
     -webkit-line-clamp: 2;
     overflow: hidden;
 }
+
 .row.beizhu {
     align-items: flex-start;
 }
+
 .rightinfo .own {
     margin-top: 47rpx;
     display: flex;
@@ -413,6 +458,7 @@ border-radius: 6rpx;
     font-weight: 400;
     color: #333333;
 }
+
 .btnbox {
     display: flex;
     padding: 0 32rpx;
@@ -420,6 +466,7 @@ border-radius: 6rpx;
     padding-bottom: 30rpx;
     justify-content: flex-end;
 }
+
 .btnbox .btn {
     display: flex;
     justify-content: space-between;
@@ -431,21 +478,25 @@ border-radius: 6rpx;
     margin-left: 20px;
 
 }
+
 .btnbox .orderDetail {
     background: #3CC7C0;
     color: #fff;
     border: 1rpx solid #3CC7C0;
 }
+
 .personinfo {
     margin-top: 20rpx;
     background: #fff;
 }
+
 .personinfobox {
     padding: 30rpx 32rpx 40rpx;
     background: #fff;
     margin-top: 20rpx;
     margin-bottom: 10rpx;
 }
+
 .personinfobox .title {
     background-color: #fff;
     font-size: 32rpx;
@@ -455,6 +506,7 @@ border-radius: 6rpx;
     justify-content: space-between;
     border-bottom: 1rpx solid #E3E4E5;
 }
+
 .personinfobox .namebox .head {
     width: 80rpx;
     height: 80rpx;
@@ -475,6 +527,7 @@ border-radius: 6rpx;
     flex-direction: column;
     margin-left: 20rpx;
 }
+
 .personinfobox .type {
     height: 32rpx;
     display: flex;
@@ -520,13 +573,16 @@ border-radius: 6rpx;
     white-space: normal;
     word-break: break-all;
 }
+
 .doctor_title {
     margin-right: 10rpx;
 }
+
 .personinfobox .namebox .row {
     line-height: 40rpx;
     align-items: flex-end;
 }
+
 .personinfobox .hospital {
     margin-top: 12rpx;
     color: #333333;
@@ -542,6 +598,7 @@ border-radius: 6rpx;
     margin-left: 15rpx;
     font-size: 30rpx;
 }
+
 .personinfobox .goodjob {
     color: #666666;
     margin-top: 38rpx;
@@ -550,6 +607,7 @@ border-radius: 6rpx;
     font-size: 28rpx;
     word-break: break-all;
 }
+
 .paybox {
     bottom: 0px;
     height: 104rpx;
@@ -559,6 +617,7 @@ border-radius: 6rpx;
     z-index: 1;
     width: 100%;
 }
+
 .submitbtn {
     width: 100%;
     margin: 3px 32rpx 0;
@@ -571,10 +630,12 @@ 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;
@@ -589,11 +650,13 @@ color: #999;
     justify-content: center;
 
 }
+
 .orderrow {
     display: flex;
     margin: 10rpx 32rpx 0;
     justify-content: flex-end;
 }
+
 .freetalk {
     position: absolute;
     width: 403rpx;
@@ -601,6 +664,7 @@ color: #999;
     top: -53rpx;
     left: 25rpx;
 }
+
 .paybox .right {
     position: relative;
 
@@ -618,6 +682,7 @@ color: #FFFFFF;
 
     flex: 2;
 }
+
 .express {
     width: 158rpx;
     height: 60rpx;
@@ -631,34 +696,41 @@ color: #353535;
     border-radius: 6rpx;
     border: 1rpx solid rgba(5, 5, 5, 0.1);
 }
+
 .namenum {
     font-size: 28rpx;
     font-weight: 400;
     color: #333333;
 }
+
 .row.wuliu {
     margin-top: 20rpx;
     align-items: flex-start;
 }
+
 .row.wuliu .desc {
     margin-left: 20rpx;
 }
+
 .desc .dizhi {
     font-size: 28rpx;
     font-weight: 400;
     color: #333333;
     line-height: 28rpx;
 }
+
 .wuliucar {
     width: 40rpx;
     height: 33rpx;
     flex-shrink: 0;
 }
+
 .row.wuliu .date {
     font-size: 24rpx;
     font-weight: 400;
     color: #666666;
 }
+
 .guanzhu {
     flex-shrink: 0;
     display: flex;
@@ -671,37 +743,41 @@ color: #666666;
     font-size: 24rpx;
 
 }
+
 .namebox .guanzhu image {
     width: 35rpx;
     height: 32rpx;
 }
-.patientbox{
+
-  margin-top: 172rpx;
+.patientBox {
+    margin-top: 20rpx;
     width: 100%;
     box-sizing: border-box;
-  padding:0 32rpx;
+
-  display: flex;
+ 
-  align-items: center;
-  justify-content: space-between;
-  height: 109rpx;
     background: #FFFFFF;
 }
+.patientdesc{
+    padding:0 32rpx;
+}
 .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);
@@ -710,16 +786,19 @@ color: rgba(0,0,0,0.85)
     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;
@@ -730,6 +809,7 @@ padding:0 20rpx;
     align-items: center;
     justify-content: space-between;
 }
+
 .tiptitle {
     height: 80rpx;
     align-items: center;
@@ -737,14 +817,17 @@ padding:0 20rpx;
     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%;
@@ -754,30 +837,36 @@ 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;
@@ -786,6 +875,7 @@ align-items: center;
     width: 30rpx;
     height: 30rpx;
 }
+
 .uploadbox .upload {
     position: relative;
     object-fit: cover;
@@ -793,13 +883,16 @@ align-items: center;
     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;
@@ -809,9 +902,11 @@ align-items: center;
     background: #F2F2F2;
     border-radius: 4rpx
 }
+
 .uploadbox view:first-child {
     margin-left: 0 !important;
 }
+
 .upload .text {
     font-size: 28rpx;
 }
@@ -820,15 +915,18 @@ align-items: center;
     display: flex;
     align-items: center;
 }
+
 .checkerror {
     margin-right: 10rpx;
     width: 40rpx;
     height: 40rpx;
 }
+
 .checkclose {
     width: 32rpx;
     height: 32rpx;
 }
+
 .wrapper {
     width: 100%;
     display: flex;
@@ -837,12 +935,15 @@ align-items: center;
     justify-content: center;
     margin: 285rpx auto;
 }
+
 .timg1 {
     width: 694rpx;
 }
+
 .timg2 {
     width: 506rpx;
 }
+
 .button {
     display: flex;
     align-items: center;
@@ -856,6 +957,7 @@ color: #FFFFFF;
     border-radius: 47rpx;
     border: 1rpx solid #FFFFFF;
 }
+
 .contactbox {
     width: 320rpx;
     margin: 20rpx auto 0rpx;
@@ -868,11 +970,13 @@ font-size: 28rpx;
     justify-content: center;
     display: flex;
 }
+
 .kefu {
     width: 32rpx;
     margin-right: 10rpx;
     height: 32rpx;
 }
+
 .finish {
     margin-top: 20rpx;
     display: flex;
@@ -880,16 +984,19 @@ justify-content: center;
     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;
@@ -902,11 +1009,13 @@ color: rgba(0,0,0,0.45);
     justify-content: center;
     color: #FFFFFF;
 }
+
 .dealbox {
     display: flex;
     margin: 20rpx 30rpx 0;
     justify-content: flex-end;
 }
+
 .linkbtn {
     width: 168rpx;
     display: flex;
@@ -918,6 +1027,7 @@ color: #FFFFFF;
     border-radius: 29rpx;
     background-color: #3CC7C0;
 }
+
 .cancelbtn {
     width: 168rpx;
     display: flex;
@@ -931,3 +1041,96 @@ border-radius: 29rpx;
     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  
+}

healthyService/pages/visitDetail/visitDetail.js

@@ -11,6 +11,9 @@ Page({
    * 页面的初始数据
    */
   data: {
+      order_no:'',
+      order_inquiry_id:'',
+      status:'',
      follow_package_item_id:'',
      message:'',
      showWarn:false,
@@ -80,6 +83,21 @@ 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){
             
         }

healthyService/pages/visitDetail/visitDetail.wxml

@@ -167,7 +167,7 @@
    theme='green'
   show="{{showWarn}}"
   confirm-button-color="#3CC7C0"
-  cancel-button-text="确定"
+  cancel-button-text="取消"
 >
 
 </van-dialog>

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){

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,6 +542,10 @@ Page({
       app.method.navigateTo({
         url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id=' + order_detection_id +"&fromType=" + fromType
       })
+  }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) {

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,6 +161,10 @@ Page({
       wx.redirectTo({
         url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id=' + order_detection_id + "&fromType=" + fromType,
       })
+    }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) {

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){