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

MrShi

2026-04-23 2b9cd0d9c50fae99402da7857addfe643fcbc6d8

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

@@ -1,21 +1,21 @@
<template>
   <view class="detail">
      <view class="head" :style="{ height: statusbarHeight + navHeight + 'px' }">
      <view :class="info.type === 1?'head head1':'head head0'" :style="{ height: statusbarHeight + navHeight + 'px' }">
         <view :style="{width: '100%', height: statusbarHeight + 'px'}"></view>
         <view class="head-nav" :style="{width: '100%', height: navHeight + 'px'}">
            <image src="/static/icon/nav_ic_back.png" mode="widthFix"></image>
            <image src="/static/icon/nav_ic_back.png" mode="widthFix"  @click="goBack"></image>
            <text>寄存订单</text>
            <image src="/static/icon/nav_ic_back.png" mode="widthFix" style="opacity: 0;"></image>
            <image src="/static/icon/nav_ic_back.png" @click="goBack" mode="widthFix" style="opacity: 0;"></image>
         </view>
      </view>
      <view :style="{ width: '100%', height: statusbarHeight + navHeight + 'px' }"></view>
      <view class="nr">
      <view :class="info.type === 1?'nr head1':'nr head0'">
         <view class="nr-status">
            <text>待配送</text>
            <view class="nr-status-type">寄送</view>
            <view class="nr-status-type1">寄送</view>
            <text>{{info.statusName|| ''}}</text>
            <view class="nr-status-type1" v-if="info.type === 0">就地寄存</view>
            <view class="nr-status-type" v-else>同城寄送</view>
         </view>
         <view class="nr-desc">门店已接单，正在为您安排配送司机～</view>
         <view class="nr-desc" v-if="info.statusDesc">{{info.statusDesc || ''}}</view>
         <view class="item" style="padding: 10rpx;">
            <map name="mapAddr"></map>
         </view>
@@ -25,44 +25,44 @@
                  <view class="ji bg">寄</view>
                  <view class="xiantiao"></view>
                  <view class="addr-item-top">
                     <text>安徽省合肥市蜀山区莲花科技产业园F401</text>
                     <text>{{info.depositShopName || ''}}</text>
                     <image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
                  </view>
                  <text>张海涛 18733987653</text>
                  <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
               </view>
               <view class="addr-item">
                  <view class="ji bg1">收</view>
                  <view class="addr-item-top">
                     <text>安徽省合肥市蜀山区莲花科技产业园F401</text>
                     <text>{{info.takeShopName || info.takeLocation || ''}}</text>
                     <image src="/static/icon/ar_jicundian@2x.png" mode="widthFix"></image>
                  </view>
                  <text>张海涛 18733987653</text>
                  <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
               </view>
            </view>
            <view class="item-qrcode">
               <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image>
               <text>767889</text>
               <text>{{info.memberVerifyCode || ''}}</text>
               <text>取件码</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">2026-04-12 12:00</view>
                  <view class="item-form-val">{{info.expectedDepositTime || ''}}</view>
               </view>
               <view class="item-list-row">
                  <view class="item-form-label">预计取件时间</view>
                  <view class="item-form-val">2026-04-14 12:00</view>
                  <view class="item-form-val">{{info.expectedTakeTime || ''}}</view>
               </view>
               <view class="item-list-row">
                  <view class="item-form-label">物品名称</view>
                  <view class="item-form-val">衣服</view>
                  <view class="item-form-val">{{info.typeName || ''}}</view>
               </view>
               <view class="item-list-row">
                  <view class="item-form-label">物品照片</view>
                  <view class="item-form-list">
                     <view class="item-form-list-row">
                        <image src="/static/image/tx@2x.png" mode="widthFix"></image>
                  <view class="item-form-list" v-if="info.orderImages && info.orderImages.length">
                     <view class="item-form-list-row" v-for="(item,index) in info.orderImages" key="item">
                        <image :src="item" mode="widthFix" @click="previewImage(info.orderImages,index)"></image>
                     </view>
                  </view>
               </view>
