From 2d60de3fc73ba54287268bab383b94db6c28848c Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Sat, 12 Oct 2024 14:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A0=B8=E9=94=80=20?=
 =?UTF-8?q?=E4=BC=98=E5=85=88third=5Forder=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/order/detail.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
index a7c9964..5a25886 100644
--- a/subPackages/order/detail.vue
+++ b/subPackages/order/detail.vue
@@ -29,7 +29,7 @@
 						<image :src="item.qrcodeimg" style="width: 300rpx;height: 300rpx;" mode="aspectFill"></image>
 						<canvas :id="'qrcodeT'+index" :canvas-id="'qrcodeT'+index"
 							style="width:150px;height:150px;z-index: -20;bottom: -500px;position: absolute;"></canvas>
-						<view class="qrcode-subtitle">核销码:{{item.child_id}}</view>
+						<view class="qrcode-subtitle">核销码:{{item.third_order_id||item.child_id}}</view>
 
 						<view class="complete-text flex-center"
 							v-if="['WAIT_REFUND','REFUND_SUCCESS','WAIT_COMMENT','COMPLETE'].includes(item.status)">
@@ -478,7 +478,8 @@
 							.includes(this.info.status)) {
 							this.isQrcode = true
 							for (let i = 0; i < this.info.order_child.length; i++) {
-								this.getCodeImg(this.info.order_child[i].child_id, i);
+								// 有third_order_id 优先用third_order_id
+								this.getCodeImg(this.info.order_child[i].third_order_id||this.info.order_child[i].child_id, i);
 
 								// 未核销数量
 								if (this.info.order_child[i].status == 'SUCCESS') this.remainNum += 1
@@ -487,7 +488,7 @@
 							for (let i = 0; i < this.info.order_child.length; i++) {
 								if (this.info.order_child[i].is_display_order_qrcode) {
 									this.isQrcode = true
-									this.getCodeImg(this.info.order_child[i].child_id, i);
+									this.getCodeImg(this.info.order_child[i].third_order_id||this.info.order_child[i].child_id, i);
 
 									// 未核销数量
 									if (this.info.order_child[i].status == 'SUCCESS') this.remainNum += 1