Fix:5254 【商城小程序】奖品订单详情页,点击商品图片,显示空白。需关闭商品图片交互
This commit is contained in:
@@ -202,7 +202,7 @@
|
|||||||
|
|
||||||
<view style="margin-top: 30rpx;border-radius:20rpx;overflow: hidden;" class="v12-white">
|
<view style="margin-top: 30rpx;border-radius:20rpx;overflow: hidden;" class="v12-white">
|
||||||
<!-- <OrderGoods :evaluate="status.type || 0" :cartInfo="orderInfo.cartInfo || []" title="商品信息"></OrderGoods> -->
|
<!-- <OrderGoods :evaluate="status.type || 0" :cartInfo="orderInfo.cartInfo || []" title="商品信息"></OrderGoods> -->
|
||||||
<view class="v12-radius-20 v12-pa-3" v-for="(cart, d) in orderInfo.cartInfo" :key="d" @click="goGoodsCon(cart, orderInfo.isGiftCardReceiveBlind)">
|
<view class="v12-radius-20 v12-pa-3" v-for="(cart, d) in orderInfo.cartInfo" :key="d" @click="goGoodsCon(cart, orderInfo.isGiftCardReceiveBlind, orderInfo.isDrawOrder)">
|
||||||
<view class="v12-justify-between" v-if="orderInfo.isGiftCardReceiveBlind === 0">
|
<view class="v12-justify-between" v-if="orderInfo.isGiftCardReceiveBlind === 0">
|
||||||
<view class="">
|
<view class="">
|
||||||
<image style="width: 120rpx; height: 120rpx" class="v12-radius-8" :src="cart.productInfo.image"></image>
|
<image style="width: 120rpx; height: 120rpx" class="v12-radius-8" :src="cart.productInfo.image"></image>
|
||||||
@@ -602,7 +602,7 @@
|
|||||||
<view class="ticket-card-code-box">
|
<view class="ticket-card-code-box">
|
||||||
<text class="ticket-card-code">{{ drawTicketPopup.ticketCode }}</text>
|
<text class="ticket-card-code">{{ drawTicketPopup.ticketCode }}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="ticket-card-time" v-if="drawTicketPopup.drawTime">开奖时间:{{ drawTicketPopup.drawTime }}</view>
|
<view class="ticket-card-time">开奖时间:{{ (drawTicketPopup.drawTime) }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="draw-ticket-actions">
|
<view class="draw-ticket-actions">
|
||||||
@@ -780,13 +780,24 @@ export default {
|
|||||||
this.drawTicketPopup = {
|
this.drawTicketPopup = {
|
||||||
show: true,
|
show: true,
|
||||||
orderId: this.id || this.$yroute.query.id || '',
|
orderId: this.id || this.$yroute.query.id || '',
|
||||||
ticketCode: result.ticketCode || '',
|
ticketCode: result.ticketCode || result.code || '',
|
||||||
drawTime: result.drawTime || ''
|
drawTime: result.drawTime || ''
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
closeDrawTicketPopup() {
|
closeDrawTicketPopup() {
|
||||||
this.drawTicketPopup.show = false
|
this.drawTicketPopup.show = false
|
||||||
},
|
},
|
||||||
|
formatDrawTime(time) {
|
||||||
|
if (!time) return '--'
|
||||||
|
const date = new Date(String(time).replace(/-/g, '/'))
|
||||||
|
if (Number.isNaN(date.getTime())) return time
|
||||||
|
const y = date.getFullYear()
|
||||||
|
const m = String(date.getMonth() + 1).padStart(2, '0')
|
||||||
|
const d = String(date.getDate()).padStart(2, '0')
|
||||||
|
const hh = String(date.getHours()).padStart(2, '0')
|
||||||
|
const mm = String(date.getMinutes()).padStart(2, '0')
|
||||||
|
return `${y}年${m}月${d}日 ${hh}:${mm}`
|
||||||
|
},
|
||||||
goHomeFromPopup() {
|
goHomeFromPopup() {
|
||||||
this.drawTicketPopup.show = false
|
this.drawTicketPopup.show = false
|
||||||
uni.switchTab({
|
uni.switchTab({
|
||||||
@@ -845,8 +856,9 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
goGoodsCon(item, isGiftCardReceiveBlind) {
|
goGoodsCon(item, isGiftCardReceiveBlind, isDrawOrder) {
|
||||||
if(isGiftCardReceiveBlind) return
|
if(isGiftCardReceiveBlind) return
|
||||||
|
if(isDrawOrder) return
|
||||||
this.$yrouter.push({
|
this.$yrouter.push({
|
||||||
path: '/pages/shop/GoodsCon/index',
|
path: '/pages/shop/GoodsCon/index',
|
||||||
query: {
|
query: {
|
||||||
|
|||||||
Reference in New Issue
Block a user