feat: 添加催一催按钮、应用宝跳转配置
This commit is contained in:
+113
-1
@@ -116,17 +116,27 @@
|
||||
:logisticsNo="state.orderInfo.logisticsNo"
|
||||
:deliveryTime="state.orderInfo.deliveryTime"
|
||||
:hasLogistics="hasLogistics"
|
||||
:deliveryType="state.orderInfo.deliveryType"
|
||||
:payStatus="state.orderInfo.payStatus"
|
||||
:preparationStatus="state.orderInfo.preparationStatus"
|
||||
:pickUpVerifyTime="state.orderInfo.pickUpVerifyTime"
|
||||
:verifyTime="state.orderInfo.verifyTime"
|
||||
:completedTime="state.orderInfo.completedTime"
|
||||
:arriveStoreTime="state.orderInfo.arriveStoreTime"
|
||||
:deliveredTime="state.orderInfo.deliveredTime"
|
||||
@delay="delayShipment"
|
||||
@now="nowShipment"
|
||||
@confirm="confirmReceiveOrder"
|
||||
@pay="goPay"
|
||||
@cancel="cancelAiOrder"
|
||||
@express="goExpressLog"
|
||||
@remind="handleRemind"
|
||||
/>
|
||||
<card_orderBan
|
||||
v-else
|
||||
:data="state.orderInfo"
|
||||
@downData="getOrderDetail"
|
||||
@remind="handleRemind"
|
||||
type="2"
|
||||
></card_orderBan>
|
||||
</view>
|
||||
@@ -193,6 +203,7 @@
|
||||
aiReceiveItem,
|
||||
} from '@/sheep/api/ai';
|
||||
import StoreApi from '@/sheep/api/trade/store';
|
||||
import OrderStoreApi from '@/sheep/api/trade/orderStore';
|
||||
import card_order from '@/components/orderItem/card_order.vue';
|
||||
import AiOrderActionBar from '@/components/orderItem/AiOrderActionBar.vue';
|
||||
import ShipmentPopup from '@/components/orderItem/ShipmentPopup.vue';
|
||||
@@ -228,6 +239,53 @@
|
||||
};
|
||||
|
||||
const pickUpVerifyRef = ref();
|
||||
const remindLock = ref(false);
|
||||
|
||||
const resolvePickUpStoreIdForRemind = () => {
|
||||
const data = state.orderInfo || {};
|
||||
return Number(
|
||||
data?.pickUpStoreId ||
|
||||
data?.pickUpStore?.id ||
|
||||
data?.pickUpStore?.storeId ||
|
||||
data?.pickUpStoreVO?.id ||
|
||||
data?.pickUpStoreVO?.storeId ||
|
||||
data?.store?.id ||
|
||||
data?.store?.storeId ||
|
||||
systemStore.value?.id ||
|
||||
systemStore.value?.storeId ||
|
||||
data?.storeId ||
|
||||
0,
|
||||
);
|
||||
};
|
||||
|
||||
const handleRemind = async () => {
|
||||
return sheep.$helper.toast('已通知门店备货');
|
||||
if (remindLock.value) {
|
||||
sheep.$helper.toast('操作太频繁,请稍后再试');
|
||||
return;
|
||||
}
|
||||
const pickUpStoreId = resolvePickUpStoreIdForRemind();
|
||||
const orderId = state.orderInfo?.id || state.orderInfo?.orderId;
|
||||
if (!orderId || !(pickUpStoreId > 0)) {
|
||||
sheep.$helper.toast('订单信息异常');
|
||||
return;
|
||||
}
|
||||
remindLock.value = true;
|
||||
try {
|
||||
const res = await OrderStoreApi.remindStore(pickUpStoreId, orderId);
|
||||
if (res?.code === 0) {
|
||||
sheep.$helper.toast(res?.msg || '已通知门店备货');
|
||||
} else {
|
||||
sheep.$helper.toast(res?.msg || '催一催失败,请稍后重试');
|
||||
}
|
||||
} catch (e) {
|
||||
sheep.$helper.toast('催一催失败,请稍后重试');
|
||||
} finally {
|
||||
setTimeout(() => {
|
||||
remindLock.value = false;
|
||||
}, 5000);
|
||||
}
|
||||
};
|
||||
|
||||
const isAiActionOrder = computed(() => {
|
||||
const orderType = Number(state.orderInfo?.type ?? state.orderType ?? 0);
|
||||
@@ -319,6 +377,30 @@
|
||||
return false;
|
||||
});
|
||||
|
||||
const resolvePickUpStage = () => {
|
||||
const data = state.orderInfo || {};
|
||||
const external = Number(data?.preparationStatus);
|
||||
const rawStatus = Number.isFinite(external) ? external : Number(data?.preparationStatus ?? data?.status ?? 0);
|
||||
const isVerifyCompleted = Boolean(
|
||||
data?.pickUpVerifyTime ||
|
||||
data?.verifyTime ||
|
||||
data?.completedTime ||
|
||||
rawStatus === 30 ||
|
||||
rawStatus === 3,
|
||||
);
|
||||
if (isVerifyCompleted) return 'done';
|
||||
if (rawStatus === 1 || rawStatus === 2) return 'wait';
|
||||
if (
|
||||
data?.deliveryTime ||
|
||||
data?.arriveStoreTime ||
|
||||
data?.deliveredTime ||
|
||||
rawStatus === 20
|
||||
) {
|
||||
return 'delivered';
|
||||
}
|
||||
return 'sorting';
|
||||
};
|
||||
|
||||
const showBottomBar = computed(() => {
|
||||
if (!isAiActionOrder.value) return true;
|
||||
const status = Number(state.orderInfo?.status);
|
||||
@@ -326,7 +408,11 @@
|
||||
if (hasLogistics.value) return true;
|
||||
if ([0, 15, 20, 30].includes(status)) return true;
|
||||
if (!isAiStoreOrder.value) return hasLogistics.value;
|
||||
if (isPickUpOrder.value) return false;
|
||||
// AI 店铺自提订单:分拣中/已送达门店时显示底部栏(展示催一催按钮);待取货/已核销后隐藏
|
||||
if (isPickUpOrder.value) {
|
||||
const stage = resolvePickUpStage();
|
||||
return stage === 'sorting' || stage === 'delivered';
|
||||
}
|
||||
if (hasDelayedItems.value) return true;
|
||||
return [10, 15, 50, 70].includes(status);
|
||||
});
|
||||
@@ -660,6 +746,32 @@
|
||||
} else {
|
||||
systemStore.value = {};
|
||||
}
|
||||
// 自提订单:同步备货进度(用于核销区是否展示二维码、门店卡片是否展示、状态 Tag 同步)
|
||||
if (isPickUp && (state.orderInfo.deliveryType === 2 || pickUpStoreId > 0) && state.orderInfo.payStatus) {
|
||||
try {
|
||||
const prepRes = await OrderStoreApi.getPreparationStatus(pickUpStoreId, state.orderInfo.id || state.orderInfo.orderId);
|
||||
if (prepRes?.code === 0) {
|
||||
const raw = prepRes.data;
|
||||
if (raw !== null && typeof raw === 'object') {
|
||||
const merged = raw?.orderInfo || raw;
|
||||
state.orderInfo = {
|
||||
...state.orderInfo,
|
||||
...(merged || {}),
|
||||
};
|
||||
const nextStatus = Number(merged?.preparationStatus ?? merged?.status);
|
||||
if (Number.isFinite(nextStatus)) {
|
||||
state.orderInfo.preparationStatus = nextStatus;
|
||||
}
|
||||
} else {
|
||||
const nextStatus = Number(raw);
|
||||
if (Number.isFinite(nextStatus)) {
|
||||
state.orderInfo.preparationStatus = nextStatus;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
}
|
||||
}
|
||||
if (state.orderInfo.deliveryType === 2 && state.orderInfo.payStatus) {
|
||||
pickUpVerifyRef.value && pickUpVerifyRef.value.markCode(res.data.pickUpVerifyCode);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user