From b6f401dd0a9d9bfb6c11c07cdcaab967eabb8af1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 17:50:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/payment-success/payment-success.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/small-program/pages/payment-success/payment-success.vue b/small-program/pages/payment-success/payment-success.vue
index 9b8b0ce..bf9bbe0 100644
--- a/small-program/pages/payment-success/payment-success.vue
+++ b/small-program/pages/payment-success/payment-success.vue
@@ -16,13 +16,13 @@
</view>
<view class="pickup-card">
- <text class="pickup-title">鑷彁鐮�</text>
+ <text class="pickup-title">鏍搁攢鐮�</text>
<view class="qrcode-box">
- <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 100px; height: 100px;"></canvas>
+ <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" :style="'width: '+width+'px; height:'+height+'px;'"></canvas>
<image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
</view>
<text class="pickup-code">{{ orderDetail.memberVerifyCode }}</text>
- <text class="pickup-tip" @tap="copyCode">鐐瑰嚮澶嶅埗鑷彁鐮�</text>
+ <text class="pickup-tip" @tap="copyCode">鐐瑰嚮澶嶅埗鏍搁攢鐮�</text>
</view>
</view>
</view>
@@ -33,7 +33,10 @@
export default {
data() {
+
return {
+ height:100,
+ width:100,
orderId: '',
orderDetail: null,
qrcodeImage: ''
@@ -45,6 +48,8 @@
title: '鏀粯鎴愬姛'
})
this.getOrderDetail()
+ this.width = this.rpxToPx(200)
+ this.height = this.rpxToPx(200)
},
methods: {
async getOrderDetail() {
@@ -56,12 +61,15 @@
}
}
},
+ rpxToPx(rpx) {
+ return rpx * wx.getSystemInfoSync().windowWidth / 750
+ },
generateQrcode(code) {
drawQrcode({
canvasId: 'qrcodeCanvas',
text: code,
- width: 100,
- height: 100,
+ width: this.width,
+ height: this.height,
correctLevel: 2
})
setTimeout(() => {
@@ -79,8 +87,8 @@
})
},
viewOrder() {
- uni.redirectTo({
- url: '/pages/itinerary/itinerary?orderId=' + this.orderId
+ uni.navigateTo({
+ url:'/pages/delivery-order-detail/delivery-order-detail?userType=0&id='+this.orderId
})
},
copyCode() {
@@ -96,7 +104,7 @@
})
}
})
- }
+ }
}
}
</script>
--
Gitblit v1.9.3