|
|
|
@ -404,7 +404,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<scroll-view scroll-y style="max-height: 50vh;"> |
|
|
|
<scroll-view scroll-y class="popup-spec-scroll"> |
|
|
|
<view class="goods-spec" v-if="parsedSpecs.length > 0"> |
|
|
|
<view class="spec1" v-for="(spec, sIndex) in parsedSpecs" :key="sIndex"> |
|
|
|
<view class="spec11"> |
|
|
|
@ -438,7 +438,8 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</template> |
|
|
|
<view class="spec11" v-if="moreBuyList.length > 0 && isPintuan" style="display: flex;"> |
|
|
|
<view class="spec11 popup-more-buy-title" v-if="moreBuyList.length > 0 && isPintuan" |
|
|
|
style="display: flex;"> |
|
|
|
<view style="flex: 1;"> |
|
|
|
搭配小食 |
|
|
|
</view> |
|
|
|
@ -458,12 +459,12 @@ |
|
|
|
</view> |
|
|
|
|
|
|
|
</view> |
|
|
|
<view class="goods-team" v-if="moreBuyList.length > 0 && isPintuan" style="height: 300rpx;"> |
|
|
|
<view class="goods-team popup-more-buy-goods" v-if="moreBuyList.length > 0 && isPintuan"> |
|
|
|
<view :class="spec.isChecked ? 'team-check1' : 'team2'" v-for="(spec, sIndex) in moreBuyList" |
|
|
|
:key="sIndex" @tap="selectMoreBuy(spec,sIndex)"> |
|
|
|
<view> |
|
|
|
<img :src="spec.productPicture" alt="" |
|
|
|
style="width: 70px;height: 70px;background-size: 100%;border-radius: 10px;"> |
|
|
|
style="width: 112rpx;height: 112rpx;background-size: 100%;border-radius: 10px;"> |
|
|
|
</view> |
|
|
|
<view class="team11" style="margin-top:10rpx;"> |
|
|
|
￥{{spec.attributeListPrice | sliceMsg}} |
|
|
|
@ -476,9 +477,9 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view style="width: 100%;height: 160rpx;"></view> |
|
|
|
<view class="popup-bottom-placeholder"></view> |
|
|
|
</scroll-view> |
|
|
|
<view class="bottom popup-bottom-bar" style="padding-bottom: 40rpx;height: 160rpx;z-index: 10;"> |
|
|
|
<view class="bottom popup-bottom-bar" style="padding-bottom: 24rpx;height: 132rpx;z-index: 10;"> |
|
|
|
<view v-if="isPintuan" class="pintuan1"> |
|
|
|
<template v-if="!groupId"> |
|
|
|
<view class="pintuan2 group-face-btn" @tap.stop="submitPintuan(true)"> |
|
|
|
@ -615,7 +616,7 @@ |
|
|
|
@tap="selectMoreBuy(spec,sIndex)"> |
|
|
|
<view> |
|
|
|
<img :src="spec.productPicture" alt="" |
|
|
|
style="width: 70px;height: 70px;background-size: 100%;border-radius: 10px;"> |
|
|
|
style="width: 112rpx;height: 112rpx;background-size: 100%;border-radius: 10px;"> |
|
|
|
</view> |
|
|
|
<view class="team11" style="margin-top:10rpx;"> |
|
|
|
￥{{spec.attributeListPrice | sliceMsg}} |
|
|
|
@ -630,7 +631,7 @@ |
|
|
|
</view> |
|
|
|
</scroll-view> |
|
|
|
</view> |
|
|
|
<view class="box1" style="display: flex;padding: 40rpx;" |
|
|
|
<view class="box1 pay-option-card" style="display: flex;" |
|
|
|
v-if="groupdeliveryType == 2 && !isStoreGroupOrder"> |
|
|
|
<view style="flex: 1;"> |
|
|
|
<view style="height: 42rpx;line-height: 42rpx;display: flex;"> |
|
|
|
@ -662,7 +663,7 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="box1" style="display: flex;padding: 40rpx;"> |
|
|
|
<view class="box1 pay-option-card" style="display: flex;"> |
|
|
|
<view style="flex: 1;"> |
|
|
|
<view style="height: 42rpx;line-height: 42rpx;display: flex;"> |
|
|
|
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/4c8e0cc311db4d38ab43e019673c4b8c.png" |
|
|
|
@ -4094,9 +4095,39 @@ |
|
|
|
linear-gradient(180deg, #ffffff 0%, #f7fffb 100%); |
|
|
|
} |
|
|
|
|
|
|
|
.group-order-popup { |
|
|
|
max-height: 88vh; |
|
|
|
overflow: hidden; |
|
|
|
} |
|
|
|
|
|
|
|
.group-order-popup .popup-product-card { |
|
|
|
padding: 14rpx 18rpx; |
|
|
|
margin-bottom: 10rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.group-order-popup .goods-img { |
|
|
|
width: 128rpx; |
|
|
|
height: 128rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.group-order-popup .goods-name { |
|
|
|
font-size: 28rpx; |
|
|
|
line-height: 38rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.group-order-popup .goods-content-center { |
|
|
|
margin: 8rpx 0; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-spec-scroll { |
|
|
|
max-height: 44vh; |
|
|
|
padding: 0 20rpx; |
|
|
|
box-sizing: border-box; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-rally-title, |
|
|
|
.join-popup-title { |
|
|
|
padding: 8rpx 20rpx 22rpx; |
|
|
|
padding: 6rpx 20rpx 14rpx; |
|
|
|
text-align: center; |
|
|
|
} |
|
|
|
|
|
|
|
@ -4131,6 +4162,52 @@ |
|
|
|
box-shadow: 0 12rpx 26rpx rgba(0, 35, 28, 0.06); |
|
|
|
} |
|
|
|
|
|
|
|
.popup-more-buy-title { |
|
|
|
height: 72rpx; |
|
|
|
line-height: 72rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-more-buy-title .goods-num { |
|
|
|
height: 48rpx; |
|
|
|
line-height: 48rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-more-buy-title .num-plus { |
|
|
|
width: 48rpx; |
|
|
|
height: 48rpx; |
|
|
|
line-height: 48rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-more-buy-goods { |
|
|
|
height: 236rpx; |
|
|
|
min-height: 236rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-more-buy-goods .team2, |
|
|
|
.popup-more-buy-goods .team-check1, |
|
|
|
.pay-more-buy-item { |
|
|
|
width: 166rpx; |
|
|
|
height: 218rpx; |
|
|
|
margin: 8rpx 20rpx 0 0; |
|
|
|
padding: 8rpx 8rpx 0; |
|
|
|
box-sizing: border-box; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-more-buy-goods .team11, |
|
|
|
.pay-more-buy-item .team11 { |
|
|
|
margin-top: 6rpx !important; |
|
|
|
font-size: 22rpx; |
|
|
|
line-height: 30rpx; |
|
|
|
overflow: hidden; |
|
|
|
text-overflow: ellipsis; |
|
|
|
white-space: nowrap; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-bottom-placeholder { |
|
|
|
width: 100%; |
|
|
|
height: 132rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-origin-price { |
|
|
|
color: #ff4d38; |
|
|
|
font-weight: 900; |
|
|
|
@ -4161,29 +4238,31 @@ |
|
|
|
} |
|
|
|
|
|
|
|
.pay-popup { |
|
|
|
height: auto; |
|
|
|
max-height: 92vh; |
|
|
|
background: #fff; |
|
|
|
border-radius: 40rpx 40rpx 0 0; |
|
|
|
padding-top: 34rpx; |
|
|
|
padding-bottom: calc(30rpx + env(safe-area-inset-bottom)); |
|
|
|
padding-top: 22rpx; |
|
|
|
padding-bottom: calc(20rpx + env(safe-area-inset-bottom)); |
|
|
|
overflow: hidden; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-popup-content { |
|
|
|
height: 100%; |
|
|
|
max-height: calc(92vh - 42rpx - env(safe-area-inset-bottom)); |
|
|
|
margin-top: 0; |
|
|
|
overflow-y: auto; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-summary-card { |
|
|
|
padding: 28rpx 30rpx 24rpx; |
|
|
|
padding: 20rpx 30rpx 18rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-more-buy-card { |
|
|
|
padding: 20rpx 30rpx 28rpx; |
|
|
|
padding: 14rpx 30rpx 20rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-more-buy-title { |
|
|
|
height: 78rpx; |
|
|
|
line-height: 78rpx; |
|
|
|
height: 64rpx; |
|
|
|
line-height: 64rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-more-buy-scroll { |
|
|
|
@ -4200,26 +4279,38 @@ |
|
|
|
flex-shrink: 0; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-more-buy-scroll { |
|
|
|
height: 226rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-popup-content > .box1 { |
|
|
|
margin-bottom: 16rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-option-card { |
|
|
|
padding: 26rpx 36rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-countdown { |
|
|
|
display: flex; |
|
|
|
align-items: center; |
|
|
|
justify-content: center; |
|
|
|
min-height: 54rpx; |
|
|
|
min-height: 44rpx; |
|
|
|
color: #586963; |
|
|
|
font-size: 26rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-amount { |
|
|
|
margin-top: 8rpx; |
|
|
|
margin-top: 2rpx; |
|
|
|
text-align: center; |
|
|
|
font-size: 30rpx; |
|
|
|
font-weight: 800; |
|
|
|
line-height: 84rpx; |
|
|
|
line-height: 70rpx; |
|
|
|
color: #00231C; |
|
|
|
} |
|
|
|
|
|
|
|
.pay-amount text { |
|
|
|
font-size: 62rpx; |
|
|
|
font-size: 56rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.minimum-pay-tip { |
|
|
|
@ -4239,8 +4330,8 @@ |
|
|
|
} |
|
|
|
|
|
|
|
.pay-fee-list { |
|
|
|
margin-top: 14rpx; |
|
|
|
padding: 18rpx 22rpx; |
|
|
|
margin-top: 8rpx; |
|
|
|
padding: 14rpx 20rpx; |
|
|
|
border-radius: 22rpx; |
|
|
|
background: #f8fbf9; |
|
|
|
border: 1rpx solid #edf3f0; |
|
|
|
@ -4292,7 +4383,7 @@ |
|
|
|
} |
|
|
|
|
|
|
|
.pay-refund-tip { |
|
|
|
margin-top: 16rpx; |
|
|
|
margin-top: 10rpx; |
|
|
|
text-align: center; |
|
|
|
color: #f0441f; |
|
|
|
font-size: 24rpx; |
|
|
|
@ -4302,13 +4393,13 @@ |
|
|
|
.pay-confirm-btn { |
|
|
|
background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1)); |
|
|
|
width: 90%; |
|
|
|
height: 100rpx; |
|
|
|
height: 88rpx; |
|
|
|
border-radius: 100rpx; |
|
|
|
text-align: center; |
|
|
|
font-size: 28rpx; |
|
|
|
font-weight: 700; |
|
|
|
line-height: 100rpx; |
|
|
|
margin: 40rpx auto; |
|
|
|
line-height: 88rpx; |
|
|
|
margin: 24rpx auto 18rpx; |
|
|
|
} |
|
|
|
|
|
|
|
.popup-bottom-bar { |
|
|
|
|
wangfukang
16 hours ago