From ac45a0dfeefba2b0702d6da6321515f85c1b2bc6 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Wed, 13 May 2026 00:51:23 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A5254=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=A5=96=E5=93=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=9B=BE=E7=89=87=EF=BC=8C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E3=80=82=E9=9C=80=E5=85=B3=E9=97=AD=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=9B=BE=E7=89=87=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/order/OrderDetails/index.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pagesOrder/order/OrderDetails/index.vue b/pagesOrder/order/OrderDetails/index.vue
index 2005c77..e2fd70a 100644
--- a/pagesOrder/order/OrderDetails/index.vue
+++ b/pagesOrder/order/OrderDetails/index.vue
@@ -202,7 +202,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 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="">
             <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">
               <text class="ticket-card-code">{{ drawTicketPopup.ticketCode }}</text>
             </view>
-            <view class="ticket-card-time" v-if="drawTicketPopup.drawTime">开奖时间：{{ drawTicketPopup.drawTime }}</view>
+            <view class="ticket-card-time">开奖时间：{{ (drawTicketPopup.drawTime) }}</view>
           </view>
         </view>
         <view class="draw-ticket-actions">
@@ -780,13 +780,24 @@ export default {
       this.drawTicketPopup = {
         show: true,
         orderId: this.id || this.$yroute.query.id || '',
-        ticketCode: result.ticketCode || '',
+        ticketCode: result.ticketCode || result.code || '',
         drawTime: result.drawTime || ''
       }
     },
     closeDrawTicketPopup() {
       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() {
       this.drawTicketPopup.show = false
       uni.switchTab({
@@ -845,8 +856,9 @@ export default {
         }
       })
     },
-    goGoodsCon(item, isGiftCardReceiveBlind) {
+    goGoodsCon(item, isGiftCardReceiveBlind, isDrawOrder) {
       if(isGiftCardReceiveBlind) return
+      if(isDrawOrder) return
       this.$yrouter.push({
         path: '/pages/shop/GoodsCon/index',
         query: {