Merge remote-tracking branch 'origin/master'

doum

2026-04-29 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 small-program/pages/delivery-order-detail/delivery-order-detail.vue

@@ -53,7 +53,8 @@
            <view class="item-qrcode" v-if=" (info.type ===0 && info.status >=1 &&info.status <7) || (info.type ===1 && (info.status ===1 || (info.takeShopId && info.status ===5)))">
               <!-- <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: 180px; height: 180px;"></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>{{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>
@@ -348,6 +349,8 @@
      data() {
         return {
            id:null,
            height:180,
            width:180,
            info:{},
            showDone:false,
            showCancel:false,
@@ -376,6 +379,8 @@
         this.showPay=false
         this.showPhone=false
         this.getUserDetail() 
         this.width = this.rpxToPx(360)
         this.height = this.rpxToPx(360)
         this.linkItem={title:'',linkname:'',linkphone:''}
      },
      methods:{
@@ -384,6 +389,9 @@
               current: index, 
               urls: images  
            });
         },
         rpxToPx(rpx) {
           return rpx * wx.getSystemInfoSync().windowWidth / 750
         },
         payOrder(){
            var that = this;
@@ -534,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(() => {
@@ -561,8 +569,8 @@
               drawQrcode({
                  canvasId: 'qrcodeCanvas',
                  text: this.info.memberVerifyCode,
                  width: 180,
                  height: 180,
                  width: this.rpxToPx(360),
                  height: this.rpxToPx(360),
                  correctLevel: 2
               })
               setTimeout(() => {
@@ -1063,6 +1071,12 @@
                  width: 360rpx;
                  height: 360rpx;
               }
               canvas {
                  position: fixed;
                  top: -100%;
                  left: -100%;
                  opacity: 0;
               }
               text {
                  &:nth-child(2) {
                     font-weight: 600;
@@ -1158,6 +1172,7 @@
                     flex-wrap: wrap;
                     align-items: center;
                     justify-content: space-between;
                     gap: 20rpx;
                     .item-form-list-row {
                        width: 88rpx;
                        height: 88rpx;