Showing
3 changed files
with
60 additions
and
82 deletions
| @@ -33,7 +33,7 @@ Page({ | @@ -33,7 +33,7 @@ Page({ | ||
| 33 | }, | 33 | }, |
| 34 | onShow: function () { | 34 | onShow: function () { |
| 35 | this.setData({ | 35 | this.setData({ |
| 36 | - height: getApp().system.windowHeight - 55 | 36 | + height: getApp().system.windowHeight - 65 |
| 37 | }) | 37 | }) |
| 38 | }, | 38 | }, |
| 39 | changedesk: function (e) { | 39 | changedesk: function (e) { |
| 1 | <nav>选择桌位</nav> | 1 | <nav>选择桌位</nav> |
| 2 | <!--桌位状态--> | 2 | <!--桌位状态--> |
| 3 | -<view class="flex-lr" style="border-top:1rpx solid #E0E0E0"> | 3 | +<view class="disks flex-lr"> |
| 4 | + <!-- | ||
| 4 | <view class="menus" style="height: {{height}}px; overflow-y: auto;overflow-x: hidden;align-self:flex-start "> | 5 | <view class="menus" style="height: {{height}}px; overflow-y: auto;overflow-x: hidden;align-self:flex-start "> |
| 5 | <view class="menus-item flex-cc {{item.name==menu_active_id?'active':''}}" | 6 | <view class="menus-item flex-cc {{item.name==menu_active_id?'active':''}}" |
| 6 | wx:for="{{desklist}}" wx:key="desklist.key" | 7 | wx:for="{{desklist}}" wx:key="desklist.key" |
| @@ -9,6 +10,15 @@ | @@ -9,6 +10,15 @@ | ||
| 9 | <view class="hip" wx:if="{{item.chenkNum>0}}">{{item.chenkNum}}</view> | 10 | <view class="hip" wx:if="{{item.chenkNum>0}}">{{item.chenkNum}}</view> |
| 10 | </view> | 11 | </view> |
| 11 | </view> | 12 | </view> |
| 13 | + --> | ||
| 14 | + <view class="menus Medium" style="height: {{height}}px;"> | ||
| 15 | + <view class="menu flex-cc {{menu_active_id==item.name?'active':''}}" | ||
| 16 | + wx:for="{{desklist}}" wx:key="desklist.key" | ||
| 17 | + bindtap="switchMenu" data-id="{{item.name}}"> | ||
| 18 | + <view class="menu-text">{{item.name}}</view> | ||
| 19 | + <view class="last-num {{item.list_num>0?'':'full'}}">{{item.list_num>0?'余'+item.list_num:'满座'}}</view> | ||
| 20 | + </view> | ||
| 21 | + </view> | ||
| 12 | <view style="height: {{height-80}}px;overflow-y: auto;padding-bottom: 160rpx;overflow-x: hidden;width: 100%;"> | 22 | <view style="height: {{height-80}}px;overflow-y: auto;padding-bottom: 160rpx;overflow-x: hidden;width: 100%;"> |
| 13 | <block wx:for="{{desklist}}" wx:key="desklist.key"> | 23 | <block wx:for="{{desklist}}" wx:key="desklist.key"> |
| 14 | <orderDesk list="{{item.list}}" checkedTids="{{opt.checked_tids}}" | 24 | <orderDesk list="{{item.list}}" checkedTids="{{opt.checked_tids}}" |
| 1 | -view{ | ||
| 2 | - line-height:1.2; | 1 | +.disks{ |
| 2 | + width: 100%; | ||
| 3 | + background-color: #fefefe; | ||
| 4 | + border-top:1rpx solid #E0E0E0; | ||
| 3 | } | 5 | } |
| 4 | -.other-info{ | ||
| 5 | - width:100%; | ||
| 6 | - height:220rpx; | ||
| 7 | - padding:20rpx 0; | ||
| 8 | - box-sizing:border-box; | 6 | +.disks .menus,.disks .items{ |
| 7 | + overflow-y: auto; | ||
| 9 | } | 8 | } |
| 10 | -.selected-time{ | ||
| 11 | - width:375rpx; | ||
| 12 | - height:100%; | ||
| 13 | - border-right:1px solid #efeef3; | ||
| 14 | - box-sizing:border-box; | ||
| 15 | -} | ||
| 16 | -.actual-time{ | ||
| 17 | - margin-top:10rpx; | 9 | +.disks .menus{ |
| 10 | + background-color: #f5f5f5; | ||
| 11 | + width: 168rpx; | ||
| 12 | + min-width: 168rpx; | ||
| 13 | + color: #999999; | ||
| 18 | } | 14 | } |
| 19 | -.cut{ | ||
| 20 | - width:100%; | ||
| 21 | - height:4px; | ||
| 22 | - background:#efeef3; | 15 | +.disks .menu{ |
| 16 | + height: 160rpx; | ||
| 17 | + border-left: 4rpx solid #F5F5F5; | ||
| 18 | + border-bottom: 1rpx solid #fefefe; | ||
| 19 | + position: relative; | ||
| 23 | } | 20 | } |
| 24 | - | ||
| 25 | - | ||
| 26 | - | ||
| 27 | -.desk-type{ | ||
| 28 | - width:680rpx; | ||
| 29 | - padding:40rpx 0 20rpx; | ||
| 30 | - margin:0 auto; | 21 | +.disks .menu.active{ |
| 22 | + background-color: #fefefe; | ||
| 23 | + border-left: 4rpx solid #199095; | ||
| 24 | + color: #199095; | ||
| 25 | +} | ||
| 26 | +.disks .menu-text{ | ||
| 27 | + font-size: 30rpx; | ||
| 28 | + width: 120rpx; | ||
| 29 | + margin: 0 auto; | ||
| 30 | + max-height: 84rpx; | ||
| 31 | + line-height: 42rpx; | ||
| 32 | + overflow: hidden; | ||
| 31 | } | 33 | } |
| 32 | -.desk-type-single{ | ||
| 33 | - width:160rpx; | ||
| 34 | - height:60rpx; | ||
| 35 | - border:1px solid #199095; | ||
| 36 | - border-radius:30rpx; | ||
| 37 | - background:#EBF8F8; | 34 | +.disks .items{ |
| 35 | + width: 100%; | ||
| 38 | } | 36 | } |
| 39 | -.desk-type-single-active{ | ||
| 40 | - background:#199095; | 37 | +.disks .items-disks{ |
| 38 | + margin: 0 auto; | ||
| 39 | + width: 570rpx; | ||
| 40 | + padding-bottom: 80rpx; | ||
| 41 | } | 41 | } |
| 42 | - | ||
| 43 | -.desk-list{ | ||
| 44 | - width:100%; | 42 | +.disks .menu .last-num{ |
| 43 | + position: absolute; | ||
| 44 | + left: -4rpx; | ||
| 45 | + top:0rpx; | ||
| 46 | + width: 78rpx; | ||
| 47 | + height: 30rpx; | ||
| 48 | + line-height: 30rpx; | ||
| 49 | + font-size: 24rpx; | ||
| 50 | + color: #FEFEFE; | ||
| 51 | + background-color: #61A5D1; | ||
| 52 | + text-align: center; | ||
| 53 | + border-radius: 0 30rpx 30rpx 0; | ||
| 45 | } | 54 | } |
| 46 | -.desk-region{ | ||
| 47 | - width:680rpx; | ||
| 48 | - padding-top:40rpx; | ||
| 49 | - margin:0 auto; | 55 | +.disks .menu .last-num.full{ |
| 56 | + background-color: #999999; | ||
| 50 | } | 57 | } |
| 51 | 58 | ||
| 52 | .confirm-button{ | 59 | .confirm-button{ |
| @@ -61,43 +68,4 @@ view{ | @@ -61,43 +68,4 @@ view{ | ||
| 61 | } | 68 | } |
| 62 | .confirm-button-active{ | 69 | .confirm-button-active{ |
| 63 | background:#199095; | 70 | background:#199095; |
| 64 | -} | ||
| 65 | - | ||
| 66 | -.menus{ | ||
| 67 | - width: 168rpx; | ||
| 68 | - min-width: 168rpx; | ||
| 69 | - background-color: #F5F5F5; | ||
| 70 | -} | ||
| 71 | -.menus-item{ | ||
| 72 | - width: 168rpx; | ||
| 73 | - height: 158rpx; | ||
| 74 | - line-height: 158rpx; | ||
| 75 | - font-size: 34rpx; | ||
| 76 | - border: 1rpx solid #E0E0E0; | ||
| 77 | - border-top-width: 0; | ||
| 78 | - border-left-width: 0; | ||
| 79 | - position: relative; | ||
| 80 | -} | ||
| 81 | -.menus-item.active{ | ||
| 82 | - background-color: #FEFEFE; | ||
| 83 | -} | ||
| 84 | -.menus-item .name{ | ||
| 85 | - width: 140rpx; | ||
| 86 | - max-height: 96rpx; | ||
| 87 | - line-height: 48rpx; | ||
| 88 | - overflow: hidden; | ||
| 89 | - text-align: center; | ||
| 90 | -} | ||
| 91 | -.menus-item .hip{ | ||
| 92 | - background-color: #f00; | ||
| 93 | - width: 40rpx; | ||
| 94 | - height: 40rpx; | ||
| 95 | - position: absolute; | ||
| 96 | - border-radius: 50%; | ||
| 97 | - color: #fefefe; | ||
| 98 | - text-align: center; | ||
| 99 | - line-height: 40rpx; | ||
| 100 | - font-size: 22rpx; | ||
| 101 | - top:10rpx; | ||
| 102 | - right: 10rpx; | ||
| 103 | } | 71 | } |
-
Please register or login to post a comment