周到安排

@@ -218,6 +218,7 @@ Page({
           }
           App.Reserve.SetReserveStatus(params).then(()=>{
             this.getDetail(this.data.bookInfo.id,true);
+            PubSub.emit('fulshReseveList')
           })
         }else{//分配
           this.arrangeOrder()
@@ -250,6 +251,7 @@ Page({
       }
     App.Reserve.SetReserveStatus(params).then(()=>{
       this.getDetail(this.data.bookInfo.id,true);
+      PubSub.emit('fulshReseveList')
     })
   },
   easyCall(e){

@@ -27,6 +27,15 @@ Page({
     this.enter_params = util.cache('enter_params');
     this.seller_id=options.seller_id||this.enter_params.seller_id;
     this.getMembers();
+    PubSub.on('fulshReseveList',()=>{
+      this.switchTab({
+        currentTarget:{
+          dataset:{
+            type:this.data.activeType
+          }
+        }
+      });
+    })
   },
 
   /**

@@ -3,6 +3,7 @@
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle":"white",
   "usingComponents": {
-    "nav":"/components/nav/nav"
+    "nav":"/components/nav/nav",
+    "tabBar":"../../components/book/tabBar/tabBar"
   }
 }
\ No newline at end of file

@@ -8,9 +8,12 @@
 <view class="pages">
     <block wx:if="{{list.length>0}}">
         <view class="row" wx:for="{{list}}" wx:key="list.key" data-id="{{item.id}}" bindtap="gotoDetail">
-            <view class="flex-ll">
-                <view class="label">包间需求：</view>
-                <view class="content">{{item.room_demand_str||''}}</view>
+            <view class="flex-lr">
+                <view class="flex-ll">
+                    <view class="label">包间需求：</view>
+                    <view class="content">{{item.room_demand_str||''}}</view>
+                </view>
+                <view class="buttonStatus" wx:if="{{activeType==2}}">{{item.getStatusStr}}</view>
             </view>
             <view class="flex-ll">
                 <view class="label">就餐时间：</view>
@@ -21,13 +24,14 @@
                     <view class="label">预订客户：</view>
                     <view class="content">{{item.rname}}</view>
                 </view>
-                <view class="button">立即处理</view>
+                <view class="button" wx:if="{{activeType==1}}">立即处理</view>
             </view>
         </view>
     </block>
     <view wx:else="" class="history-is-empty flex-vc Medium">
         <image src="http://qn.colorcun.com/custom/lite-yd/image/history-is-empty.png"></image>
-        <view>暂时还没有客户</view>
+        <view>暂时还没订单</view>
     </view>
     <view wx:if="{{!hasMore}}" class="flex-vc hasMore">已经到底了</view>
 </view>
+<tabBar></tabBar>

 /* pack-book/pages/book/b_reserve.wxss */
 .pages{
     width: 90%;
-    margin: 80rpx auto 50rpx;
+    margin: 80rpx auto 0;
     color: #353535;
     overflow-y: auto;
+    padding-bottom: 150rpx;
 }
 .row{
     font-size: 34rpx;
@@ -32,12 +33,22 @@
     color: #fefefe;
     border-radius: 10rpx;
     padding: 2rpx 10rpx;
+    white-space:nowrap;
+}
+.buttonStatus{
+    border: solid 2rpx #199095;
+    color: #199095;
+    border-radius: 10rpx;
+    padding: 2rpx 10rpx;
+    white-space:nowrap;
+    transform: rotate(-15deg);
 }
 .tabs{
     background-color: #199095;
     margin-top: -2rpx;
     position: fixed;
     width: 100%;
+    z-index: 9;
 }
 .tabs .item{
     height: 80rpx;

@@ -115,6 +115,7 @@ module.exports ={
           seller_phone: bookInfo.seller.phone.substr(0, 20),
         }
         break;
+      //【周到安排】已为您预订陕西风味面馆的春满大地、福寿同乐包房，用餐时间为9月12日晚餐，祝您用餐愉快！订包间享优惠，微信搜索“周到安排”。
       case 'SMS_173950289'://运营安排包间
         smsData = {
           seller_name: bookInfo.seller.sellername.substr(0, 20),