Fix:5759 【礼品集采中心小程序】我的订单-集采中心,领取采购批发礼品的盲盒,订单列表和订单详情页效果显示错误
This commit is contained in:
@@ -282,7 +282,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else>
|
||||
<view v-else-if="!(isCollectiveCenterMode && isBlindBoxGiftOrder(order))">
|
||||
<view
|
||||
v-for="(cart,cartInfoIndex) in order.cartInfo"
|
||||
:key="cartInfoIndex"
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
<view style="margin-top: 30rpx;border-radius:20rpx;overflow: hidden;" class="v12-white">
|
||||
<!-- <OrderGoods :evaluate="status.type || 0" :cartInfo="orderInfo.cartInfo || []" title="商品信息"></OrderGoods> -->
|
||||
<view class="v12-radius-20 v12-pa-3" v-for="(cart, d) in getOrderDetailDisplayItems(orderInfo)" :key="d" @click="goGoodsCon(cart, orderInfo.isGiftCardReceiveBlind, orderInfo.isDrawOrder, orderInfo.scenarioCode)">
|
||||
<view class="v12-justify-between" v-if="orderInfo.isGiftCardReceiveBlind === 0">
|
||||
<view class="v12-justify-between" v-if="!isBlindBoxOrder(orderInfo)">
|
||||
<view class="">
|
||||
<image style="width: 120rpx; height: 120rpx" class="v12-radius-8" :src="cart.image"></image>
|
||||
</view>
|
||||
@@ -1059,6 +1059,9 @@ export default {
|
||||
isCustomGiftOrder(order = this.orderInfo) {
|
||||
return this.getOrderScenarioCode(order) === 24
|
||||
},
|
||||
isBlindBoxOrder(order = this.orderInfo) {
|
||||
return Number(order && order.isGiftCardReceiveBlind) === 1
|
||||
},
|
||||
isCollectiveOrder(order = this.orderInfo) {
|
||||
return this.isWholesalerOrder(order) || this.isCustomGiftOrder(order)
|
||||
},
|
||||
@@ -1117,6 +1120,10 @@ export default {
|
||||
return [this.normalizeOrderDetailItem(customGiftInfo, true)]
|
||||
}
|
||||
const cartList = Array.isArray(order && order.cartInfo) ? order.cartInfo : []
|
||||
// 盲盒订单隐藏商品信息,固定展示一个盲盒礼包行(cartInfo 为空时也要展示)
|
||||
if (this.isBlindBoxOrder(order)) {
|
||||
return [this.normalizeOrderDetailItem(cartList[0] || {})]
|
||||
}
|
||||
return cartList.map(item => this.normalizeOrderDetailItem(item))
|
||||
},
|
||||
getStatusImg(order) {
|
||||
|
||||
Reference in New Issue
Block a user