xt / xcx-book · Commits

Go to a project

Commit 81225ee0f151e679c935dfb47f1e56e5d3841965

Authored by vking
2 parents 96085c94 e8226ea3
build: skipped

Merge remote-tracking branch 'origin/master'

Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <block wx:for="{{roomlist}}" wx:key="{{index}}"> 2 <block wx:for="{{roomlist}}" wx:key="{{index}}">
3 <view class="room-item black-font {{item.isfull==1 ? 'border-gray bg-gray' : 'border-yellow bg-yellow'}} flex-vl" style="justify-content:center;" data-id="{{item.id}}" data-index="{{index}}" data-selectnum="{{item.selectnum}}" catchtap="{{item.isfull==1 ? '' : 'selectroom'}}"> 3 <view class="room-item black-font {{item.isfull==1 ? 'border-gray bg-gray' : 'border-yellow bg-yellow'}} flex-vl" style="justify-content:center;" data-id="{{item.id}}" data-index="{{index}}" data-selectnum="{{item.selectnum}}" catchtap="{{item.isfull==1 ? '' : 'selectroom'}}">
4 <view class="font30r font-bold">{{item.name}}</view> 4 <view class="font30r font-bold">{{item.name}}</view>
5 - <view class="font24r font-bold room-more">最多可坐8人</view>  
6 - <view class="font20r font-bold room-consume">最低消费300元</view> 5 + <view class="font24r room-more">最多可坐8人</view>
  6 + <view class="font20r room-consume">最低消费300元</view>
7 <block wx:if="{{item.isfull==1}}"> 7 <block wx:if="{{item.isfull==1}}">
8 <view class="room-full black-font font24r">订满</view> 8 <view class="room-full black-font font24r">订满</view>
9 </block> 9 </block>
1 <view class="select-rooms flex-rs"> 1 <view class="select-rooms flex-rs">
2 - <view class="select-rooms-title black-font font-bold font30r">已选包间</view> 2 + <view class="select-rooms-title black-font font-bold font30r flex-ll">已选包间</view>
3 <block wx:for="{{seletroomlist}}" wx:key="{{index}}"> 3 <block wx:for="{{seletroomlist}}" wx:key="{{index}}">
4 <view class="select-rooms-item flex-vc" data-index="{{index}}" data-id="{{item.id}}" catchtap="cancelroom"> 4 <view class="select-rooms-item flex-vc" data-index="{{index}}" data-id="{{item.id}}" catchtap="cancelroom">
5 <view class="white-font font-bold font30r">{{item.name}}</view> 5 <view class="white-font font-bold font30r">{{item.name}}</view>
1 @import "../../../app.wxss"; 1 @import "../../../app.wxss";
2 .select-rooms{ 2 .select-rooms{
3 width:100%; 3 width:100%;
4 - padding:70rpx 0 0 30rpx; 4 + padding:70rpx 0 4rpx 30rpx;
5 box-sizing: border-box; 5 box-sizing: border-box;
6 } 6 }
7 .select-rooms-title{ 7 .select-rooms-title{