Fix:多份盲盒和地址选中样式
This commit is contained in:
@@ -125,24 +125,30 @@ export default {
|
|||||||
.address-wrap{
|
.address-wrap{
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
margin-bottom: 20rpx;
|
/* margin-bottom: 20rpx; */
|
||||||
}
|
}
|
||||||
.address-list {
|
.address-list {
|
||||||
padding: 20rpx 20rpx 0rpx;
|
padding: 24rpx;
|
||||||
width: 640rpx;
|
width: 640rpx;
|
||||||
max-height: 800rpx;
|
max-height: 800rpx;
|
||||||
overflow: auto;
|
overflow-y: auto;
|
||||||
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.address-item {
|
.address-item {
|
||||||
padding: 20rpx;
|
padding: 30rpx 24rpx;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
border: 2rpx solid transparent;
|
||||||
|
border-radius: 20rpx;
|
||||||
|
margin-bottom: 24rpx;
|
||||||
|
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
.info {
|
.info {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
margin-bottom: 10rpx;
|
align-items: center;
|
||||||
|
margin-bottom: 12rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.name {
|
.name {
|
||||||
@@ -157,36 +163,44 @@ export default {
|
|||||||
|
|
||||||
.address {
|
.address {
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
color: #888;
|
color: #666;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: flex-end;
|
align-items: flex-start;
|
||||||
|
line-height: 1.4;
|
||||||
|
margin-top: 0 !important;
|
||||||
|
margin-bottom: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.add-btn {
|
.add-btn {
|
||||||
padding: 20rpx;
|
padding: 24rpx;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
background-color: #fff;
|
background-color: #C52733;
|
||||||
border: 1rpx solid #ddd;
|
|
||||||
border-radius: 100rpx;
|
border-radius: 100rpx;
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 30rpx;
|
||||||
|
box-shadow: 0 8rpx 16rpx rgba(197, 39, 51, 0.2);
|
||||||
}
|
}
|
||||||
.btn-wrap{
|
.btn-wrap{
|
||||||
position: sticky;
|
position: sticky;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 20rpx 0;
|
padding: 20rpx 0;
|
||||||
|
background-color: #fff; /* 确保背景遮挡 */
|
||||||
|
margin-top: 20rpx;
|
||||||
}
|
}
|
||||||
.active{
|
.active{
|
||||||
background-color: #FFF5F5;
|
background-color: #FFF5F5;
|
||||||
border-radius: 16rpx;
|
border-color: #C52733;
|
||||||
border: 2rpx solid #C52733;
|
box-shadow: 0 8rpx 24rpx rgba(197, 39, 51, 0.12);
|
||||||
}
|
}
|
||||||
.selected-flag{
|
.selected-flag{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: -2rpx;
|
||||||
right: 0;
|
right: -2rpx;
|
||||||
padding: 6rpx 10rpx 6rpx 14rpx;
|
padding: 8rpx 12rpx 12rpx 20rpx;
|
||||||
border-radius: 0 16rpx 0 16rpx;
|
border-radius: 0 20rpx 0 32rpx;
|
||||||
background-color: #C52733;
|
background: #C52733;
|
||||||
z-index: 9;
|
z-index: 9;
|
||||||
|
box-shadow: -2rpx 2rpx 8rpx rgba(197, 39, 51, 0.2);
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export default {
|
|||||||
const card = this.giftCard || {}
|
const card = this.giftCard || {}
|
||||||
const giftProducts = card.giftProducts || []
|
const giftProducts = card.giftProducts || []
|
||||||
const hasCurrentUserGift = giftProducts.some(item => item.isCurrentUser === 1)
|
const hasCurrentUserGift = giftProducts.some(item => item.isCurrentUser === 1)
|
||||||
return !card.isExpire || !!card.isUserReceive || (card.isBind === 1 && hasCurrentUserGift)
|
return !card.isExpire || !!card.isUserReceive || (card.isBlind === 1 && hasCurrentUserGift)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onShow() {
|
onShow() {
|
||||||
|
|||||||
Reference in New Issue
Block a user