Commit ea0328b4018722ec38cb2d9a3b04a36692a8f27d

Authored by liuxuqinfhp1220
1 parent 77b36e67

no message

... ... @@ -2,11 +2,11 @@
<block wx:for="{{roomlist}}" wx:key="{{index}}">
<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="font30r font-bold" style="width:100%;padding-right:62rpx;box-sizing:border-box; block;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item.name}}</view>
<block wx:if="{{item.max && item.max!=0}}">
<view class="font24r room-more">最多可坐{{item.max}}人</view>
</block>
<block wx:if="{{item.low}}">
<block wx:if="{{item.low && item.low!=0}}">
<view class="font20r room-consume">最低消费{{item.low}}元</view>
</block>
<block wx:if="{{item.selectnum && item.selectnum>0}}">
... ...
... ... @@ -21,7 +21,11 @@ Component({
let today=util.unixtoTime(new Date()/1000,'YYYY-MM-DD');
this.getsectionlist();
if(today==newdate){
this.markoversection();
if(this.data.section){
this.changesectionstyle(this.data.section);
}else{
this.markoversection();
}
}else{
if(this.data.section){
this.changesectionstyle(this.data.section);
... ...
... ... @@ -10,7 +10,7 @@
margin-bottom:20rpx;
}
.select-rooms-item{
width:150rpx;
min-width:150rpx;
height:70rpx;
margin-right:30rpx;
background: -webkit-linear-gradient(top, #F2D190, #C0A369); /* Safari 5.1 - 6.0 */
... ... @@ -20,6 +20,8 @@
border-radius:10rpx;
position: relative;
margin-bottom:20rpx;
padding:0 20rpx;
box-sizing: border-box;
}
.select-rooms-close{
width:36rpx;
... ...
... ... @@ -60,7 +60,7 @@ Component({
App.Customer.GetHouseFullDate(parmdata).then((json)=>{
console.log(json)
if(json.ret==200){
let marklist=this.marklist;
let marklist=[];
console.log(marklist)
if(json.data && json.data.length>0){
json.data.forEach((v,i)=>{
... ...
... ... @@ -49,13 +49,13 @@
"list": []
},
"miniprogram": {
"current": 0,
"current": 56,
"list": [
{
"id": 0,
"name": "预订本-商家1",
"pathName": "pack-book/pages/book/b_index",
"query": "seller_id=154&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
"query": "seller_id=80&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
"scene": 1001
},
{
... ... @@ -471,7 +471,7 @@
"id": 56,
"name": "测试组件",
"pathName": "pages/reserve/detail",
"query": "id=48",
"query": "id=80",
"scene": null
},
{
... ...