Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

rk

2026-04-28 a59ff44b2eaa7020f0529632d9ec064c4dc38e27

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

@@ -19,7 +19,16 @@
         </view>
         <view class="nr-desc" v-if="info.statusDesc">{{info.statusDesc || ''}}</view>
         <view class="item" style="padding: 10rpx;" v-if="info.type ===1 && info.status===4">
            <map name="mapAddr"></map>
            <map 
               name="mapAddr"
               :latitude="mapLat" 
               :longitude="mapLng" 
               :scale="mapScale" 
               :markers="markers" 
               :polyline="polyline"
               show-location
               style="width: 100%; height: 100%;"
            ></map>
         </view>
         <view class="item">
            <view class="addr">
@@ -30,7 +39,7 @@
                     <text>{{info.depositShopName || ''}}</text>
                     <image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
                  </view>
                  <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
                  <text>{{info.depositShopAddress || ''}} </text>
               </view>
               <view class="addr-item" v-if="info.type === 1">
                  <view class="ji bg1">收</view>
@@ -38,20 +47,28 @@
                     <text>{{info.takeShopName || info.takeLocation || ''}}</text>
                     <image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
                  </view>
                  <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
                  <text>{{info.takeShopAddress || ''}}</text>
               </view>
            </view>
            <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>
                  <!-- <image :src="qrcodeImage" mode="widthFix"></image> -->
                  <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>
            </view>
            <view class="item-x"></view>
            <view class="item-list">
               <view class="item-list-row">
                  <view class="item-form-label">收件人</view>
                  <view class="item-form-val">{{info.takeUser || ''}}</view>
               </view>
               <view class="item-list-row">
                  <view class="item-form-label">收件人电话</view>
                  <view class="item-form-val">{{info.takePhone || ''}}</view>
               </view>
               <view class="item-list-row">
                  <view class="item-form-label">预计到店时间</view>
                  <view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
@@ -74,7 +91,7 @@
               </view>
            </view>
         </view>
         <view class="item" v-if="info.refundInfo">
         <!-- <view class="item" v-if="info.refundInfo">
            <view class="tuikuan">
               <view class="tuikuan-top">
                  <text>退款金额</text>
@@ -88,7 +105,7 @@
                  <text v-if="info.refundInfo.status  !== 1">{{info.refundInfo.createTime || ''}}</text>
               </view>
            </view>
         </view>
         </view> -->
         <view class="item" v-if="info.commentStatus === 1">
            <view class="comment">
               <view class="comment-top">
