Commit d8ece10213aa57a87aa18880e88100dae270272e

Authored by vking
1 parent 5f773c6d

桌位显示区域名称

@@ -36,6 +36,7 @@ Component({ @@ -36,6 +36,7 @@ Component({
36 type:Boolean, 36 type:Boolean,
37 value:false 37 value:false
38 }, 38 },
  39 + hasRegionName:Boolean,
39 }, 40 },
40 41
41 /** 42 /**
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
18 <view class="tid" wx:if="{{board.tid==2}}">包间</view> 18 <view class="tid" wx:if="{{board.tid==2}}">包间</view>
19 <view class="tid" wx:if="{{board.tid==3}}">卡座</view> 19 <view class="tid" wx:if="{{board.tid==3}}">卡座</view>
20 <view class="status" wx:if="{{board.status_str}}" style="width: {{width}}rpx;">{{board.status_str}}</view> 20 <view class="status" wx:if="{{board.status_str}}" style="width: {{width}}rpx;">{{board.status_str}}</view>
  21 + <view class="board-region-name" wx:if="{{hasRegionName}}" style="width: {{width}}rpx;">{{board.region_name}}</view>
21 <icon type="success" size="20" color="#199095" class="desk-active" wx:if="{{board.isselect==true}}"/> 22 <icon type="success" size="20" color="#199095" class="desk-active" wx:if="{{board.isselect==true}}"/>
22 </view> 23 </view>
23 <as items="{{itemList}}" 24 <as items="{{itemList}}"
@@ -37,6 +37,21 @@ @@ -37,6 +37,21 @@
37 border-radius: 0 0 10rpx 10rpx; 37 border-radius: 0 0 10rpx 10rpx;
38 border: 2rpx solid #777777; 38 border: 2rpx solid #777777;
39 } 39 }
  40 +.board-region-name{
  41 + position: absolute;
  42 + bottom:-2rpx;
  43 + left: -2rpx;
  44 + height: 36rpx;
  45 + text-align: center;
  46 + line-height: 36rpx;
  47 + font-size: 26rpx;
  48 + background-color:rgba(137,192,183,1);
  49 + font-family:PingFangSC-Semibold,PingFang SC;
  50 + font-weight:600;
  51 + color:rgba(254,254,254,1);
  52 + border-radius: 0 0 10rpx 10rpx;
  53 + border: 2rpx solid rgba(137,192,183,1);
  54 +}
40 .board .info{ 55 .board .info{
41 text-align: center; 56 text-align: center;
42 margin: -10rpx 10% 0; 57 margin: -10rpx 10% 0;
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <view class="advice-desk-detail flex-rr" wx:if="{{tables.length>0}}"> 51 <view class="advice-desk-detail flex-rr" wx:if="{{tables.length>0}}">
52 <block wx:for="{{tablesed||tables}}" wx:key="tableskey"> 52 <block wx:for="{{tablesed||tables}}" wx:key="tableskey">
53 <board width="160" height="180" board="{{item}}" 53 <board width="160" height="180" board="{{item}}"
54 - style="margin: 20rpx 0 0 20rpx" 54 + style="margin: 20rpx 0 0 20rpx" hasRegionName
55 event="boardChoose" className="noBottom" 55 event="boardChoose" className="noBottom"
56 data-value="{{index}}" 56 data-value="{{index}}"
57 bindtap="selectedValue" 57 bindtap="selectedValue"