选择桌位 & 卡座

@@ -9,6 +9,7 @@
         </view>
         </view>
     </view>
     </view>
     <view class="tid" wx:if="{{board.tid==2}}">包间</view>
     <view class="tid" wx:if="{{board.tid==2}}">包间</view>
+    <view class="tid" wx:if="{{board.tid==3}}">卡座</view>
     <view class="status" wx:if="{{board.status_str}}" style="width: {{width}}rpx;">{{board.status_str}}</view>
     <view class="status" wx:if="{{board.status_str}}" style="width: {{width}}rpx;">{{board.status_str}}</view>
     <icon type="success" size="20" color="#199095" class="desk-active" wx:if="{{board.isselect==true}}"/>
     <icon type="success" size="20" color="#199095" class="desk-active" wx:if="{{board.isselect==true}}"/>
 </view>
 </view>

@@ -7,6 +7,7 @@ Page({
       menu_active_id:''
       menu_active_id:''
     },
     },
     checked_tids:[],
     checked_tids:[],
+    desks:[],
     onLoad:function(opt){
     onLoad:function(opt){
         console.log('onLoad',opt)
         console.log('onLoad',opt)
         util.setBarTitle('选择桌位');
         util.setBarTitle('选择桌位');
@@ -52,24 +53,35 @@ Page({
         App.Reserve.GetTableList(formdata).then(function (json) {
         App.Reserve.GetTableList(formdata).then(function (json) {
             if(json.ret==200){
             if(json.ret==200){
                 console.log('this.checked_tids',that.checked_tids);
                 console.log('this.checked_tids',that.checked_tids);
-                if(json.data.length>0){
-                    json.data.forEach(function(v,i){
-                        v.list.forEach(function(r,n){
-                            r.isselect=false
-                            if(that.checked_tids._indexOf(r.id)>-1){
-                                r.isselect=true;
-                            }
-                        })
-                    })
-                }
-                that.setData({
-                    desklist:json.data,
-                  menu_active_id:json.data[0].name
-                })
+                that.desks=json.data
+                that.formatDesklist(true)
             }
             }
         })
         })
     },
     },
+  formatDesklist(hasFirst=true){
+    let desks=this.desks;
+    if(desks.length>0){
+      desks.forEach((v,i)=>{
+        v.list.forEach((r,n)=>{
+          r.isselect=false
+          if(this.checked_tids._indexOf(r.id)>-1){
+            r.isselect=true;
+          }
+        })
+      })
+      let param={
+        desklist:desks,
+      }
+      if(hasFirst){
+          param.menu_active_id=desks[0].name
+      }
+      this.setData(param)
+    }
+    return desks;
+  },
   switchMenu(e){
   switchMenu(e){
+
+    this.formatDesklist(false)
     this.setData({
     this.setData({
       menu_active_id:util.attr(e,'id')
       menu_active_id:util.attr(e,'id')
     })
     })