From 146cd503d32b415d11fb4109ad106063310cc726 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 15:17:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 small-program/pages/delivery-order-detail/delivery-order-detail.vue |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/small-program/pages/delivery-order-detail/delivery-order-detail.vue b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
index 5411e8d..c0f5a80 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -559,8 +559,10 @@
 				}
 			},
 			async showQrcodeImg(){
+				console.log("showQrcodeImg")
 				if((this.info.type ===0 && this.info.status >=1 &&this.info.status <7) 
 				|| (this.info.type ===1 && (this.info.status ===1 || (this.info.takeShopId && this.info.status ===5)))){
+					console.log("showQrcodeImg-------杩涘叆")
 					if(this.qrcodeImage){
 						return
 					}
@@ -577,7 +579,11 @@
 						uni.canvasToTempFilePath({
 							canvasId: 'qrcodeCanvas',
 							success: (res) => {
+								console.log("showQrcodeImg-------鎴愬姛",res)
 								that.qrcodeImage = res.tempFilePath
+							},
+							fail: (err) => {
+								console.log("showQrcodeImg-------澶辫触",err)
 							}
 						}, this)
 					}, 100)
@@ -1071,7 +1077,7 @@
 						width: 360rpx;
 						height: 360rpx;
 					}
-					canvas {
+					#qrcodeCanvas {
 						position: fixed;
 						top: -100%;
 						left: -100%;

--
Gitblit v1.9.3