录入调整

@@ -6,6 +6,7 @@
             <view class="desk-mask {{item.isselect==true ? 'desk-mask-active white-font flex-vc font24r' : ''}}">
             <view class="desk-mask {{item.isselect==true ? 'desk-mask-active white-font flex-vc font24r' : ''}}">
                 <icon type="success_no_circle" class="icon-success" color="#fff" size="13"></icon>
                 <icon type="success_no_circle" class="icon-success" color="#fff" size="13"></icon>
             </view>
             </view>
+            <view class="order-desk-type flex-cc white-font" wx:if="{{item.tid==2}}">包间</view>
         </view>
         </view>
     </block>
     </block>
 </view>
 </view>

 @import '../common.wxss';
 @import '../common.wxss';
 .desk-list{
 .desk-list{
-    width:740rpx;
+    width:640rpx;
     height:auto;
     height:auto;
     margin:0 auto;
     margin:0 auto;
 }
 }
 .desk-single{
 .desk-single{
-    width:200rpx;
-    height:200rpx;
+    width:210rpx;
+    height:210rpx;
     box-sizing:border-box;
     box-sizing:border-box;
     border-radius:10rpx;
     border-radius:10rpx;
     margin-left:35rpx;
     margin-left:35rpx;
@@ -38,8 +38,8 @@
     border-radius:50%;
     border-radius:50%;
     border:1px solid #fff;
     border:1px solid #fff;
     position:absolute;
     position:absolute;
-    right:10rpx;
-    top:10rpx;
+    right:0rpx;
+    top:0rpx;
 }
 }
 .desk-mask-active{
 .desk-mask-active{
     border:1px solid #199095;
     border:1px solid #199095;
@@ -52,7 +52,7 @@
     top:6rpx;
     top:6rpx;
 }
 }
 .green-deep-bg{
 .green-deep-bg{
-    border:1px solid #199095;
+    border:1px solid #A9E3E6;
     background:#A9E3E6;
     background:#A9E3E6;
 }
 }
 .gray-deep-bg{
 .gray-deep-bg{
@@ -75,4 +75,15 @@
     width:100%;
     width:100%;
     height:55rpx;
     height:55rpx;
     background:#777;
     background:#777;
+}
+.order-desk-type{
+    height:30rpx;
+    line-height: 30rpx;
+    background:#61A5D1;
+    position:absolute;
+    left:0;
+    top:0;
+    font-size: 26rpx;
+    padding: 0 12rpx 4rpx 8rpx;
+    border-radius: 0 16rpx 16rpx 0;
 }
 }

@@ -4,7 +4,7 @@ import App from '../../utils/api';
 const {regeneratorRuntime} = global
 const {regeneratorRuntime} = global
 Page({
 Page({
     data:{
     data:{
-
+      menu_active_id:''
     },
     },
     checked_tids:[],
     checked_tids:[],
     onLoad:function(opt){
     onLoad:function(opt){
@@ -27,6 +27,9 @@ Page({
         this.getdesklist();
         this.getdesklist();
     },
     },
     onShow:function(){
     onShow:function(){
+        this.setData({
+          height:getApp().system.windowHeight-55
+        })
     },
     },
     changedesk:function(e){
     changedesk:function(e){
         let tableid=util.cache('tableid');
         let tableid=util.cache('tableid');
@@ -60,9 +63,15 @@ Page({
                     })
                     })
                 }
                 }
                 that.setData({
                 that.setData({
-                    desklist:json.data
+                    desklist:json.data,
+                  menu_active_id:json.data[0].name
                 })
                 })
             }
             }
         })
         })
     },
     },
+  switchMenu(e){
+    this.setData({
+      menu_active_id:util.attr(e,'id')
+    })
+  },
 })
 })

 <nav>选择桌位</nav>
 <nav>选择桌位</nav>
 <!--桌位状态-->
 <!--桌位状态-->
