Commit d0b3c389ffb23530ae727f4fae626e5947556567

Authored by vking
1 parent 6705d1fe

shafa

... ... @@ -58,6 +58,7 @@ Component({
},
hasNewActivityList:Boolean,//新的活动商家列表
hasInSwiper:Boolean,//是否在Swiper控件内,不能使用组件电话框,只能通知页面
hasShafa:Boolean,// 沙发按钮
},
/**
... ... @@ -125,6 +126,12 @@ Component({
}
url=util.http_build_query(findSellerParamObj,url)
}
if(this.data.hasShafa){
url=util.http_build_query({
classID:util.attr(e,'cid'),
className:util.attr(e,'cname'),
},url)
}
return wx.navigateTo({
url:url,
})
... ...
... ... @@ -3,6 +3,7 @@
"usingComponents": {
"formids":"/components/formids/formids",
"as-phone":"/components/actionSheet/phone",
"stat":"/components/stat/stat"
"stat":"/components/stat/stat",
"shafa":"./shafa"
}
}
\ No newline at end of file
... ...
... ... @@ -7,7 +7,7 @@
<view class="room_num" wx:if="{{false}}">{{seller.room_num}}个包间</view>
<view class="room_num hasBrand Semibold" wx:if="{{hasBrand && seller.brand}}">{{seller.brand.name}}</view>
</view>
<view class="info flex-tb">
<view class="info flex-tb" style="{{hasShafa?'padding-bottom: 0;height:290rpx;':''}}">
<view style="max-width: 100%;width: 100%;">
<view class="name Semibold flex-ll">
<view class="sellername">{{seller.sellername}}</view>
... ... @@ -89,7 +89,19 @@
<text class="reserve-text" wx:else="">联系餐厅</text>
</view>
-->
<view class="reserve-button flex-vc" id="reserve-button" catchtap="tapButton" data-type="oncall">
<scroll-view class="scroll-view_H"
wx:if="{{hasShafa}}"
scroll-x="true" catchtap="catchtap">
<shafa class="scroll-view-item_H"
catchtap="tapButton" data-type="oncall"
data-cid="{{item.id}}" data-cname="{{item.name}}"
wx:for="{{se.class}}" wx:key="se-class">
{{item.name}}
</shafa>
</scroll-view>
<view class="reserve-button flex-vc"
wx:else=""
id="reserve-button" catchtap="tapButton" data-type="oncall">
订包间
</view>
</view>
... ...
... ... @@ -333,4 +333,16 @@
font-weight:400;
color:rgba(231,42,38,1);
line-height:34rpx;
}
.scroll-view_H{
white-space: nowrap;
height: 100rpx;
overflow-y: hidden;
}
.scroll-view-item_H{
display: inline-block;
margin-right: 20rpx;
}
.scroll-view-item_H:last-child{
margin-right: 0;
}
\ No newline at end of file
... ...
// components/reserve/seller-box-transverse/shafa.js
Component({
/**
* 组件的属性列表
*/
properties: {
},
/**
* 组件的初始数据
*/
data: {
},
/**
* 组件的方法列表
*/
methods: {
}
})
... ...
{
"component": true,
"usingComponents": {}
}
\ No newline at end of file
... ...
<!--components/reserve/seller-box-transverse/shafa.wxml-->
<view class="shafa flex-vc">
<view class="shafa-bei"><slot></slot></view>
<view class="shafa-dian"></view>
<view class="shafa-dian2"></view>
<view class="shafa-fushou flex-lr"></view>
<view class="shafa-tui flex-lr"></view>
</view>
... ...
/* components/reserve/seller-box-transverse/shafa.wxss */
@import "../../../app.wxss";
.shafa{
position: relative;
height: 56rpx;
}
.shafa-bei{
height:38rpx;
background:rgba(249,142,71,1);
border-radius:10rpx 10rpx 6rpx 6rpx;
font-size:24rpx;
font-family:PingFangSC-Semibold,PingFang SC;
font-weight:600;
color:rgba(255,255,255,1);
line-height:38rpx;
text-align: center;
padding: 0 14rpx;
margin: 0 6rpx;
}
.shafa-dian{
height:4rpx;
background:rgba(255,227,87,1);
width: calc(100% - 20rpx);
}
.shafa-dian2{
width: 100%;
height:10rpx;
background:rgba(255,201,170,1);
border-radius:0rpx 0rpx 4rpx 4rpx;
}
.shafa-fushou{
position: absolute;
bottom: 4rpx;
width: 100%;
}
.shafa-fushou:before,.shafa-fushou:after{
display: block;
content: "";
width:12rpx;
height:34rpx;
background:rgba(255,201,170,1);
border-radius:200rpx 200rpx 0rpx 4rpx;
}
.shafa-tui{
position: absolute;
bottom: 0rpx;
width: calc(100% - 12rpx);
}
.shafa-tui:before,.shafa-tui:after{
display: block;
content: "";
width:4rpx;
height:4rpx;
background:rgba(255,209,114,1);
}
\ No newline at end of file
... ...
... ... @@ -115,11 +115,20 @@ Page({
seller.receive_condition_str=xff.join('/')
}
}
this.setData({
let obj={
seller:seller,
hasDishesImage:hasDishesImage,
hasOnlineReserve:seller.is_online_reserve==1,
})
}
if(this.options.classID){
obj.seletroomlist=[{
id:this.options.classID,
name:this.options.className,
}]
delete this.options.classID
delete this.options.className
}
this.setData(obj)
}
})
},
... ...
... ... @@ -74,7 +74,7 @@
hasActivityTags="{{false}}"
hasActivityShort="{{true}}"
hasBrand="true" hasActivityRed="true"
hasSuggestion="{{hasSuggestion}}"
hasSuggestion="{{hasSuggestion}}" hasShafa
hasSlogan="{{false}}"></sb-tr>
</view>
</swiper-item>
... ...