Merge remote-tracking branch 'origin/master'

doum

2026-04-30 146cd503d32b415d11fb4109ad106063310cc726

 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%;