Commit 4f3cbc9389ce443693fdd9fdd00ddea504cd978d

Authored by liuxuqinfhp1220
1 parent 7b69c21a

no message

... ... @@ -20,12 +20,17 @@ Component({
observers: {
'date,section': function(newdate,newsection) {
console.log('room',newdate,newsection)
console.log('old',this.date,this.section)
if(newdate && newsection){
if(this.date && this.section){
if(this.date=!newdate && this.section!=newsection){
console.log(this.date=!newdate || this.section!=newsection)
if(this.date=!newdate || this.section!=newsection){
this.getroomtype();
this.date=newdate;
this.section=newsection;
}else{
this.date=newdate;
this.section=newsection;
}
}else{
this.getroomtype();
... ... @@ -39,7 +44,7 @@ Component({
getroomtype(){
let parmdata={
sellerid:this.data.seller.id,
day:this.data.date,
day:util.timetouUnix(this.data.date,'-'),
interval:dur.indexOf(this.data.section)+1
}
App.Seller.GetSellerTableClass(parmdata).then((json)=>{
... ... @@ -76,7 +81,7 @@ Component({
console.log('置满')
let parmdata={
classid:_target.id,
day:this.data.date,
day:util.timetouUnix(this.data.date,'-'),
interval:dur.indexOf(this.data.section)+1
}
if(_target.fid){
... ...
<view class="room-list flex-rs">
<block wx:for="{{roomlist}}" wx:key="{{index}}">
<view class="room-item black-font {{item.isFull && 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 ? item.selectnum : 0}}" data-fid="{{item.fid ? item.fid : null}}" catchtap="{{usecondition=='seller' ? 'selectroom' : (item.isFull && item.isFull==1 ? '' : 'selectroom')}}">
<view class="font30r font-bold">{{item.name}}</view>
<block wx:if="{{item.max}}">
<view class="font24r room-more">最多可坐{{item.max}}人</view>
</block>
<block wx:if="{{item.low}}">
<view class="font20r room-consume">最低消费{{item.low}}元</view>
</block>
<block wx:if="{{item.selectnum && item.selectnum>0}}">
<view class="room-select white-font font24r flex-cc yellow">已选{{item.selectnum}}</view>
</block>
<block wx:if="{{usecondition=='seller'}}">
<block wx:if="{{item.isFull && item.isFull==1}}">
<view class="room-select black-font font24r flex-cc gray">置满</view>
<block wx:if="{{item.status==1}}">
<view class="room-item black-font {{(item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==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 ? item.selectnum : 0}}" data-fid="{{item.fid ? item.fid : null}}" catchtap="{{usecondition=='seller' ? (item.isorderFull && item.isorderFull==1 ? '' : 'selectroom') : (item.isFull && item.isFull==1 ? '' : 'selectroom')}}">
<view class="font30r font-bold">{{item.name}}</view>
<block wx:if="{{item.max}}">
<view class="font24r room-more">最多可坐{{item.max}}人</view>
</block>
<block wx:if="{{item.isorderFull && item.isorderFull==1}}">
<view class="room-full black-font font24r">订满</view>
<block wx:if="{{item.low}}">
<view class="font20r room-consume">最低消费{{item.low}}元</view>
</block>
</block>
<block wx:else>
<block wx:if="{{(item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==1)}}">
<view class="room-full black-font font24r">订满</view>
<block wx:if="{{item.selectnum && item.selectnum>0}}">
<view class="room-select white-font font24r flex-cc yellow">已选{{item.selectnum}}</view>
</block>
</block>
</view>
<block wx:if="{{usecondition=='seller'}}">
<block wx:if="{{item.isFull && item.isFull==1}}">
<view class="room-select black-font font24r flex-cc gray">置满</view>
</block>
<block wx:if="{{item.isorderFull && item.isorderFull==1}}">
<view class="room-full black-font font24r">订满</view>
</block>
</block>
<block wx:else>
<block wx:if="{{(item.isFull && item.isFull==1) || (item.isorderFull && item.isorderFull==1)}}">
<view class="room-full black-font font24r">订满</view>
</block>
</block>
</view>
</block>
</block>
</view>
\ No newline at end of file
... ...