diff --git a/pkg_user/views/gift/components/AddressList.vue b/pkg_user/views/gift/components/AddressList.vue index 69b090e..383428c 100644 --- a/pkg_user/views/gift/components/AddressList.vue +++ b/pkg_user/views/gift/components/AddressList.vue @@ -125,24 +125,30 @@ export default { .address-wrap{ display: flex; justify-content: flex-start; - margin-bottom: 20rpx; + /* margin-bottom: 20rpx; */ } .address-list { - padding: 20rpx 20rpx 0rpx; + padding: 24rpx; width: 640rpx; max-height: 800rpx; - overflow: auto; + overflow-y: auto; + box-sizing: border-box; } .address-item { - padding: 20rpx; + padding: 30rpx 24rpx; 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 { display: flex; justify-content: flex-start; - margin-bottom: 10rpx; + align-items: center; + margin-bottom: 12rpx; } .name { @@ -157,36 +163,44 @@ export default { .address { font-size: 26rpx; - color: #888; + color: #666; display: flex; - align-items: flex-end; + align-items: flex-start; + line-height: 1.4; + margin-top: 0 !important; + margin-bottom: 0 !important; } .add-btn { - padding: 20rpx; + padding: 24rpx; text-align: center; - background-color: #fff; - border: 1rpx solid #ddd; + background-color: #C52733; border-radius: 100rpx; + font-weight: bold; + font-size: 30rpx; + box-shadow: 0 8rpx 16rpx rgba(197, 39, 51, 0.2); } .btn-wrap{ position: sticky; bottom: 0; width: 100%; padding: 20rpx 0; + background-color: #fff; /* 确保背景遮挡 */ + margin-top: 20rpx; } .active{ background-color: #FFF5F5; - border-radius: 16rpx; - border: 2rpx solid #C52733; + border-color: #C52733; + box-shadow: 0 8rpx 24rpx rgba(197, 39, 51, 0.12); } .selected-flag{ position: absolute; - top: 0; - right: 0; - padding: 6rpx 10rpx 6rpx 14rpx; - border-radius: 0 16rpx 0 16rpx; - background-color: #C52733; + top: -2rpx; + right: -2rpx; + padding: 8rpx 12rpx 12rpx 20rpx; + border-radius: 0 20rpx 0 32rpx; + background: #C52733; z-index: 9; + box-shadow: -2rpx 2rpx 8rpx rgba(197, 39, 51, 0.2); } diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue index 6081372..b0ecd8f 100644 --- a/pkg_user/views/gift/receive.vue +++ b/pkg_user/views/gift/receive.vue @@ -48,7 +48,7 @@ export default { const card = this.giftCard || {} const giftProducts = card.giftProducts || [] 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() {