diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index db51940..3eac9b2 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -1802,11 +1802,26 @@ export default { } result.push({ ...item, - showMore: false + showMore: false, + // 盲盒订单确认收货后需展示真实商品,后端字段未随状态更新,按订单状态兜底修正 + isGiftCardReceiveBlind: this.resolveBlindBoxDisplayFlag(item) }) return result }, []) }, + // 盲盒订单在确认收货后(待评价 3 / 已完成 4)应展示真实商品信息; + // 后端 isGiftCardReceiveBlind 未随收货状态更新,这里依据订单状态兜底修正 + resolveBlindBoxDisplayFlag(order) { + const raw = order && order.isGiftCardReceiveBlind + if (Number(raw) !== 1) { + return raw + } + const statusType = Number(order && order._status && order._status._type) + if (statusType === 3 || statusType === 4) { + return 0 + } + return 1 + }, tabChange(item) { this.type = item.index const query = this.getPageQuery() diff --git a/pagesOrder/order/OrderDetails/index.vue b/pagesOrder/order/OrderDetails/index.vue index b3812ee..4e922fb 100644 --- a/pagesOrder/order/OrderDetails/index.vue +++ b/pagesOrder/order/OrderDetails/index.vue @@ -873,6 +873,8 @@ export default { goGoodsCon(item, isGiftCardReceiveBlind, isDrawOrder, scenarioCode) { if(isGiftCardReceiveBlind) return if(isDrawOrder) return + // 采购批发订单(集采中心)商品卡片不跳转批发商品详情页 + if (Number(scenarioCode) === 22) return if (Number(scenarioCode) === 24) return const activityId = Number( item.drawActivityId || @@ -1375,6 +1377,11 @@ export default { orderDetail(id).then(res => { this.orderInfo = res.data this.orderInfo._status._type = parseInt(this.orderInfo._status._type) + // 盲盒订单确认收货后(待评价 3 / 已完成 4)展示真实商品信息, + // 后端 isGiftCardReceiveBlind 未随收货状态更新,按订单状态兜底修正 + if (Number(this.orderInfo.isGiftCardReceiveBlind) === 1 && [3, 4].includes(this.orderInfo._status._type)) { + this.orderInfo.isGiftCardReceiveBlind = 0 + } this.getOrderStatus() if (this.isWholesalerOrder(this.orderInfo)) { this.orderTypeName = "采购批发订单"