录入调整

@@ -66,8 +66,10 @@ Component({
           }
           }
         },
         },
       })
       })
-
-
+    },
+    //桌位选择
+    boardChoose(){
+      //this.triggerEvent('boardEvent',{type:'boardChoose',id:this.data.board.id})
     },
     },
     //启停座位
     //启停座位
     boardEnable(status){
     boardEnable(status){

 <!--components/book/board/board.wxml-->
 <!--components/book/board/board.wxml-->
-<view class="board flex-cc {{board.status_classname}}"
-      style="width: {{width}}rpx;height: {{height}}rpx;"
+<view class="board flex-cc {{board.status_classname}} {{board.isselect?'border':''}} {{event}}"
+      style="width: {{width}}rpx;height: {{height}}rpx; "
         bindtap="boardClick">
         bindtap="boardClick">
     <view class="info">
     <view class="info">
         <view class="name">{{board.name}}</view>
         <view class="name">{{board.name}}</view>
@@ -10,4 +10,5 @@
     </view>
     </view>
     <view class="tid" wx:if="{{board.tid==2}}">包间</view>
     <view class="tid" wx:if="{{board.tid==2}}">包间</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}}"/>
 </view>
 </view>

@@ -5,6 +5,10 @@
   border-radius: 10rpx;
   border-radius: 10rpx;
   position: relative;
   position: relative;
   overflow: hidden;
   overflow: hidden;
+  border: 2rpx solid rgba(0,0,0,0)
+}
+.board.border{
+  border: 2rpx solid #199095;
 }
 }
 .board .tid{
 .board .tid{
   width: 72rpx;
   width: 72rpx;
@@ -57,4 +61,15 @@
 }
 }
 .board.disabled .tid,.board.disabled-highlight .tid{
 .board.disabled .tid,.board.disabled-highlight .tid{
   background-color: #94BCD6;
   background-color: #94BCD6;
+}
+.desk-active{
+  position: absolute;
+  top: -2rpx;
+  right: -2rpx;
+}
+.board.boardChoose .info{
+  margin-top: 10rpx;
+}
+.board.boardChoose .pnum{
+  margin-top: 20rpx;
 }
 }

 {
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "board":"/components/book/board/board"
+  }
 }
 }

 <view class="desk-list flex-rs">
 <view class="desk-list flex-rs">
     <block wx:for="{{list}}">
     <block wx:for="{{list}}">
-        <view class="desk-single flex-vc green-deep-bg desk-can black-font" data-id="{{item.id}}" bindtap="selectdesk">
-            <view class="font38r font-bold desk-name flex-cc font-more">{{item.name}}</view>
-            <view class="font34r desk-pnum flex-cc">{{item.table_pnum}}人桌</view>
-            <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>
-            </view>
-            <view class="order-desk-type flex-cc white-font" wx:if="{{item.tid==2}}">包间</view>
-        </view>
+        <board width="160" height="180" board="{{item}}"
+               style="margin: 20rpx 0 0 20rpx"
+               event="boardChoose"
+               data-id="{{item.id}}" bindtap="selectdesk"></board>
     </block>
     </block>
 </view>
 </view>

 @import '../common.wxss';
 @import '../common.wxss';
 .desk-list{
 .desk-list{
-    width:640rpx;
+    width: 570rpx;
     height:auto;
     height:auto;
     margin:0 auto;
     margin:0 auto;
 }
 }

@@ -514,5 +514,5 @@ Page({
         scrollTop: rect.bottom
         scrollTop: rect.bottom
       })
       })
     }).exec()
     }).exec()
-  },
+  }
 })
 })

@@ -8,6 +8,7 @@
     "nav":"/components/nav/nav",
     "nav":"/components/nav/nav",
     "tabBar":"/components/book/tabBar/tabBar",
     "tabBar":"/components/book/tabBar/tabBar",
     "searchList":"/components/searchlist/searchlist",
     "searchList":"/components/searchlist/searchlist",
-    "calendar": "plugin://calendar/calendar"
+    "calendar": "plugin://calendar/calendar",
+    "board":"/components/book/board/board"
   }
   }
 }
 }

@@ -133,25 +133,12 @@
             </view>
             </view>
             <view class="advice-desk-detail flex-rr" wx:if="{{tables.length>0}}">
             <view class="advice-desk-detail flex-rr" wx:if="{{tables.length>0}}">
                 <block wx:for="{{tablesed||tables}}" wx:key="tables.key">
                 <block wx:for="{{tablesed||tables}}" wx:key="tables.key">
