提交4.16

api/health.js

@@ -27,9 +27,18 @@ function serviceList(data){ //获取患者检测订单列表
   function createServiceChatOrder(id){
     return request('/patient/service/inquiry/'+id,'POST',{},true)
 }
+function serviceEquityDetail(id){ //获取患者服务包订单服务权益详情
+    return request('/patient/order/service/detail/'+id,'GET',{})
+  };
+  function serviceSickInfo(id){ //获取服务包订单病例详情-基础益详情
+    return request('/case/service/'+id,'GET',{})
+  };
+  
 
 
 module.exports={
+    serviceSickInfo,
+    serviceEquityDetail,
     createServiceChatOrder,
     cancelCheckPay,
     cancelCheckOrder,

app.json

@@ -97,7 +97,8 @@
         "pages/healthyOrder/healthyOrder",
         "pages/healthyOrderDetail/healthyOrderDetail",
         "pages/writeSick/writeSick",
-        "pages/visitList/visitList"
+        "pages/visitList/visitList",
+        "pages/sickInfo/sickInfo"
       ],
       "independent": true
     }

healthyService/pages/healthyDetail/healthyDetail.js

@@ -13,6 +13,7 @@ Page({
     order_no:'',
     order_inquiry_id:'',
     chat_id:'',
+    showWarn:false,
     status:'',
       active:0,
       img_host:app.hostConfig().imghost,
@@ -40,7 +41,24 @@ Page({
       service_type:1,
       chat_id:'',
   },
+  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,
+           })
+       
+    }
+ 
+  
+},
   inputChange(e) {
     this.setData({
       [e.target.dataset.id]: e.detail.value
@@ -281,10 +299,10 @@ Page({
   },
   handleCreateServiceChatOrder(id){
     createServiceChatOrder(id).then(res=>{
-        let order_inquiry_id=res.data.order_inquiry_id;
+        let order_inquiry_id=res.order_inquiry_id;
         let chat_id=this.data.chat_id;
         app.method.navigateTo({
-            url: '/TUIService/pages/index?currentConversationID=' + chat_id + "&order_inquiry_id=" + order_inquiry_id + "&inquiry_type=3&fromType=chat" 
+            url: '/TUIService/pages/index?currentConversationID=' + chat_id + "&order_inquiry_id=" + order_inquiry_id + "&inquiry_type=1&fromType=chat" 
     })
   })
   },

healthyService/pages/healthyDetail/healthyDetail.json

@@ -2,7 +2,8 @@
   "usingComponents": {
     "nav":"../../../components/nav/nav",
     "van-popup": "@vant/weapp/popup/index",
-    "van-picker": "@vant/weapp/picker/index"
+    "van-picker": "@vant/weapp/picker/index",
+    "van-dialog": "@vant/weapp/dialog/index"
   },
   "navigationStyle":"custom"
 }

healthyService/pages/healthyDetail/healthyDetail.wxml

@@ -153,3 +153,17 @@
    </view>
     </view>
   </van-popup>
+  <van-dialog
+  show-cancel-button
+   class="mydailog"
+   bind:confirm="goHasOrder"
+  title="温馨提示"
+  message="{{message}}"
+  z-index="9999"
+   theme='green'
+  show="{{showWarn}}"
+  confirm-button-color="#3CC7C0"
+  cancel-button-text="取消"
+>
+
+</van-dialog>

healthyService/pages/healthyOrderDetail/healthyOrderDetail.js

@@ -1,6 +1,6 @@
 // pages/medinceOrderDetail/medinceOrderDetail.js
 const app = getApp()
-import {serviceDetail,cancelCheckPay,delCheckOrder,cancelCheckOrder,checkInquiry} from "../../../api/health"
+import {serviceDetail,cancelCheckPay,delCheckOrder,cancelCheckOrder,checkInquiry,serviceEquityDetail} from "../../../api/health"
 import {cancelPay} from "../../../api/consultOrder"
 import {cancelOrder} from "../../../api/consultOrder"
 import {fllowDoctor,notfllowDoctor} from "../../../api/consultExpert"
@@ -13,12 +13,18 @@ Page({
    * 页面的初始数据
    */
   data: {
+      showJuan:true,
     time: 30 * 60 * 60 * 1000,
     showCover:true,
+    showExpand:true,
     isWait:true,
     cancelBtn:false,
      order:{},
+     equity:{},//权益
      showError:false,
+     showProduct:true,
+     productList:[],
+     yaoList:[],
      pay_money:0,
     fileList:[],
     checkSatus:1,
@@ -28,6 +34,15 @@ Page({
     detection_code:'',
     order_service_id:'',
     showDialog:false,
+    inquiryList:[],
+    toggleList:[],
+    juanList:[{
+     id:1,
+     name:'1、价值5元的全品类药品优惠劵2张'
+    },{
+        id:2,
+        name:' 2、价值100元的肝胆商城优惠劵1张'
+       }],
     message:'',
     fromType:'',
     user_doctor:{},
@@ -57,85 +72,63 @@ Page({
       urls: urls // 需要预览的图片http链接列表
     })
   },
-  uploadFile(File) {
+  toggleJuan(){
-    wx.showLoading({
+    this.setData({
-      title: '图片上传中...',
+        showJuan:!this.data.showJuan
-      mask: true
     })
-    let THIS = this;
+    let arr=[{
-    getSign({
+        id:1,
-      user_type: 1,
+        name:'1、价值5元的全品类药品优惠劵2张'
-      scene: 4
+       },{
-    }).then((resdata) => {
+           id:2,
-      let {
+           name:' 2、价值100元的肝胆商城优惠劵1张'
-        accessid,
+          }]
-        dir,
+  if(!this.data.showJuan){
-        policy,
+   this.setData({
-        signature,
+       juanList:arr.slice(0,1)
-        host
+   })
-      } = resdata;
+  }else{
-      let index = File.lastIndexOf("/");
+    this.setData({
-      let filename = File.substring(index + 1, File.length);
+        juanList:arr
-      return new Promise((resolve, reject) => {
-        wx.uploadFile({
-          url: host, // 仅为示例，非真实的接口地址
-          filePath: File,
-          name: 'file',
-          formData: {
-            OSSAccessKeyId: accessid,
-            policy,
-            key: dir + filename,
-            signature
-          },
-          success(res) {
-            if (res.statusCode === 204) {
-              let url = host + '/' + dir + filename;
-              THIS.setData({
-                fileList: THIS.data.fileList.concat([url])
     })
   }
   },
-          fail: err => {
+ toggleExpand(){
-            console.log(err);
+   this.setData({
+       showExpand:!this.data.showExpand
+   })
+   let list=this.data.toggleList;
+   if(!this.data.showJuan){
+    this.setData({
+        inquriyList:list.slice(0,1)
+    })
+   }else{
+     this.setData({
+        inquriyList:list
+     })
    } 
-        });
-      })
-    })
  },
-  upload() {
+ toggleProduct(){
-    if(this.data.fileList.length>=3){
+    this.setData({
-     wx.showToast({
+        showProduct:!this.data.showProduct
-       title: '检测管照片最多上传3张',
-       icon:"none"
     })
-     return false
+    let list=this.data.yaoList;
-    };
+    if(!this.data.Product){
-    let THIS = this;
+     this.setData({
-    wx.chooseMedia({
+         productList:list.slice(0,1)
-      count: 3-this.data.fileList.length,
+     })
-      mediaType: ['image'],
+    }else{
-      sourceType: ['album', 'camera'],
+      this.setData({
-      success(res) {
+        productList:list
-        var imgList = res.tempFiles;
-        var promiseFun = [];
-        for (let i = 0; i < imgList.length; i++) {
-          var file = imgList[i].tempFilePath;
-          promiseFun.push(
-            THIS.uploadFile(file)
-          )
-        };
-        Promise.all(promiseFun).then((res) => {
-          wx.showToast({
-            title: '图片上传成功',
-            icon: "none"
       })
-          wx.hideLoading();
-        });
-
     } 
-    })
   },
- 
+ goInquiry:throttle(function(e){
+    let {id}=e.currentTarget.data.dataset;
+    app.method.navigateTo({
+        url:'/patient/pages/orderDetail/orderDetail?order_inquiry_id='+id
+    })
+ }),
   goBack(){
      
     let {fromType}=this.data;
@@ -182,25 +175,19 @@ Page({
     }
     
   },
-  bluript(event){
+  handelServiceEquityDetail(id){
-    const {value}=event.detail;
+    serviceEquityDetail(id).then(res=>{
-    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)$/;
-    let detection_status=this.data.order.detection_status;
-    if(detection_status!=3){
-      if(reg.test(value)){
-        this.setData({
-          showError:false
-        })
-      }else{
-        this.setData({
-          showError:true
-        })
-      }
-    }
-   
       
+      this.setData({
+        equity:res,
+        inquiryList:res.order_inquiry,
+        toggleList:res.order_inquiry,
+        productList:res.order_product,
+        yaoList:res.order_product
+      })
+    })
   },
-  chnageIpt(event){
+  chnageIpt(event){thi.se
     const {value}=event.detail;
      this.setData({
       detection_bar_code:value
@@ -412,9 +399,9 @@ confirmCancelOrder(){
   })
 },
 goSickInfo(event){
-    let order_inquiry_id=event.currentTarget.dataset.id;
+    let order_no=this.data.order_service_id;
     app.method.navigateTo({
-      url: '/patient/pages/sickInfo/sickInfo?order_inquiry_id='+order_inquiry_id
+      url: '/healthyService/pages/sickInfo/sickInfo?order_no='+order_no
     })
   },
 confirmDelOrder(){
@@ -560,7 +547,7 @@ toggleFllow(){
         order_service_id
        });
        this.handleServiceDetail();
-      
+      this.handelServiceEquityDetail(order_service_id)
      }
   },
 

healthyService/pages/healthyOrderDetail/healthyOrderDetail.wxml

@@ -156,24 +156,49 @@
 <view class="quanyibox rowbox ">
    <view class="topbox">
     <view class="title">服务权益</view>
-    <view class="row">
+    <view class="row"  wx:if="{{order.order_service_status==2 || order.order_service_status==3 || order.order_service_status==4}}">
         <view class="namebox">
       <view class="name">有 效 期</view>
       <view  class="dot">：</view>
      </view>
-     <view class="desc time">2012</view>
+     <view class="desc time" wx:if="{{order.order_service_status==2}}"><text class="red">接诊后有效</text></view>
+     <view class="desc time" wx:elif="{{order.order_service_status==3}}"><text class="red">{{filter.transforDay(equity.order_service_package.start_time,'dateminute')+'-'+filter.transforDay(equity.order_service_package.finish_time,'dateminute')}}</text></view>
     </view>
-    <view class="row">
+    <view class="row" style="align-items: flex-start;" wx:if="{{order.order_service_status==2 || order.order_service_status==3 || order.order_service_status==4}}">
         <view class="namebox">
       <view class="name">当月时间</view>
       <view  class="dot">：</view>
      </view>
-     <view class="desc time">2012</view>
+     <view class="desc time" wx:if="{{order.order_service_status==3}}">{{equity.order_service_package.current_month_start_date+'-'+equity.order_service_package.current_month_finish_date}}</view>
     </view>
    </view>
-   <view class="medbox">
+   <view class="medbox" wx:if="{{equity.order_service_package.order_service_type==2}}">
      <view class="title">问诊服务</view>
-     <view class="row" style="position: relative;margin-bottom: 22rpx;">
+     <view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order.order_service_status==1 || order.order.order_service_status==2 || (order.order_service_status==5 && order.pay_status==5)}}">
+        <view class="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">{{equity.order_service_package_detail.service_period/30}}个</text>月内，每月<text class="red">{{equity.order_service_package_detail.monthly_frequency==0?'不限':equity.order_service_package_detail.monthly_frequency}}次</text>问诊</view>
+  
+    </view>
+     <view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==3}}">
+        <view class="namebox">
+      <view class="name">当月剩余</view>
+      <view  class="dot">：</view>
+     </view>
+     <view class="desc"><text class="red">{{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次</text>图文</view>
+     <view class="expand" wx:if="{{ equity.order_inquiry.length>0}}" bind:tap="toggleExpand">{{showExpand?'收起':'展开'}} <van-icon name="{{showExpand?'arrow-up':'arrow-down'}}" /></view>
+    </view>
+    <view class="usebox" wx:for="{{inquriyList}}" wx:key="order_inquiry_id"  bind:tap="goInquiry" data-id="{{item.order_inquiry_id}}">
+        <view class="time">问诊时间：{{item.created_at}}</view>
+        <view class="detail">{{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':'已取消'}}<van-icon name="arrow" size="12px"  color="#999"/></view>
+    </view>
+   
+   </view>
+   <view class="medbox" wx:if="{{equity.order_service_package.order_service_type==1}}">
+     <view class="title">问诊服务</view>
+     <view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order.order_service_status==1 || order.order.order_service_status==2 || (order.order_service_status==5 && order.pay_status==5)}}">
         <view class="namebox">
       <view class="name"><text 	decode>内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容</text></view>
       <view  class="dot">：</view>
@@ -181,43 +206,44 @@
      <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="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order_service_status==3}}">
         <view class="namebox">
-      <view class="name">药品剩余</view>
+      <view class="name">当月剩余</view>
       <view  class="dot">：</view>
      </view>
-     <view class="desc"><text class="red">1盒</text>干爽颗粒</view>
+     <view class="desc"><text class="red">{{equity.order_service_package_detail.monthly_frequency==0?'不限':(equity.order_service_package_detail.monthly_frequency-equity.order_service_package.month_inquiry_count)}}次</text>图文</view>
-     <view class="expand">收起 <van-icon name="arrow-up" /></view>
+     <view class="expand" wx:if="{{ equity.order_inquiry.length>0}}" bind:tap="toggleExpand">{{showExpand?'收起':'展开'}} <van-icon name="{{showExpand?'arrow-up':'arrow-down'}}" /></view>
     </view>
-    <view class="usebox">
+    <view class="usebox" wx:for="{{inquriyList}}" wx:key="order_inquiry_id"  bind:tap="goInquiry" data-id="{{item.order_inquiry_id}}">
-        <view class="time">下单时间：2024.12.12</view>
+        <view class="time">问诊时间：{{item.created_at}}</view>
-        <view class="detail">已签收</view>
+        <view class="detail">{{item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'已接诊':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':'已取消'}}<van-icon name="arrow" size="12px"  color="#999"/></view>
     </view>
-    <view class="usebox">
+   
-        <view class="time">下单时间：2024.12.12</view>
-        <view class="detail">已签收</view>
    </view>
-   </view>
+   <view class="medbox" wx:if="{{equity.order_service_package.order_service_type==1}}">
-   <view class="medbox">
      <view class="title">药品服务</view>
-     <view class="row" style="position: relative;margin-bottom: 22rpx;">
+     <view class="row" style="position: relative;margin-bottom: 22rpx;" wx:if="{{order.order.order_service_status==1 || order.order.order_service_status==2 || (order.order_service_status==5 && order.pay_status==5)}}">
+        <view class="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">30盒</text>干爽颗粒(步长)</view>
+     </view>
+     <view class="row" wx:if="{{order.order_service_status==3}}">
         <view class="namebox">
       <view class="name">药品剩余</view>
       <view  class="dot">：</view>
      </view>
-     <view class="desc"><text class="red">1盒</text>干爽颗粒</view>
+     <view class="desc"><text class="red">{{30}}盒</text>干爽颗粒</view>
-     <view class="expand">收起 <van-icon name="arrow-up" /></view>
+     <view class="expand" bind:tap="toggleProduct">{{showProduct?'收起':'展开'}} <van-icon name="{{showProduct?'arrow-up':'arrow-down'}}" /></view>
     </view>
-    <view class="usebox">
+    <view class="usebox" wx:for="{{productList}}" wx:key="order_product_id" >
-        <view class="time">下单时间：2024.12.12</view>
+        <view class="time">下单时间：{{item.created_at}}</view>
-        <view class="detail">已签收</view>
+        <view class="detail">{{item.order_product_status==1?'待支付':item.order_product_status==2?'待发货':item.order_product_status==3?'已发货':item.order_product_status==42?'已签收':'已取消'}}</view>
     </view>
-    <view class="usebox">
+   
-        <view class="time">下单时间：2024.12.12</view>
-        <view class="detail">已签收</view>
    </view>
-   </view>
+   <view class="medbox" wx:if="{{equity.order_service_package.order_service_type==1}}">
-   <view class="medbox">
      <view class="title">优惠卷</view>
      <view class="row" style="position: relative;margin-bottom: 22rpx;align-items: flex-start;">
         <view class="namebox">
@@ -225,27 +251,22 @@
       <view  class="dot">：</view>
      </view>
      <view class="desc">
-         <view>1、 价值5元的全品类药品优惠劵2张</view>
+         <view wx:for="{{juanList}}" wx:key="id">{{item.name}}</view>
-         <view >
-         2、价值100元的肝胆商城优惠劵1张</view>
         </view>
      
-     <view class="expand">收起 <van-icon name="arrow-up" /></view>
+     <view class="expand" bind:tap="toggleJuan">{{showJuan?'收起':'展开'}} <van-icon name="{{showJuan?'arrow-up':'arrow-down'}}" /></view>
     </view>
-    <view class="usebox">
+    <view class="usebox"  wx:if="{{order.order_service_status!=1 && !(order.order_service_status==5 && order.pay_status==5)}}">
         <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 class="more" bind:tap="goSickInfo">查看详情病情信息<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>

healthyService/pages/sickInfo/sickInfo.js

@@ -0,0 +1,189 @@
+// pages/sickInfo/sickInfo.js
+const app = getApp();
+import {serviceSickInfo} from "../../../api/health"
+import {formatDateText} from "../../../utils/util"
+Page({
+  /**
+   * 页面的初始数据
+   */
+    data: {
+      sick:{
+      },
+      otherList:[]
+    },
+    previewImage(event) {
+      let id = event.currentTarget.dataset.id;
+      let urls = this.data.sick.diagnose_images;
+      wx.previewImage({
+        current: urls[id], // 当前显示图片的http链接
+        urls: urls // 需要预览的图片http链接列表
+      })
+    },
+   getsickInfo(id){
+    serviceSickInfo(id).then(data=>{
+     this.setData({
+      sick:data,
+     });
+     //infoType 1 只有是否  2 饮酒，吸烟 3 化合物 4 只有文字叙述
+     let filter1=[];
+     let filter2=[];
+     let arr=[
+       {
+       type:"taboo",
+       name:'是否服用过您想购买的药品且无相关禁忌：',
+       nameTip:'',
+       status:data.is_taboo,
+       desc:"",
+       infoType:1
+     },
+     {
+      type:"allergy_history",
+      name:'是否有过敏史：',
+      nameTip:'过敏史：',
+      infoType:1,
+      status:data.is_allergy_history,
+      desc:data.allergy_history
+    },
+    {
+      type:"family_history",
+      name:'是否有家族史：',
+      nameTip:'家族史：',
+      infoType:1,
+      status:data.is_family_history,
+      desc:data.family_history
+    },
+    {
+      infoType:1,
+      type:"pregnant",
+      name:'是否处于备孕、妊娠、哺乳期：',
+      nameTip:'',
+      status:data.is_pregnant,
+      desc:data.pregnant
+    },
+    {  infoType:1,
+      type:"operation",
+      name:'是否做过手术：',
+      nameTip:'手术史',
+      status:data.is_operation,
+      desc:data.operation
+    },
+    {
+      infoType:2,
+      type:"drink_wine",
+      name:'是否有饮酒史：',
+      nameTip:'',
+      status:data.drink_wine_status,
+      desc:''
+    },
+    {
+      infoType:2,
+      type:"smoke",
+      name:'是否有吸烟史：',
+      nameTip:'',
+      status:data.smoke_status,
+      desc:''
+    },
+    {
+      infoType:3,
+      type:"chemical",
+      name:'是否有接触过化学物：',
+      nameTip:'接触过的化学物：',
+      status:data.chemical_compound_status,
+      desc:data.chemical_compound_describe
+    },
+    {
+      infoType:4,
+      type:'hospital',
+      name:'确诊医院：',
+      status:'',
+      nameTip:'',
+      desc:data.diagnosis_hospital
+    },
+    {
+      type:"takeMedince",
+      name:'是否服药：',
+      nameTip:'正在服药：',
+      status:data.is_take_medicine,
+      desc:data.drugs_name,
+      infoType:1
+    }
+    ]
+    if(data.sex==1){
+      filter1=arr.filter((item)=>{
+          return  item.type!="pregnant"
+      });
+   }else{
+      filter1=arr;
+   }
+   if(!data.diagnosis_hospital){
+      filter2=filter1.filter((item)=>{
+          return  item.type!="hospital"
+      });
+   }else{
+      filter2=filter1
+   }
+   let newarr=filter2.filter((item)=>{
+     return  item.status!=null 
+   });
+    let date=formatDateText(this.data.sick.diagnosis_date);
+      this.setData({
+        otherList:newarr,
+        "sick.diagnosis_date":date
+      })
+
+    })
+   },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.getsickInfo(options.order_no)
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  
+})

healthyService/pages/sickInfo/sickInfo.json

@@ -0,0 +1,7 @@
+{
+  "usingComponents": {
+    "nav":"../../../components/nav/nav"
+  },
+  "navigationStyle":"custom",
+  "navigationBarTitleText": "肝胆相照互联网医院"
+}

healthyService/pages/sickInfo/sickInfo.wxml

@@ -0,0 +1,93 @@
+<!--pages/sickInfo/sickInfo.wxml-->
+<nav navName="病例信息"></nav>
+<view class="page">
+  <view class="wraper">
+    <view class="databox">
+      <view class="title">基本信息</view>
+
+      <view class="cell">
+        <view class="name">{{sick.name}}（<text wx:if="{{sick.sex=='1'}}">男</text><text wx:elif="{{sick.sex=='2'}}">女</text><text wx:else>未知</text>，{{sick.age}}岁）</view>
+      </view>
+      <view class="info">
+        <view class="row">
+          <view class="name">所患疾病：</view>
+          <view class="desc">{{sick.disease_class_name}}</view>
+        </view>
+        <view class="row">
+          <view class="name">确诊日期：</view>
+          <view class="desc">{{sick.diagnosis_date}}</view>
+        </view>
+        <view class="row">
+          <view class="name">病情主诉：</view>
+          <view class="desc">{{sick.disease_desc}}
+          </view>
+        </view>
+        <view class="row textbox" wx:if="{{sick.product.length>0}}">
+          <view class="name">用药意向：</view>
+          <view class="desc">
+            <text class="goods" wx:for="{{sick.product}}" wx:key="product_id">{{item}}</text>
+          </view>
+        </view>
+        <view class="row" wx:if="{{sick.diagnose_images.length>0}}">
+          <view class="name">复诊凭证：</view>
+        </view>
+        <view class="imglist">
+          <image src="{{item}}" class="img" wx:for="{{sick.diagnose_images}}" mode="aspectFill" wx:for-index="idx" wx:key="idx" bindtap="previewImage" data-id="{{idx}}" ></image>
+        </view>
+      </view>
+    </view>
+
+    <view class="databox other">
+      <view class="title">其他信息</view>
+      <view class="cell" wx:if="{{otherList.length>0}}">
+        <view class="row" wx:for="{{otherList}}" wx:key="type">
+          <view class="num">{{index+1}}、</view>
+          <view class="qabox" wx:if="{{item.infoType==1}}">
+            <view class="qa">
+              {{item.name}}
+              <text class="answer" wx:if="{{item.status==1}}">是</text><text class="answer" wx:else>否</text>
+            </view>
+            <view class="radiotip" wx:if="{{item.status==1 && item.desc}}">
+              <text>{{item.nameTip}}</text>
+              {{item.desc}}
+            </view>
+          </view>
+          <view class="qabox" wx:elif="{{item.infoType==2}}">
+            <view class="qa">
+              {{item.name}}
+              <text class="answer" wx:if="{{item.status==1}}">从不</text>
+              <text class="answer" wx:elif="{{item.status==2}}">偶尔</text>
+              <text class="answer" wx:elif="{{item.status==3}}">经常 </text>
+              <text class="answer" wx:elif="{{item.status==4}}">每天</text>
+              <text class="answer" wx:else>
+               <text wx:if="{{item.type=='smoke'}}">已戒烟</text>
+               <text wx:else>已戒酒</text>
+              </text>
+            </view>
+          </view>
+          <view class="qabox" wx:elif="{{item.infoType==3}}">
+            <view class="qa">
+              {{item.name}}
+              <text class="answer" wx:if="{{item.status==1}}">从不</text>
+              <text class="answer" wx:elif="{{item.status==2}}">偶尔</text>
+              <text class="answer" wx:elif="{{item.status==3}}">经常 </text>
+              <text class="answer" wx:elif="{{item.status==4}}">每天</text> 
+            </view>
+            <view class="radiotip"  wx:if="{{item.status && item.status!=1}}">
+              <text>{{item.nameTip}}</text>
+              {{item.desc}}
+            </view>
+          </view>
+          <view class="qabox" wx:elif="{{item.infoType==4}}">
+            <view class="qa">
+              {{item.name}}
+              <text class="answer" >{{item.desc}}</text>
+            </view>
+          </view>
+        </view>
+ 
+      </view>
+      <view class="nonedata cell" style="padding-bottom: 0;" wx:else>暂无数据！</view>
+    </view>
+  </view>
+</view>

healthyService/pages/sickInfo/sickInfo.wxss

@@ -0,0 +1,139 @@
+/* pages/sickInfo/sickInfo.wxss */
+.page{
+  display: flex;
+  flex-direction: column;
+}
+.wraper{
+  overflow: scroll;
+  flex:1;
+  margin-top: 172rpx;
+  -webkit-overflow-scrolling: touch;
+}
+.databox{
+  margin:0 32rpx;
+}
+.databox .title{
+  margin:30rpx 0 20rpx;
+}
+.cell{
+  background-color: #fff;
+  border-radius: 10rpx;
+  
+  
+
+}
+.other .cell{
+  margin-bottom: 20rpx;
+  min-height: 200rpx;
+}
+.other .cell{
+  padding-bottom: 30rpx;
+}
+.cell .name{
+  color: #333333;
+  height: 94rpx;
+  display: flex;
+  padding:0 20rpx;
+  align-items: center;
+  font-size: 34rpx;
+  border-bottom:1rpx solid #E7E7E7;
+}
+.info{
+  background-color: #fff;
+
+  padding-bottom: 30rpx;
+}
+.info .row{
+  line-height: 52rpx;
+  display: flex;
+ 
+  padding:0 20rpx;
+}
+.qabox{
+  width:100%;
+}
+.info .row:first-child{
+  padding-top: 30rpx;
+}
+.info .name{
+  white-space: nowrap;
+ font-size:32rpx;
+ color:#333;
+}
+.info .desc{
+  font-size:28rpx;
+  color:#666!important;
+  word-break: break-all;
+ }
+ .textbox .desc{
+  word-break: break-all;
+  line-height: 42rpx;
+  color: #666;
+  margin-bottom: 20rpx;
+  font-size: 28rpx;
+}
+.textbox .goods{
+  color:#666!important;
+  display: inline;
+  white-space:normal;
+}
+.textbox .goods:after{
+  content:"；"
+}
+.textbox .goods:last-child:after{
+  content:""
+}
+.textbox view:last-child{
+  margin-bottom: 0;
+}
+.textbox text{
+  color: #333333;
+  font-size: 28rpx;
+}
+ .imglist{
+   display: flex;
+   padding:0 20rpx;
+   flex-wrap: wrap;
+  
+ }
+ .img{
+   width: 148rpx;
+   height:148rpx;
+   margin-right: 18rpx;
+   margin-bottom: 18rpx;
+
+ }
+ .img:nth-child(4n){
+   margin-right: 0;
+ }
+ .other .row{
+   display: flex;
+   line-height: 52rpx;
+   padding:0 20rpx;
+ }
+ .other .row:first-child{
+   padding-top: 30rpx;
+ }
+ .other .row .answer{
+   color:#666;
+   font-size: 28rpx;
+ }
+ .radiotip{
+  padding:24rpx 20rpx;
+  word-break: break-all;
+  margin-right: 20rpx;
+  margin-bottom: 20rpx;
+  justify-content: center;
+  margin-top: 20rpx;
+
+  line-height: 42rpx;
+background: #F2F2F2;
+border-radius: 10rpx;
+font-size: 28rpx;
+color:#999;
+}
+
+.radiotip text{
+  white-space: nowrap;
+  color:#333;
+}

healthyService/pages/visitDetail/visitDetail.js

@@ -266,10 +266,11 @@ Page({
         }
       };
      this.setData({
-        chat_id:res.data.user_id
+        chat_id:res.user_id
      })
     })
   },
+
   handleGetServiceDetail(){
       let {doctor_id,currentFamilyId,service_type,follow_package_item_id,chat_id,sex,inquiry_mode,inquiry_type}=this.data;
     getServiceDetail({
@@ -313,10 +314,11 @@ Page({
   },
   handleCreateServiceChatOrder(id){
     createServiceChatOrder(id).then(res=>{
-        let order_inquiry_id=res.data.order_inquiry_id;
+        console.log(res);
+        let order_inquiry_id=res.order_inquiry_id;
         let chat_id=this.data.chat_id;
         app.method.navigateTo({
-            url: '/TUIService/pages/index?currentConversationID=' + chat_id + "&order_inquiry_id=" + order_inquiry_id + "&inquiry_type=3&fromType=chat" 
+            url: '/TUIService/pages/index?currentConversationID=' + chat_id + "&order_inquiry_id=" + order_inquiry_id + "&inquiry_type=1&fromType=chat" 
     })
   })
   },