提交

MrShi

2026-05-18 b099e758396f61b39d24cf5fa6be7bb0d10c2b4d

 small-program/shop/pages/order-details/order-details.vue

@@ -37,9 +37,9 @@
                  <view class="addr-item-top">
                     <text>{{info.depositShopName || ''}}</text>
                  </view>
                  <text>{{info.depositShopAddress || ''}}  </text>
                  <view class='addr-link' style="top: 50rpx;">
                     <image style="margin-right: 10rpx;" @click="contactPhoneDo(info.takePhone)" src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
                  <text style="width: 70%;">{{info.depositShopAddress || ''}}  </text>
                  <view class='addr-link' style="top: 0;" @click="contactPhoneDo(info.takePhone)">
                     <image style="margin-right: 10rpx;" src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
                     <text class=" txt-d1">联系客户</text>
                  </view>
               </view>
@@ -88,8 +88,8 @@
                  <view class="addr-item-top">
                        <text class=" txt-d">司机：{{info.driverName || '战神'}} </text>
                  </view>
                  <view class='addr-link'>
                     <image style="margin-right: 10rpx;" @click="contactPhoneDo(info.driverPhone)" src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
                  <view class='addr-link' style="top: 0;" @click="contactPhoneDo(info.driverPhone)">
                     <image style="margin-right: 10rpx;" src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
                     <text class=" txt-d1">联系司机</text>
                  </view>
                  
@@ -233,9 +233,9 @@
         <view class="footer-btns">
            <view class="btn kong" @click="contactPhoneDo(info.takePhone)" v-if="info.status === 1 || info.status === 5" >联系客户</view>
            <view class="btn kong" @click="contactPhoneDo(info.driverPhone)" v-if="info.type ===1&&(info.status === 4 || info.status === 3)">联系骑手</view>
            <view class="btn you"  v-if="info.status ===1  || info.status ===4 "   @click="hexiaoOrder(info)" >收件核销</view>
            <view class="btn you"  v-if="info.status ==2 || info.status ===3  || info.status ===4  "   @click="printerOrder(info)" >打印标签</view>
            <view class="btn you" v-if="info.status ===5 &&(info.overdueStatus ==0 || info.overdueStatus == 1)" @click="hexiaoOrder(info)" >确认到店</view>
            <view class="btn you"  v-if="[1,4].includes(info.status) && info.takeShopId" @click="hexiaoOrder(info)" >收件核销</view>
            <view class="btn you"  v-if="info.status>0||info.status<=7  "   @click="printerOrder(info)" >打印标签</view>
            <view class="btn you" v-if="info.status ===5 &&(info.overdueStatus ==0 || info.overdueStatus == 1) && info.takeShopId" @click="hexiaoOrder(info)" >确认到店</view>
            <view class="btn you" v-if="info.status ===5 && (info.overdueStatus == 4 || info.overdueStatus == 2)" @click="hexiaoOrder(info)" >取件核销</view>
         </view>
      </view>
@@ -421,8 +421,10 @@
                  console.log('data.paths:', data.paths)
                  console.log('driverLng:', driverLng, 'driverLat:', driverLat, 'depositShopLng:', depositShopLng, 'depositShopLat:', depositShopLat)
                  var points = []
                  var duration = 0
                  if (data.paths && data.paths.length > 0) {
                     var path = data.paths[0]
                     duration = path.duration || 0
                     console.log('path:', path)
                     console.log('path keys:', Object.keys(path))
                     
@@ -458,6 +460,17 @@
                     }
                  }
                  console.log('points:', points)
						
                  var expectedTime = ''
                  if (duration > 0) {
                     var now = new Date()
                     var arrivalTime = new Date(now.getTime() + duration * 1000)
                     var month = arrivalTime.getMonth() + 1
                     var day = arrivalTime.getDate()
                     var hours = arrivalTime.getHours()
                     var minutes = arrivalTime.getMinutes()
                     expectedTime = month + '.' + (day < 10 ? '0' + day : day) + ' ' + (hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes)
                  }
                  
                  that.polyline = [{
                     points: points,
@@ -495,7 +508,7 @@
                        height: 30,
                        anchor: { x: 0.5, y: 0.5 },
                        callout: {
                           content: '预计到店时间\n' + (that.info.expectedDepositTime || ''),
                           content: '预计到店时间\n' + expectedTime,
                           color: '#222222',
                           fontSize: 14,
                           borderRadius: 4,