diff --git a/user/pages/yishi/orderdetail/index.js b/user/pages/yishi/orderdetail/index.js
index 9dcd891..f66d23b 100644
--- a/user/pages/yishi/orderdetail/index.js
+++ b/user/pages/yishi/orderdetail/index.js
@@ -12,6 +12,7 @@ Page({
         id:2,
         name:'服务包订单'
       }],
+     
     navbarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '收益明细 ', //导航栏 中间的标题
@@ -61,6 +62,9 @@ Page({
     let params = {};
     params.page = this.data.current_page + 1;
     params.date = this.data.date;
+
+    //1:问诊订单 2:药品订单 3:检测订单 4:随访包订单 5:健康包订单)
+    params.per_page=10;
     api.getDoctorAccountInfo(params).then(response => {
       console.log(response);
       this.setData({
diff --git a/user/pages/yishi/orderdetail/index.wxml b/user/pages/yishi/orderdetail/index.wxml
index 24efe78..bfdfc30 100644
--- a/user/pages/yishi/orderdetail/index.wxml
+++ b/user/pages/yishi/orderdetail/index.wxml
@@ -1,25 +1,27 @@
 <!-- 收益明细 -->
 <te-nav-bar navbar-data='{{navbarData}}' ></te-nav-bar>
 <view class="container">
- <view class="tabbox">
+ <!-- <view class="tabbox">
   <view class="tab {{active==item.id?'active':''}}" wx:for="{{tabList}}" wx:key="id" bind:tap="switchTab" data-id="{{item.id}}">{{item.name}}</view>
 
- </view>
+ </view> -->
   <view class="order_list">
     <view class="order_item" wx:for="{{list}}">
       <view class="order_item_content">
         <view class="order_item_content_top ">
-          {{ item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':item.inquiry_type==1 && item.inquiry_mode==8?'在线问诊-健康包':item.inquiry_type==1 && item.inquiry_mode==9?'在线问诊-随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }}
+          {{ item.inquiry_type==1 && item.inquiry_mode==1?'在线问诊-图文':item.inquiry_type==1 && item.inquiry_mode==2?'在线问诊-视频':item.inquiry_type==1 && item.inquiry_mode==6?'疑难会诊':(item.inquiry_type==1 && item.inquiry_mode==8)?'在线问诊-健康包':(item.inquiry_type==1 && item.inquiry_mode==9)?'在线问诊-随访包':item.inquiry_type==2?'快速问诊':item.inquiry_type==3?'公益问诊':item.inquiry_type==4?'问诊购药':'其他' }}
         <!-- <view class="order_status order_status_cancle">{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'问诊结束':item.inquiry_status==7?'已取消':'其他' }}</view> -->
         <view class="order_status order_status_cancle {{item.entry_status==1?'entrying':item.entry_status==2?'entrysuccess':item.entry_status==3?'entryfail':'' }}">{{ item.entry_status==1?'入账中':item.entry_status==2?'入账成功':item.entry_status==3?'入账失败':'未知' }}</view>
         </view>
         <view class="order_item_content_data">
-          <view class="order_id">订单编号：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.inquiry_no}}</text></view>
+          <view class="order_id">订单编号：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.order_no}}</text></view>
           <view class="order_id">就诊患者：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.patient_name}}（{{item.patient_sex==1?'男':'女'}}，{{item.patient_age}}岁）</text></view>
-          <view class="order_id">接诊时间：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.reception_time}}</text></view>
+          <view class="order_id">{{(item.order_type==4 || item.order_type==5)?'开始时间':'问诊时间'}}：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.start_time}}</text></view>
           <view class="order_id" wx:if="{{item.finish_time}}">结束时间：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">{{item.finish_time}}</text></view>
           <view class="order_id">订单金额：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">￥{{item.amount_total}}</text></view>
-          <view class="order_id">预计收入：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">￥{{item.estimate_income}}</text></view>
+          <view class="order_id" wx:if="{{item.entry_status==1 || item.entry_status==2}}"><text wx:if="{{item.entry_status==1}}">预计入账</text><text decode wx:elif="{{item.entry_status==2}}">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;入账</text>：<text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">￥{{item.estimate_income}}</text></view>
+          <view class="order_id" wx:if="{{item.entry_status==3}}"><text decode>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;原因：</text><text style="font-size: 30rpx;color: rgba(0,0,0,0.85);">￥{{item. cancel_remarks}}</text></view>
+         
         </view>
       </view>
     </view>