@@ -72,60 +72,42 @@
            <view class="tuikuan">
               <view class="tuikuan-top">
                  <text>退款金额</text>
                  <text>115.00</text>
                  <text>¥{{((info.refundAmount || 0)/100).toFixed(2)}}</text>
               </view>
               <view class="tuikuan-bottom">
                  <text>已退回您的支付账户</text>
                  <text>2026-04-12 12:32:00</text>
                  <text v-if="info.refundStatus === 0">退款中</text>
                  <text v-if="info.refundStatus === 1">已退回您的支付账户</text>
                  <text v-if="info.refundStatus === 2">退款失败</text>
                  <text>{{info.refundTime || ''}}</text>
               </view>
            </view>
         </view>
         <view class="item">
         <view class="item" v-if="info.detailList">
            <view class="xl">
               <view class="xl-item">
               <view v-for="goods in info.detailList " :key="goods.luggageName" class="xl-item">
                  <view class="xl-item-top">
                     <text>大件行李箱</text>
                     <text>¥35</text>
                     <text>{{ goods.luggageName ||'' }}</text>
                     <text>¥{{((goods.subtotal || 0)/100).toFixed(2) }}</text>
                  </view>
                  <view class="xl-item-bottom">
                     <text>24-28寸</text>
                     <text>x1</text>
                     <text>{{ goods.luggageDetail || '' }}</text>
                     <text>x{{ goods.num || 1}}</text>
                  </view>
               </view>
               <view class="xl-item">
                  <view class="xl-item-top">
                     <text>中件行李箱</text>
                     <text>¥35</text>
                  </view>
                  <view class="xl-item-bottom">
                     <text>24-28寸</text>
                     <text>x1</text>
                  </view>
               </view>
               <view class="xl-item">
                  <view class="xl-item-top">
                     <text>小件行李箱</text>
                     <text>¥35</text>
                  </view>
                  <view class="xl-item-bottom">
                     <text>24-28寸</text>
                     <text>x1</text>
                  </view>
               </view>
               </view> 
            </view>
            <view class="item-x"></view>
            <view class="item-list">
               <view class="item-list-row">
                  <view class="item-form-label" style="color: #333333; font-size: 28rpx;">配送费</view>
                  <view class="item-form-val" style="color: #333333; font-size: 24rpx;">¥105.00</view>
                  <view class="item-form-label" style="color: #333333; font-size: 28rpx;">报价金额</view>
                  <view class="item-form-val" style="color: #333333; font-size: 24rpx;">¥{{((info.declaredAmount || 0)/100).toFixed(2)}}</view>
               </view>
               <view class="item-list-row">
                  <view class="item-form-label" style="color: #333333; font-size: 28rpx;">行李保费</view>
                  <view class="item-form-val" style="color: #333333; font-size: 24rpx;">¥10.00</view>
                  <view class="item-form-val" style="color: #333333; font-size: 24rpx;">¥{{((info.declaredFee || 0)/100).toFixed(2)}}</view>
               </view>
               <view class="item-list-row">
                  <view class="item-form-label" style="color: #222222; font-size: 30rpx; font-weight: 600;">实付款</view>
                  <view class="item-form-val price" style="color: #FE2C2E; font-size: 36rpx;">115.00</view>
                  <view class="item-form-val price" style="color: #FE2C2E; font-size: 36rpx;">{{((info.actualPayAmount || 0)/100).toFixed(2)}}</view>
               </view>
            </view>
         </view>
@@ -135,20 +117,20 @@
               <view class="item-infos-item">
                  <view class="item-infos-item-left">订单编号：</view>
                  <view class="item-infos-item-right">
                     <text>202107131742520001</text>
                     <text>{{info.code ||''}}</text>
                     <image src="/static/icon/ic_cppy@2x.png" mode="widthFix"></image>
                  </view>
               </view>
               <view class="item-infos-item">
                  <view class="item-infos-item-left">创建时间：</view>
                  <view class="item-infos-item-right">
                     <text>2026-04-12 12:00:00</text>
                     <text>{{info.createTime ||''}}</text>
                  </view>
               </view>
               <view class="item-infos-item">
               <view class="item-infos-item" v-if="info.payTime">
                  <view class="item-infos-item-left">支付时间：</view>
                  <view class="item-infos-item-right">
                     <text>2026-04-12 12:00:00</text>
                     <text>{{info.payTime ||''}}</text>
                  </view>
               </view>
               <view class="item-infos-item">
