feat: 添加延迟发货提示语、提现参数变更
This commit is contained in:
@@ -49,6 +49,12 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="discount-row flex-between" v-if="props.index != 5">
|
||||
<view v-if="isDelayedShipmentOrder()" class="delay-notice flex-center">
|
||||
<view class="delay-notice__icon">!</view>
|
||||
<view class="delay-notice__text">
|
||||
延迟发货中,商品已为您锁定,配送需您手动恢复或点击立即发货。
|
||||
</view>
|
||||
</view>
|
||||
<view class="size24 c_999">{{ formatCreateTime(props.data.createTime) }}</view>
|
||||
<view class="size24 c32">已优惠¥{{ fen2yuan(props.data.randomDiscountPrice) }}</view>
|
||||
</view>
|
||||
@@ -62,7 +68,7 @@
|
||||
</view>
|
||||
<view class="flex-center ju-flex-end m-t-12" v-if="props.index != 5 && isAiActionOrder">
|
||||
<AiOrderActionBar
|
||||
:status="Number(props.data.status)"
|
||||
:status="currentStatus"
|
||||
:showView="true"
|
||||
@delay="onDelayShipment"
|
||||
@now="onNowShipment"
|
||||
@@ -81,6 +87,8 @@
|
||||
getCurrentInstance,
|
||||
defineProps,
|
||||
defineEmits,
|
||||
ref,
|
||||
watch,
|
||||
} from 'vue';
|
||||
import {
|
||||
fen2yuan,
|
||||
@@ -149,6 +157,15 @@
|
||||
|
||||
const isAiActionOrder =
|
||||
String(props.data?.__source) === 'aishop' || Number(props.data?.type) === 5;
|
||||
const currentStatus = ref(Number(props.data?.status));
|
||||
watch(
|
||||
() => 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 {
|
||||
|
||||
Reference in New Issue
Block a user