feat: 查看物流展示
This commit is contained in:
@@ -2,18 +2,25 @@
|
||||
<view class="flex-center ju-flex-end w100">
|
||||
<view
|
||||
class="ai-button3 w_144 m-r-10"
|
||||
v-if="props.status === 10 && !props.disableDelayShipment"
|
||||
v-if="(props.status === 10 || props.status === 15) && !props.disableDelayShipment"
|
||||
@tap.stop="emit('delay')"
|
||||
>
|
||||
延迟发货
|
||||
</view>
|
||||
<view
|
||||
class="ai-button3 w_144 m-r-10"
|
||||
v-if="(props.status === 50 || props.hasDelayedItems) && !props.disableDelayShipment"
|
||||
v-if="(props.status === 50 || props.status === 15 || props.hasDelayedItems) && !props.disableDelayShipment"
|
||||
@tap.stop="emit('now')"
|
||||
>
|
||||
立即发货
|
||||
</view>
|
||||
<view
|
||||
class="ai-button3 w_144 m-r-10"
|
||||
v-if="hasExpress"
|
||||
@tap.stop="emit('express')"
|
||||
>
|
||||
查看物流
|
||||
</view>
|
||||
<view
|
||||
class="ai-button3 w_144"
|
||||
v-if="props.showView && props.status !== 70"
|
||||
@@ -21,7 +28,7 @@
|
||||
>
|
||||
{{ props.viewText }}
|
||||
</view>
|
||||
<view class="ai-button1 w_144 m-l-16" v-if="props.status === 20" @tap.stop="emit('confirm')">
|
||||
<view class="ai-button1 w_144 m-l-16" v-if="props.status === 20 || props.status === 15" @tap.stop="emit('confirm')">
|
||||
确认收货
|
||||
</view>
|
||||
<view class="ai-button1 w_144 m-l-16" v-if="props.status === 0" @tap.stop="emit('pay')">
|
||||
@@ -37,6 +44,7 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed } from 'vue';
|
||||
const props = defineProps({
|
||||
status: {
|
||||
type: Number,
|
||||
@@ -58,7 +66,32 @@
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
logisticsId: {
|
||||
type: [Number, String],
|
||||
default: 0,
|
||||
},
|
||||
logisticsNo: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
deliveryTime: {
|
||||
type: [Number, String],
|
||||
default: '',
|
||||
},
|
||||
hasLogistics: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(['delay', 'now', 'view', 'confirm', 'pay', 'cancel']);
|
||||
const hasExpress = computed(() => {
|
||||
if ([15, 20, 30].includes(props.status)) return true;
|
||||
if (props.hasLogistics) return true;
|
||||
if (Number(props.logisticsId) > 0) return true;
|
||||
if (props.logisticsNo && String(props.logisticsNo).trim()) return true;
|
||||
if (props.deliveryTime) return true;
|
||||
return false;
|
||||
});
|
||||
|
||||
const emit = defineEmits(['delay', 'now', 'view', 'confirm', 'pay', 'cancel', 'express']);
|
||||
</script>
|
||||
|
||||
@@ -483,7 +483,10 @@
|
||||
return { delayed: false, count: 0, text: '' };
|
||||
}
|
||||
const { spuRecords } = buildSpuRecordAssignment(spuItem);
|
||||
const count = sumDelayCount(spuRecords);
|
||||
const delayingRecords = spuRecords.filter(
|
||||
(record) => resolveDelayStatus(record) === 1,
|
||||
);
|
||||
const count = sumDelayCount(delayingRecords);
|
||||
if (!count) {
|
||||
return { delayed: false, count: 0, text: '' };
|
||||
}
|
||||
|
||||
@@ -79,12 +79,17 @@
|
||||
:disableDelayShipment="isPickUpOrder || !isAiStoreOrder"
|
||||
:showView="true"
|
||||
:hasDelayedItems="hasDelayedItems"
|
||||
:logisticsId="props.data.logisticsId"
|
||||
:logisticsNo="props.data.logisticsNo"
|
||||
:deliveryTime="props.data.deliveryTime"
|
||||
:hasLogistics="hasLogistics"
|
||||
@delay="onDelayShipment"
|
||||
@now="onNowShipment"
|
||||
@view="goAiOrderInfo"
|
||||
@confirm="confirmReceiveOrder"
|
||||
@pay="goPay"
|
||||
@cancel="cancelAiOrder"
|
||||
@express="goExpressLog"
|
||||
/>
|
||||
</view>
|
||||
<view class="" style="margin-top: 32rpx" v-else-if="!props.isAfterSale">
|
||||
@@ -231,6 +236,26 @@
|
||||
return orderRecords.some((record) => Number(record?.status) === 1);
|
||||
});
|
||||
|
||||
const hasLogistics = computed(() => {
|
||||
const data = props.data || {};
|
||||
if (Number(data.logisticsId) > 0) return true;
|
||||
if (data.logisticsNo && String(data.logisticsNo).trim()) return true;
|
||||
if (data.deliveryTime) return true;
|
||||
const items = Array.isArray(data.items) ? data.items : [];
|
||||
for (const item of items) {
|
||||
if (Number(item?.logisticsId) > 0) return true;
|
||||
if (item?.logisticsNo && String(item.logisticsNo).trim()) return true;
|
||||
if (item?.deliveryTime) return true;
|
||||
const subItems = Array.isArray(item?.items) ? item.items : [];
|
||||
for (const sub of subItems) {
|
||||
if (Number(sub?.logisticsId) > 0) return true;
|
||||
if (sub?.logisticsNo && String(sub.logisticsNo).trim()) return true;
|
||||
if (sub?.deliveryTime) return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
const state = reactive({
|
||||
delayRecords: [],
|
||||
delayRecordsLoaded: false,
|
||||
@@ -385,6 +410,18 @@
|
||||
proxy.utils.go('/pages/AI/orderInfo', { id });
|
||||
};
|
||||
|
||||
const goExpressLog = () => {
|
||||
const id = resolveAiOrderId(props.data);
|
||||
if (!id) {
|
||||
uni.showToast({
|
||||
title: '订单信息异常',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
proxy.utils.go('/pages/order/express/log', { id });
|
||||
};
|
||||
|
||||
const confirmReceiveOrder = async () => {
|
||||
const id = resolveAiOrderId(props.data);
|
||||
if (!id) return;
|
||||
|
||||
Reference in New Issue
Block a user