-<view class="desk-list" style="padding-bottom:180rpx;">
-    <block wx:for="{{desklist}}">
-        <view class="desk-region black-font font34r font-bold">{{item.name}}</view>
-        <orderDesk list="{{item.list}}" bind:changedesk="changedesk"></orderDesk>
-    </block>
+<view class="flex-lr" style="border-top:2rpx solid #E0E0E0">
+    <view class="menus" style="height: {{height}}px; overflow-y: auto;overflow-x: hidden;">
+        <view class="menus-item flex-cc {{item.name==menu_active_id?'active':''}}"
+              wx:for="{{desklist}}" bindtap="switchMenu" data-id="{{item.name}}">
+            <view class="name">{{item.name}}</view>
+            <view class="hip" wx:if="{{item.chenkNum>0}}">{{item.chenkNum}}</view>
+        </view>
+    </view>
+    <view style="height: {{height-80}}px;overflow-y: auto;padding-bottom: 160rpx;overflow-x: hidden">
+        <block wx:for="{{desklist}}">
+            <orderDesk list="{{item.list}}" bind:changedesk="changedesk" wx:if="{{item.name==menu_active_id}}"></orderDesk>
+        </block>
+
+    </view>
+</view>
+<view class="confirm-button white-font flex-vc font34r {{hasCheckedTable ? 'confirm-button-active' : ''}}" bindtap="back">确定</view>
+<!--
+<view class="desk-list flex-ll" style="padding-bottom:180rpx;">
+    <view class="menus">
+        <view class="menus-item" wx:for="{{desklist}}" >{{item.name}}</view>
+    </view>
+    <view>
+        <block wx:for="{{desklist}}">
+            <orderDesk list="{{item.list}}" bind:changedesk="changedesk"></orderDesk>
+        </block>
+        <view class="confirm-button white-font flex-vc font34r {{hasCheckedTable ? 'confirm-button-active' : ''}}" bindtap="back">确定</view>
+    </view>
 </view>
 </view>
+-->
 
 
-<view class="confirm-button white-font flex-vc font34r {{hasCheckedTable ? 'confirm-button-active' : ''}}" bindtap="back">确定</view>

@@ -50,16 +50,54 @@ view{
 }
 }
 
 
 .confirm-button{
 .confirm-button{
-    width:680rpx;
+    width:460rpx;
     height:85rpx;
     height:85rpx;
     background:#74BBBE;
     background:#74BBBE;
     position:fixed;
     position:fixed;
-    left:0;
-    right:0;
-    bottom:60rpx;
+    left:250rpx;
+    bottom:40rpx;
     margin:0 auto;
     margin:0 auto;
     border-radius:10rpx;
     border-radius:10rpx;
 }
 }
 .confirm-button-active{
 .confirm-button-active{
     background:#199095;
     background:#199095;
+}
+
+.menus{
+    width: 220rpx;
+    min-width: 220rpx;
+    background-color: #F5F5F5;
+}
+.menus-item{
+    width: 220rpx;
+    height: 158rpx;
+    line-height: 158rpx;
+    font-size: 34rpx;
+    border: 2rpx solid #E0E0E0;
+    border-top-width: 0;
+    border-left-width: 0;
+    position: relative;
+}
+.menus-item.active{
+    background-color: #FEFEFE;
+}
+.menus-item .name{
+    width: 140rpx;
+    height: 48rpx;
+    line-height: 48rpx;
+    overflow: hidden;
+    text-align: center;
+}
+.menus-item .hip{
+    background-color: #f00;
+    width: 40rpx;
+    height: 40rpx;
+    position: absolute;
+    border-radius: 50%;
+    color: #fefefe;
+    text-align: center;
+    line-height: 40rpx;
+    font-size: 22rpx;
+    top:10rpx;
+    right: 10rpx;
 }
 }

@@ -30,7 +30,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 17,
+			"current": 19,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -181,6 +181,13 @@
 						"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
 						"shareName": "8DEbIRpK4pa9mH_QY2vU4ZUKYPuI97WoQ4BQoFej-Q8@cr4dev",
 						"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
 						"shareKey": "PZhnqMlY2TnRuHhATyGeSamVmBQUDXXr_WtjRSddeeFK17UAiOP-HNOdhxiEN7PFub5S1DjAeUl0IXOdW-VDqg~~"
 					}
 					}
+				},
+				{
+					"id": -1,
+					"name": "预定本-选择桌子",
+					"pathName": "pages/book/b_desk",
+					"query": "rdate=1540339200-1540346400&tid=0&pnum=6&checked_tids=&rid=",
+					"scene": "1001"
 				}
 				}
 			]
 			]
 		}
 		}