diff --git a/components/orderItem/orderItem.vue b/components/orderItem/orderItem.vue index 96c05d5..916e662 100644 --- a/components/orderItem/orderItem.vue +++ b/components/orderItem/orderItem.vue @@ -49,6 +49,12 @@ + + ! + + 延迟发货中,商品已为您锁定,配送需您手动恢复或点击立即发货。 + + {{ formatCreateTime(props.data.createTime) }} 已优惠¥{{ fen2yuan(props.data.randomDiscountPrice) }} @@ -62,7 +68,7 @@ props.data?.status, + (value) => { + currentStatus.value = Number(value); + }, + { immediate: true }, + ); + const isDelayedShipmentOrder = () => currentStatus.value === 50; const resolveAiOrderId = (data) => { return data?.id || data?.orderId; @@ -182,6 +199,7 @@ status: 50, }); if (code === 0) { + currentStatus.value = 50; emit('downData'); } }, @@ -208,6 +226,7 @@ status: 10, }); if (code === 0) { + currentStatus.value = 10; emit('downData'); } }, @@ -265,6 +284,37 @@ .discount-row { margin-top: 8rpx; + flex-wrap: wrap; + row-gap: 12rpx; + } + + .delay-notice { + width: 100%; + padding: 18rpx 20rpx; + box-sizing: border-box; + border-radius: 12rpx; + background: #fff4ea; + align-items: flex-start; + } + + .delay-notice__icon { + width: 28rpx; + height: 28rpx; + line-height: 28rpx; + text-align: center; + border-radius: 50%; + border: 2rpx solid #fa7e31; + color: #fa7e31; + font-size: 20rpx; + flex-shrink: 0; + margin-right: 12rpx; + margin-top: 2rpx; + } + + .delay-notice__text { + color: #fa7e31; + font-size: 24rpx; + line-height: 36rpx; } .price { diff --git a/pages/home/pay/withdraw.vue b/pages/home/pay/withdraw.vue index c1cd465..7978c08 100644 --- a/pages/home/pay/withdraw.vue +++ b/pages/home/pay/withdraw.vue @@ -242,6 +242,7 @@ const submit = () => { obj.price = obj.price * 100; const cardNo = String(obj.bankCardId || obj.userAccount || '').trim(); if (cardNo) { + obj.userAccount = cardNo; obj.bankCardId = cardNo; obj.cardNumber = cardNo; }