服务包跳转

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/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,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({

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