@@ -110,7 +127,7 @@
            <view class="tuikuan">
               <view class="tuikuan-top">
                  <text>退款金额</text>
                  <text>¥{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
                  <text>{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
               </view>
               <view class="tuikuan-bottom">
                  <text v-if="info.refundInfo.status === 0">退款中</text>
@@ -212,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>
@@ -323,6 +340,7 @@
<script>
   import { mapState } from 'vuex'
   import drawQrcode from 'weapp-qrcode'
   var amapFile = require('@/utils/amap-wx.130.js')

   export default {
      computed: {
@@ -331,6 +349,8 @@
      data() {
         return {
            id:null,
            height:180,
            width:180,
            info:{},
            showDone:false,
            showCancel:false,
@@ -339,7 +359,12 @@
            showPay:false,
            showPhone:false,
            linkItem:{title:'',linkname:'',linkphone:''},
            qrcodeImage:null
            qrcodeImage:null,
            mapLat: 0,
            mapLng: 0,
            mapScale: 10,
            markers: [],
            polyline: []
         }
      },
      onShow() {
@@ -354,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:{
@@ -362,6 +389,9 @@
               current: index, 
               urls: images  
            });
         },
         rpxToPx(rpx) {
           return rpx * wx.getSystemInfoSync().windowWidth / 750
         },
         payOrder(){
            var that = this;
@@ -512,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(() => {
@@ -539,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(() => {
@@ -569,7 +599,112 @@
               this.info = res.data 
               uni.$emit('updateOrder',{info:this.info,delete:0})
               this.showQrcodeImg()
               if (this.info.type === 1 && this.info.status === 4) {
                  this.getRoutePlanning()
               }
            } 
         },
         getRoutePlanning() {
            var that = this
            var driverLat = this.info.driverLat
            var driverLng = this.info.driverLng
            var depositShopLat = this.info.depositShopLat
            var depositShopLng = this.info.depositShopLng
				
            if (!driverLat || !driverLng || !depositShopLat || !depositShopLng) {
               return
            }
				
            this.mapLat = driverLat
            this.mapLng = driverLng
				
            var myAmapFun = new amapFile.AMapWX({ key: this.$gaodeMapKey })
            myAmapFun.getDrivingRoute({
               origin: driverLng + ',' + driverLat,
               destination: depositShopLng + ',' + depositShopLat,
               success: function(data) {
                  var points = []
                  if (data.paths && data.paths.length > 0) {
                     var path = data.paths[0]
                     for (var i = 0; i < path.steps.length; i++) {
                        var step = path.steps[i]
                        var stepPoints = step.Polyline.split(';')
                        for (var j = 0; j < stepPoints.length; j++) {
                           var point = stepPoints[j].split(',')
                           points.push({
                              latitude: point[1],
                              longitude: point[0]
                           })
                        }
                     }
                  }
						
                  that.polyline = [{
                     points: points,
                     color: '#004096',
                     width: 6,
                     arrowLine: true
                  }]
						
                  that.markers = [
                     {
                        id: 1,
                        latitude: driverLat,
                        longitude: driverLng,
                        iconPath: '/static/icon/start.png',
                        width: 30,
                        height: 40,
                        anchor: { x: 0.5, y: 1 }
                     },
                     {
                        id: 2,
                        latitude: depositShopLat,
                        longitude: depositShopLng,
                        iconPath: '/static/icon/end.png',
                        width: 30,
                        height: 40,
                        anchor: { x: 0.5, y: 1 }
                     },
                     {
                        id: 3,
                        latitude: driverLat,
                        longitude: driverLng,
                        iconPath: '/static/icon/dizhi.png',
                        width: 24,
                        height: 30,
                        anchor: { x: 0.5, y: 0.5 }
                     }
                  ]
						
                  if (points.length > 0) {
                     that.mapLat = points[Math.floor(points.length / 2)].latitude
                     that.mapLng = points[Math.floor(points.length / 2)].longitude
                  }
               },
               fail: function(err) {
                  console.error('获取路径规划失败', err)
                  that.markers = [
                     {
                        id: 1,
                        latitude: driverLat,
                        longitude: driverLng,
                        iconPath: '/static/icon/start.png',
                        width: 30,
                        height: 40,
                        anchor: { x: 0.5, y: 1 }
                     },
                     {
                        id: 2,
                        latitude: depositShopLat,
                        longitude: depositShopLng,
                        iconPath: '/static/icon/end.png',
                        width: 30,
                        height: 40,
                        anchor: { x: 0.5, y: 1 }
                     }
                  ]
               }
            })
         }
      }
   }
@@ -657,7 +792,7 @@
         position: fixed;
         top: 0;
         left: 0;
         z-index: 9;
         z-index: 99999;
         .head-nav {
            width: 100%;
            display: flex;
@@ -936,6 +1071,12 @@
                  width: 360rpx;
                  height: 360rpx;
               }
               canvas {
                  position: fixed;
                  top: -100%;
                  left: -100%;
                  opacity: 0;
               }
               text {
                  &:nth-child(2) {
                     font-weight: 600;
@@ -1031,6 +1172,7 @@
                     flex-wrap: wrap;
                     align-items: center;
                     justify-content: space-between;
                     gap: 20rpx;
                     .item-form-list-row {
                        width: 88rpx;
                        height: 88rpx;