@@ -157,51 +139,141 @@
                     <text>微信支付</text>
                  </view>
               </view>
               <view class="item-infos-item">
               <view class="item-infos-item" v-if="info.outTradeNo">
                  <view class="item-infos-item-left">交易号：</view>
                  <view class="item-infos-item-right">
                     <text>2025080698723178237189237123</text>
                     <text>{{info.outTradeNo || ''}}</text>
                  </view>
               </view>
               <view class="item-infos-item">
                  <view class="item-infos-item-left">订单备注：</view>
                  <view class="item-infos-item-right">
                     <text>-</text>
                     <text>{{info.remark || ''}}</text>
                  </view>
               </view>
               <view class="item-infos-item">
               <view class="item-infos-item" v-if="info.refundTime">
                  <view class="item-infos-item-left">申请退款：</view>
                  <view class="item-infos-item-right">
                     <text>2026-04-12 12:30:00</text>
                     <text>{{info.refundTime || ''}}</text>
                  </view>
               </view>
               <view class="item-infos-item">
               <view class="item-infos-item" v-if="info.refundAmount">
                  <view class="item-infos-item-left">退款金额：</view>
                  <view class="item-infos-item-right">
                     <text>¥115.00</text>
                     <text>¥{{((info.refundAmount || 0)/100).toFixed(2)}}</text>
                  </view>
               </view>
               <view class="item-infos-item">
               <view class="item-infos-item"  v-if="info.refundRemark">
                  <view class="item-infos-item-left">退款原因：</view>
                  <view class="item-infos-item-right">
                     <text>协商一致退款</text>
                     <text>{{info.refundRemark || ''}}</text>
                  </view>
               </view>
            </view>
         </view>
         <view style="width: 100%; height: calc(210rpx + env(safe-area-inset-bottom));"></view>
      </view>
      <view class="tips">
      <view class="tips" v-if="info.overdue">
         <image src="/static/icon/ic_waring@2x.png" mode="widthFix"></image>
         <text>已超过取件时间，超时费用：¥10.00</text>
      </view>
      <view class="footer">
         <text>已超过取件时间，超时费用：¥{{((info.overdueFee || 0)/100).toFixed(2)}}元</text>
      </view> 
      <view cclass="footer" v-if="info.type===0">
         <view class="footer-btns">
            <view class="btn kong">删除订单</view>
            <view class="btn you">评价订单</view>
            <view class="btn kong" @click="contactPhone(info,0)" v-if="info.status ===1 || info.status==2 || info.status===98">联系门店</view>
            <view class="btn kong" v-if="info.status ===0 || info.status ===1"  @click="cancelOrder(info)">取消订单</view>
            <view class="btn kong" @click="deleteOrder(info)" v-if="info.status ===7 || info.status===96 || info.status == 99">删除订单</view>
            <view class="btn you"  @click="payOrder(info)" v-if="info.status ===0">立即支付</view>
            <view class="btn you" v-if="info.status >=1 &&info.status <7 " @click="openQrcode(info)" >核销码</view>
            <view class="btn you" @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">评价订单</view>
         </view>
         <view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
      </view>
      <view class="footer" v-else>
         <view class="footer-btns">
            <view class="btn kong" @click="contactPhone(info,0)" v-if="info.status ===1 || info.status ==2">联系门店</view> 
            <view class="btn kong" @click="contactPhone(info,2)" v-if="info.status ===3 || info.status ===4 ">联系骑手</view>
            <view class="btn kong" @click="contactPhone(info,1)" v-if="info.status ===5">联系门店</view>
            <view class="btn kong" v-if="info.status ===0"  @click="cancelOrder(info)">取消订单</view>
            <view class="btn you" @click="payOrder(info)" v-if="info.status ===0">立即支付</view>
            <view class="btn kong" @click="deleteOrder(info)" v-if="info.status ===7 || info.status===96 || info.status == 99">删除订单</view>
            <view class="btn you" @click="cancelOrder(info)" v-if="info.status ===1">申请退款</view>
            <view class="btn you" v-if="info.status ===1 || (info.takeShopId && info.status ===5)" @click="openQrcode(info)" >核销码</view>
            <view class="btn you"  @click="doneOrder(info)"  v-if="!info.takeShopId && info.status ===5">确认收货</view>
            <view class="btn you"  @click="evaluateOrder(info)" v-if="info.status ===7 && !info.commentStatus ">评价订单</view>
         </view>
      </view>
      <u-popup :show="showPhone" round="15" mode="bottom" :safeAreaInsetBottom="true"  @close="contactPhone()" :closeable="true" :closeOnClickOverlay="true">
         <view class="phone">
            <view class="phone-head">
               <view></view>
               <text>联系客户</text> 
            </view>
             <view class="phone-item" >
                <view>
                  <image src="/static/icon/ic_call@2x.png" mode="widthFix" @click="contactPhoneDo()" ></image>
                  <text>{{linkinfo.linkname||''}} </text> 
                  <text style="margin-left: 10px;"> {{linkinfo.linkphone||''}}</text> 
               </view> 
             </view>  
             <view style="width: 100%; height: 30rpx;"></view>
         </view>
      </u-popup>
      <!-- 确认收货 -->
      <u-popup :show="showDone" round="15" :safeAreaInsetBottom="false" mode="center">
         <view class="tc">
            <view class="tc-contemt">
               <view class="tc-contemt-title">确认收货提醒</view>
               <view class="tc-contemt-nr">
                  您确认已经收到您的行李了吗？
               </view>
            </view>
            <view class="tc-btn">
               <view class="tc-btn-item" @click="showDone = false;currentOrder=null;">取消</view>
               <view class="tc-btn-item" style="color: #004096;" @click="doneOrderDo()">确认收货</view>
            </view>
         </view>
      </u-popup>
      <u-popup :show="showCancel" round="15" :safeAreaInsetBottom="false" mode="center">
         <view class="tc">
            <view class="tc-contemt">
               <view class="tc-contemt-title">确定取消提醒</view>
               <view class="tc-contemt-nr">
                  您确认取消该订单吗？
               </view>
            </view>
            <view class="tc-btn">
               <view class="tc-btn-item" @click="showCancel = false;currentOrder=null;">我再想想</view>
               <view class="tc-btn-item" style="color: red;" @click="cancelOrderDo">确认取消</view>
            </view>
         </view>
      </u-popup>
      <!-- 删除订单 -->
      <u-popup :show="showDelete" round="15" :safeAreaInsetBottom="false" mode="center">
         <view class="tc">
            <view class="tc-contemt">
               <view class="tc-contemt-title">确认删除提醒</view>
               <view class="tc-contemt-nr">
                  您确认删除该订单吗？
               </view>
            </view>
            <view class="tc-btn">
               <view class="tc-btn-item" @click="showDelete = false;currentOrder=null;">我再想想</view>
               <view class="tc-btn-item" style="color: red;" @click="deleteOrderDo">确认删除</view>
            </view>
         </view>
      </u-popup>
      <u-popup :show="showQrcode" round="15" @close="openQrcode()"   :safeAreaInsetBottom="false" mode="bottom"  :closeable="true" :closeOnClickOverlay="false">
         <view class="tc" style="height: 700rpx;width: 100%; ">
            <view class="tc-contemt" style="text-align: center;">
               <view class="tc-contemt-title" style="text-align: center;">核销码</view>
               <view class="qrcode-box">
                  <canvas canvas-id="qrcodeCanvas" id="qrcodeCanvas" style="width: 100px; height: 100px;"></canvas>
                  <image class="qrcode-image" :src="qrcodeImage" mode="widthFix"></image>
               </view>
               <text class="pickup-code">{{ currentOrder.memberVerifyCode||'' }}</text>
               <text class="pickup-tip" @tap="copyCode">点击复制自提码</text>
            </view>
         </view>
      </u-popup>
   </view>
