xt / xcx-book · Commits

Go to a project

Commit 66fc6d1f02c11f324d06d83de2099a68d192f627

Authored by vking
1 parent e7ea9c01
build: skipped

discount and activity

Inline Side-by-side
Showing 3 changed files with 16 additions and 11 deletions
... ... @@ -21,7 +21,7 @@
<view class="discount-content">
<view class="activity">
<block wx:for="{{seller.activity}}" wx:key="activity">
<view class="flex-ll activity-item"
<view class="flex-lr activity-item"
style="align-items: flex-start">
<view class="activity-left">{{util.activityName(item.type)}}</view>
<view class="activity-right">
... ... @@ -30,7 +30,7 @@
</view>
</view>
</block>
<view class="flex-ll activity-item" wx:if="{{seller.receive_condition_2}}"
<view class="flex-lr activity-item" wx:if="{{seller.receive_condition_2}}"
style="align-items: flex-start">
<view class="activity-left">消费返</view>
<view class="activity-right">
... ... @@ -38,7 +38,7 @@
<view class="activity-right-info">注：仅可以线上买单时使用</view>
</view>
</view>
<view class="flex-ll activity-item" wx:if="{{seller.isopen_md==1}}"
<view class="flex-lr activity-item" wx:if="{{seller.isopen_md==1}}"
style="align-items: flex-start">
<view class="activity-left">平台红包</view>
<view class="activity-right">可叠加使用平台红包</view>
... ...
... ... @@ -15,6 +15,7 @@
.discount-content{
max-height: 792rpx;
overflow-y: auto;
overflow-x: visible;
}
.discount.discountHide{
animation: discountHide 0.3s;
... ... @@ -36,7 +37,7 @@
height: 29rpx;
position: absolute;
right:0;
top:6rpx;
top:28rpx;
}
.activity{
margin-top: 40rpx;
... ... @@ -58,7 +59,10 @@
border-radius: 10rpx;
box-sizing: border-box;
padding: 26rpx 40rpx;
padding: 24rpx 40rpx;
width: calc(100% - 20rpx);
margin-left: 10rpx;
}
.activity-left{
height:28rpx;
... ... @@ -73,14 +77,15 @@
/*min-width: 60rpx;*/
white-space:nowrap;
text-align: center;
position: relative;
}
.activity-right{
font-size:26rpx;
font-family:PingFangSC-Medium,PingFang SC;
font-size: 28rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight:500;
color:rgba(53,53,53,1);
line-height:36rpx;
margin-left: 40rpx;
line-height: 40rpx;
width: calc(100% - 112rpx);
}
.mycards-txt{
height:42rpx;
... ... @@ -267,5 +272,5 @@
font-weight: 400;
color: #999999;
line-height: 34rpx;
margin-top: 10rpx;
margin-top: 8rpx;
}
\ No newline at end of file
... ...
<!--pages/reserve/detail.wxml-->
<include src="detail.skeleton.wxml" wx:if="{{!seller}}"/>
<layout wx:else="" style="position: {{hasDisplayDiscount?'fixed':''}};">
<layout wx:else="" style="{{hasDisplayDiscount?'position: fixed;width:100vw;height:100vk;':''}}">
<nav hasHome>{{seller.sellername}}</nav>
<!-- 包间预定 -->
<view class="tabs flex-lr" wx:if="{{hasOnlineReserve}}">
... ...