-                    <view class="order-desk-info {{item.isselect?'desk-checked':''}}"
-                          bindtap="selectedValue"
-                          data-value="{{index}}"
-                          data-key="tid">
-                        <block wx:if="{{item.tid==2}}">
-                            <view class="flex-vc order-desk-detail" style="height:100%;">
-                                <view class="font28r black-font smooth">{{item.name}}</view>
-                                <view class="font26r black-font" style="margin-top:6rpx;">{{item.table_pnum}}人</view>
-                            </view>
-                            <view class="order-desk-type flex-cc white-font">包间</view>
-                        </block>
-                        <block wx:else>
-                            <view class="flex-vc order-desk-detail" style="height:100%;">
-                                <view class="font28r black-font smooth">{{item.name}}</view>
-                                <view class="font26r black-font" style="margin-top:6rpx;">{{item.table_pnum}}人</view>
-                            </view>
-                        </block>
-                        <icon type="success" size="20" color="#199095" class="desk-active" wx:if="{{item.isselect==true}}"/>
-                    </view>
+                    <board width="160" height="180" board="{{item}}"
+                           style="margin: 20rpx 0 0 20rpx"
+                           event="boardChoose"
+                           data-value="{{index}}"
+                           bindtap="selectedValue"
+                           data-key="tid"></board>
                 </block>
                 </block>
             </view>
             </view>
             <view class="advice-desk-detail flex-cc" wx:else="">
             <view class="advice-desk-detail flex-cc" wx:else="">

@@ -8,7 +8,7 @@
             <view class="hip" wx:if="{{item.chenkNum>0}}">{{item.chenkNum}}</view>
             <view class="hip" wx:if="{{item.chenkNum>0}}">{{item.chenkNum}}</view>
         </view>
         </view>
     </view>
     </view>
-    <view style="height: {{height-80}}px;overflow-y: auto;padding-bottom: 160rpx;overflow-x: hidden">
+    <view style="height: {{height-80}}px;overflow-y: auto;padding-bottom: 160rpx;overflow-x: hidden;width: 100%;">
         <block wx:for="{{desklist}}">
         <block wx:for="{{desklist}}">
             <orderDesk list="{{item.list}}" bind:changedesk="changedesk" wx:if="{{item.name==menu_active_id}}"></orderDesk>
             <orderDesk list="{{item.list}}" bind:changedesk="changedesk" wx:if="{{item.name==menu_active_id}}"></orderDesk>
         </block>
         </block>
@@ -16,17 +16,5 @@
     </view>
     </view>
 </view>
 </view>
 <view class="confirm-button white-font flex-vc font34r {{hasCheckedTable ? 'confirm-button-active' : ''}}" bindtap="back">确定</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>
--->
+
 
 

@@ -64,12 +64,12 @@ view{
 }
 }
 
 
 .menus{
 .menus{
-    width: 220rpx;
-    min-width: 220rpx;
+    width: 168rpx;
+    min-width: 168rpx;
     background-color: #F5F5F5;
     background-color: #F5F5F5;
 }
 }
 .menus-item{
 .menus-item{
-    width: 220rpx;
+    width: 168rpx;
     height: 158rpx;
     height: 158rpx;
     line-height: 158rpx;
     line-height: 158rpx;
     font-size: 34rpx;
     font-size: 34rpx;
@@ -83,7 +83,7 @@ view{
 }
 }
 .menus-item .name{
 .menus-item .name{
     width: 140rpx;
     width: 140rpx;
-    height: 48rpx;
+    max-height: 96rpx;
     line-height: 48rpx;
     line-height: 48rpx;
     overflow: hidden;
     overflow: hidden;
     text-align: center;
     text-align: center;

@@ -30,7 +30,7 @@
 			"list": []
 			"list": []
 		},
 		},
 		"miniprogram": {
 		"miniprogram": {
-			"current": 15,
+			"current": 21,
 			"list": [
 			"list": [
 				{
 				{
 					"id": 0,
 					"id": 0,
@@ -194,6 +194,13 @@
 					"name": "桌位",
 					"name": "桌位",
 					"pathName": "pages/book/b_setting",
 					"pathName": "pages/book/b_setting",
 					"query": ""
 					"query": ""
+				},
+				{
+					"id": -1,
+					"name": "预定本-80商家",
+					"pathName": "pages/book/b_index",
+					"query": "seller_id=80&seller_openid=oGefL4qKBWIh5xwyg3LVfkMbDumA&manager_id=",
+					"scene": "1001"
 				}
 				}
 			]
 			]
 		}
 		}