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 | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 c330127..c0f5a80 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
@@ -54,6 +54,7 @@
<!-- <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image> -->
<view style="width: 360rpx; height: 360rpx;">
<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>{{info.memberVerifyCode || ''}}</text>
<text @tap="copyCode(info.memberVerifyCode||'')">鏍搁攢鐮�</text>
@@ -228,7 +229,7 @@
</view>
<view style="width: 100%; height: calc(210rpx + env(safe-area-inset-bottom));"></view>
</view>
- <view class="tips" v-if="info.overdueStatus !==0">
+ <view class="tips" v-if="info.overdueStatus !==0 && info.overdueStatus !==2">
<image src="/static/icon/ic_waring@2x.png" mode="widthFix"></image>
<text v-if="info.overdueStatus ===1">宸茶秴杩囧彇浠舵椂闂达紝宸蹭骇鐢熻秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
<text v-if="info.overdueStatus ===3">宸茶秴杩囧彇浠舵椂闂达紝闇�瑕佹敮浠樿秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
@@ -378,8 +379,8 @@
this.showPay=false
this.showPhone=false
this.getUserDetail()
- this.width = this.rpxToPx(200)
- this.height = this.rpxToPx(200)
+ this.width = this.rpxToPx(360)
+ this.height = this.rpxToPx(360)
this.linkItem={title:'',linkname:'',linkphone:''}
},
methods:{
@@ -541,8 +542,8 @@
drawQrcode({
canvasId: 'qrcodeCanvas1',
text: this.info.memberVerifyCode,
- width: 100,
- height: 100,
+ width: this.rpxToPx(360),
+ height: this.rpxToPx(360),
correctLevel: 2
})
setTimeout(() => {
@@ -558,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
}
@@ -568,15 +571,19 @@
drawQrcode({
canvasId: 'qrcodeCanvas',
text: this.info.memberVerifyCode,
- width: 180,
- height: 180,
+ width: this.rpxToPx(360),
+ height: this.rpxToPx(360),
correctLevel: 2
})
setTimeout(() => {
uni.canvasToTempFilePath({
canvasId: 'qrcodeCanvas',
success: (res) => {
+ console.log("showQrcodeImg-------鎴愬姛",res)
that.qrcodeImage = res.tempFilePath
+ },
+ fail: (err) => {
+ console.log("showQrcodeImg-------澶辫触",err)
}
}, this)
}, 100)
@@ -1070,6 +1077,12 @@
width: 360rpx;
height: 360rpx;
}
+ #qrcodeCanvas {
+ position: fixed;
+ top: -100%;
+ left: -100%;
+ opacity: 0;
+ }
text {
&:nth-child(2) {
font-weight: 600;
@@ -1165,6 +1178,7 @@
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
+ gap: 20rpx;
.item-form-list-row {
width: 88rpx;
height: 88rpx;
--
Gitblit v1.9.3