</template>

@@ -214,11 +286,172 @@
      },
      data() {
         return {
				
            id:null,
            info:{},
            showDone:false,
            showCancel:false,
            showDelete:false,
            showQrcode:false,
            showPay:false,
            showPhone:false
         }
      },
      methods: {
			
      onShow() {
         this.info={}
         this.showDone=false
         this.showCancel=false
         this.showDelete=false
         this.showQrcode=false
         this.showPay=false
         this.showPhone=false
         this.getUserDetail() 
      },
      onLoad(options) {
         this.id = options.id
      },
      methods:{
         previewImage(images,index = 0) {
            uni.previewImage({
               current: index, 
               urls: images  
            });
         },
         payOrder(){
            var that = this;
            uni.showLoading({ title: '发起支付中...', mask: true })
            this.$u.api.continuePayOrder({
               orderId: this.id
            }).then(res => {
               uni.hideLoading()
               if (res.code === 200 && res.data) {
                  let paymentData = res.data.response
                  uni.requestPayment({
                     provider: 'wxpay',
                     timeStamp: paymentData.timeStamp || '',
                     nonceStr: paymentData.nonceStr || '',
                     package: paymentData.package || '',
                     signType: paymentData.signType || 'MD5',
                     paySign: paymentData.paySign || '',
                     success: (res) => {
                        that.getUserDetail()
                     },
                     fail: (err) => {
                        if (err.errMsg.includes('cancel')) {
                           uni.showToast({ title: '已取消支付', icon: 'none' })
                        } else {
                           uni.showToast({ title: '支付失败', icon: 'none' })
                        }
                     }
                  })
               } else {
                  uni.showToast({ title: res.msg || '支付失败', icon: 'none' })
               }
            }).catch(err => {
               uni.hideLoading()
               uni.showToast({ title: '支付失败', icon: 'none' })
            })
         },
         doneOrder(item){
            this.showDone = !this.showDone
         },
         async  doneOrderDo(){
            var that =this
            let res = await this.$u.api.confirmReceipt({ orderId: this.id  });
            if (res.code === 200 ) { 
               that.showDone = false
               that.getUserDetail()
            } 
         },
         contactPhone(){
             this.showPhone = !this.showPhone
         },
         contactPhoneDo(){ 
            if(this.info.linkphone !=null && this.info.linkphone!=''){
               uni.makePhoneCall({
                  phoneNumber: this.info.linkphone  
               })
            }
         },
         cancelOrder(item){
            this.showCancel = !this.showCancel
         },
         deleteOrder(item){
            this.showDelete = !this.showDelete
         },
         async cancelOrderDo(){
            var that =this
            let res = await that.$u.api.cancelOrder({ orderId: this.id });
            if (res.code === 200 ) { 
               this.showCancel = false
               uni.$emit('updateOrder',{info:this.info,delete:0})
            } 
         },
         async deleteOrderDo(){
            if( this.currentOrder==null || this.currentOrder.id == null) {
               return
            }
            var that =this
            let res = await that.$u.api.deleteOrder({ orderId: this.currentOrder.id  });
            if (res.code === 200 ) { 
               this.showDelete = false
               uni.$emit('updateOrder',{info:this.info,delete:1})
               this.goBack()
            } 
         },
         copyCode() {
            if (!this.currentOrder || !this.info.memberVerifyCode) {
               return
            }
            uni.setClipboardData({
               data: this.info.memberVerifyCode,
               success: () => {
                  uni.showToast({
                     title: '已复制自提码',
                     icon: 'none'
                  })
               }
            })
         },
         async openQrcode(){
            this.qrcodeImage=null
            var that =this
            if(!this.showQrcode){
               this.showQrcode =true
               drawQrcode({
                  canvasId: 'qrcodeCanvas',
                  text: this.info.memberVerifyCode,
                  width: 100,
                  height: 100,
                  correctLevel: 2
               })
               setTimeout(() => {
                  uni.canvasToTempFilePath({
                     canvasId: 'qrcodeCanvas',
                     success: (res) => {
                        that.qrcodeImage = res.tempFilePath
                     }
                  }, this)
               }, 100)
            }else{
               this.showQrcode = false
            }
         },
         evaluateOrder(){
            uni.navigateTo({
               url:"/pages/evaluate/evaluate?id="+this.info.id
            })
         },
         goBack(){
            uni.navigateBack({delta:-1})
         },
         async  getUserDetail(){
            var that =this 
            let res = await this.$u.api.getOrderDetail( this.id  )
            if (res.code === 200) { 
               this.info = res.data 
               uni.$emit('updateOrder',{info:this.info,delete:0})
            } 
         }
      }
   }
</script>
@@ -292,9 +525,14 @@
            }
         }
      }
      .head0{
         background: #1ba8fa;
      }
      .head1{
         background: #E4730B;
      }
      .head {
         width: 100%;
         background: #E4730B;
         padding: 0 30rpx;
         box-sizing: border-box;
         position: fixed;
@@ -322,7 +560,7 @@
         height: 264rpx;
         padding: 22rpx 30rpx;
         box-sizing: border-box;
         background-color: #E4730B;
         // background-color: #E4730B;
         .nr-status {
            display: flex;
            align-items: baseline;
@@ -333,7 +571,7 @@
               margin-right: 16rpx;
            }
            .nr-status-type {
               width: 64rpx;
               width: 164rpx;
               height: 38rpx;
               display: flex;
               align-items: center;
@@ -345,7 +583,7 @@
               color: #FA8010;
            }
            .nr-status-type1 {
               width: 88rpx;
               width: 188rpx;
               height: 38rpx;
               display: flex;
               align-items: center;