支付宝支付ddd

doum

4 天以前 069a551ee29c0340fe9d16492a2213ee53bd15da

支付宝支付ddd

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

@@ -13,10 +13,12 @@
            <view class="nr-status">
                <text>{{info.statusName|| ''}}</text>
                <view class="nr-status-type1" v-if="info.type === 0">就地寄存</view>
                <view class="nr-status-type" v-else>同城寄送</view>
                <view class="nr-status-type"  v-if="info.type === 1">同城寄送</view>
                <view class="nr-status-type1"  v-if="info.type === 1 && info.isUrgent === 0">标速达</view>
                <view class="nr-status-type1"  v-if="info.type === 1 && info.isUrgent === 1">极速达</view>
            </view>
            <view class="nr-desc" v-if="info.statusDesc">{{info.statusDesc || ''}}</view>
            <view class="item" style="padding: 10rpx;">
            <view class="item" style="padding: 10rpx;" v-if="info.type ===1 && info.status===4">
                <map name="mapAddr"></map>
            </view>
            <view class="item">
@@ -30,7 +32,7 @@
                        </view>
                        <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
                    </view>
                    <view class="addr-item">
                    <view class="addr-item" v-if="info.type === 1">
                        <view class="ji bg1">收</view>
                        <view class="addr-item-top">
                            <text>{{info.takeShopName || info.takeLocation || ''}}</text>
@@ -39,10 +41,14 @@
                        <text>{{info.takeUser || ''}} {{info.takePhone || ''}}</text>
                    </view>
                </view>
                <view class="item-qrcode">
                    <image src="/static/image/btn_upload@2x.png" mode="widthFix"></image>
                <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> -->
                    </view>
                    <text>{{info.memberVerifyCode || ''}}</text>
                    <text>取件码</text>
                    <text @tap="copyCode(info.memberVerifyCode||'')">核销码</text>
                </view>
                <view class="item-x"></view>
                <view class="item-list">
@@ -56,32 +62,65 @@
                    </view>
                    <view class="item-list-row">
                        <view class="item-form-label">物品名称</view>
                        <view class="item-form-val">{{info.typeName || ''}}</view>
                        <view class="item-form-val">{{info.goodTypeName || ''}}</view>
                    </view>
                    <view class="item-list-row">
                        <view class="item-form-label">物品照片</view>
                        <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>
                    </view>
                </view>
            </view>
            <view class="item">
            <view class="item" v-if="info.refundInfo">
                <view class="tuikuan">
                    <view class="tuikuan-top">
                        <text>退款金额</text>
                        <text>¥{{((info.refundAmount || 0)/100).toFixed(2)}}</text>
                        <text>¥{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
                    </view>
                    <view class="tuikuan-bottom">
                        <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>
                        <text v-if="info.refundInfo.status === 0">退款中</text>
                        <text v-if="info.refundInfo.status  === 1">已退回您的支付账户</text>
                        <text v-if="info.refundInfo.status  === 2">退款失败</text>
                        <text v-if="info.refundInfo.status  === 1">{{info.refundInfo.refundTime || ''}}</text>
                        <text v-if="info.refundInfo.status  !== 1">{{info.refundInfo.createTime || ''}}</text>
                    </view>
                </view>
            </view>
            <view class="item" v-if="info.commentStatus === 1">
                <view class="comment">
                    <view class="comment-top">
                        <text>客户已评价：</text>
                    </view>
                    <view class="comment-score">
                        <view class="score-item" v-if="info.depositScore">寄件门店: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">★</text>{{info.depositScore || 1}} </view>
                        <view class="score-item"  v-if="info.driverScore">配送司机: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">★</text>{{info.driverScore || 1}} </view>
                        <view  class="score-item" v-if="info.takeScore">收件门店: <text style="color:#ffc533;font-size: 38rpx;margin-right: 10rpx;">★</text>{{info.takeScore || 1}} </view>
                    </view>
                    <view class="comment-row" v-if="info.commentImages && info.commentImages.length" >
                        <view class="comment-image"  v-for="(item,index) in info.commentImages" key="item">
                            <image :src="item" mode="widthFix" @click="previewImage(info.commentImages,index)"></image>
                        </view> 
                    </view>
                </view>
            </view>
            <view class="item" v-if="info.refundInfo">
                <view class="tuikuan">
                    <view class="tuikuan-top">
                        <text>退款金额</text>
                        <text>¥{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
                    </view>
                    <view class="tuikuan-bottom">
                        <text v-if="info.refundInfo.status === 0">退款中</text>
                        <text v-if="info.refundInfo.status  === 1">已退回您的支付账户</text>
                        <text v-if="info.refundInfo.status  === 2">退款失败</text>
                        <text v-if="info.refundInfo.status  === 1">{{info.refundInfo.refundTime || ''}}</text>
                        <text v-if="info.refundInfo.status  !== 1">{{info.refundInfo.createTime || ''}}</text>
                    </view>
                </view>
            </view>			
            <view class="item" v-if="info.detailList">
                <view class="xl">
                    <view v-for="goods in info.detailList " :key="goods.luggageName" class="xl-item">
@@ -118,7 +157,7 @@
                        <view class="item-infos-item-left">订单编号：</view>
                        <view class="item-infos-item-right">
                            <text>{{info.code ||''}}</text>
                            <image src="/static/icon/ic_cppy@2x.png" mode="widthFix"></image>
                            <image src="/static/icon/ic_cppy@2x.png" mode="widthFix" @tap="copyCode(info.code||'')"></image>
                        </view>
                    </view>
                    <view class="item-infos-item">
@@ -140,7 +179,7 @@
                        </view>
                    </view>
                    <view class="item-infos-item" v-if="info.outTradeNo">
                        <view class="item-infos-item-left">交易号：</view>
                        <view class="item-infos-item-left">交易单号：</view>
                        <view class="item-infos-item-right">
                            <text>{{info.outTradeNo || ''}}</text>
                        </view>
@@ -157,37 +196,40 @@
                            <text>{{info.refundTime || ''}}</text>
                        </view>
                    </view>
                    <view class="item-infos-item" v-if="info.refundAmount">
                    <view class="item-infos-item" v-if="info.refundInfo">
                        <view class="item-infos-item-left">退款金额：</view>
                        <view class="item-infos-item-right">
                            <text>¥{{((info.refundAmount || 0)/100).toFixed(2)}}</text>
                            <text>¥{{((info.refundInfo.refundAmount || 0)/100).toFixed(2)}}</text>
                        </view>
                    </view>
                    <view class="item-infos-item"  v-if="info.refundRemark">
                        <view class="item-infos-item-left">退款原因：</view>
                        <view class="item-infos-item-right">
                            <text>{{info.refundRemark || ''}}</text>
                            <text>{{info.refundInfo.refundRemark || ''}}</text>
                        </view>
                    </view>
                </view>
            </view>
            <view style="width: 100%; height: calc(210rpx + env(safe-area-inset-bottom));"></view>
        </view>
        <view class="tips" v-if="info.overdue">
        <view class="tips" v-if="info.overdueStatus !==0">
            <image src="/static/icon/ic_waring@2x.png" mode="widthFix"></image>
            <text>已超过取件时间，超时费用：¥{{((info.overdueFee || 0)/100).toFixed(2)}}元</text>
            <text  v-if="info.overdueStatus ===1">已超过取件时间，已产生超时费用：¥{{((info.overdueFee || 0)/100).toFixed(2)}}元</text> 
            <text  v-if="info.overdueStatus ===2">已超过取件时间，需要支付超时费用：¥{{((info.overdueFee || 0)/100).toFixed(2)}}元</text>
            <text  v-if="info.overdueStatus ===3">超过取件时间，已支付超时费用：¥{{((info.overdueFee || 0)/100).toFixed(2)}}元</text>
        </view> 
        <view cclass="footer" v-if="info.type===0">
        <view class="footer" v-if="info.type===0">
            <view class="footer-btns">
                <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 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 class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus===2 ">立即支付</view>
            </view>
        </view>
        <view class="footer" v-else>
        <view class="footer" v-if="info.type===1">
            <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>
@@ -196,22 +238,23 @@
                <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" 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 class="btn you" @click="payOrderFee(info)" v-if="info.status ===5 && info.overdueStatus ===2">立即支付</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> 
                    <text>{{linkItem.title}}</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  @click="contactPhoneDo()" >
                        <image src="/static/icon/ic_call@2x.png" mode="widthFix"></image>
                        <text>{{linkItem.linkname||''}} </text> 
                        <text style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text> 
                    </view> 
                 </view>  
                 <view style="width: 100%; height: 30rpx;"></view>
@@ -261,24 +304,25 @@
                </view>
            </view>
        </u-popup>
        <u-popup :show="showQrcode" round="15" @close="openQrcode()"   :safeAreaInsetBottom="false" mode="bottom"  :closeable="true" :closeOnClickOverlay="false">
        <!-- <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>
                        <canvas canvas-id="qrcodeCanvas1" id="qrcodeCanvas1" 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>
                    <text class="pickup-code">{{ info.memberVerifyCode||'' }}</text>
                    <text class="pickup-tip" @tap="copyCode(info.memberVerifyCode||'')">点击复制自提码</text>
                </view>
            </view>
        </u-popup>
        </u-popup> -->
    </view>
</template>

<script>
    import { mapState } from 'vuex'
    import drawQrcode from 'weapp-qrcode'

    export default {
        computed: {
@@ -293,7 +337,9 @@
                showDelete:false,
                showQrcode:false,
                showPay:false,
                showPhone:false
                showPhone:false,
                linkItem:{title:'',linkname:'',linkphone:''},
                qrcodeImage:null
            }
        },
        onShow() {
@@ -305,6 +351,7 @@
            this.showPay=false
            this.showPhone=false
            this.getUserDetail() 
            this.linkItem={title:'',linkname:'',linkphone:''}
        },
        onLoad(options) {
            this.id = options.id
@@ -351,6 +398,41 @@
                    uni.showToast({ title: '支付失败', icon: 'none' })
                })
            },
            payOrderFee(){
                var that = this;
                uni.showLoading({ title: '发起支付中...', mask: true })
                this.$u.api.payOverdueFee({
                    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
            },
@@ -362,13 +444,22 @@
                    that.getUserDetail()
                } 
            },
            contactPhone(){
            contactPhone(item,type){
                 this.showPhone = !this.showPhone
                 this.linkItem = {title:'联系骑手',linkname:'',linkphone:''}
                 if(type == 0){
                     this.linkItem = {title:'联系门店',linkname:this.info.depositShopName,linkphone:this.info.depositShopPhone}
                 }else if(type ==2){
                     this.linkItem = {title:'联系骑手',linkname:this.info.driverName,linkphone:this.info.driverPhone}
                 }else if(type ==1){
                     this.linkItem = {title:'联系门店',linkname:this.info.takeShopName,linkphone:this.info.takeShopPhone}
                 }
                  console.log("==================================",this.showPhone)
            },
            contactPhoneDo(){ 
                if(this.info.linkphone !=null && this.info.linkphone!=''){
                if(this.linkItem.linkphone !=null && this.linkItem.linkphone!=''){
                    uni.makePhoneCall({
                       phoneNumber: this.info.linkphone  
                       phoneNumber: this.linkItem.linkphone  
                    })
                }
            },
@@ -384,6 +475,7 @@
                if (res.code === 200 ) { 
                    this.showCancel = false
                    uni.$emit('updateOrder',{info:this.info,delete:0})
                    that.getUserDetail()
                } 
            },
            async deleteOrderDo(){
@@ -398,15 +490,15 @@
                    this.goBack()
                } 
            },
            copyCode() {
                if (!this.currentOrder || !this.info.memberVerifyCode) {
            copyCode(txt) {
                if (!txt) {
                    return
                }
                uni.setClipboardData({
                    data: this.info.memberVerifyCode,
                    data: txt,
                    success: () => {
                        uni.showToast({
                            title: '已复制自提码',
                            title: '已复制到粘贴板',
                            icon: 'none'
                        })
                    }
@@ -418,7 +510,7 @@
                if(!this.showQrcode){
                    this.showQrcode =true
                    drawQrcode({
                        canvasId: 'qrcodeCanvas',
                        canvasId: 'qrcodeCanvas1',
                        text: this.info.memberVerifyCode,
                        width: 100,
                        height: 100,
@@ -436,6 +528,32 @@
                    this.showQrcode = false
                }
            },
            async 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)))){
                    if(this.qrcodeImage){
                        return
                    }
                    this.qrcodeImage=null
                    var that =this
                    drawQrcode({
                        canvasId: 'qrcodeCanvas',
                        text: this.info.memberVerifyCode,
                        width: 180,
                        height: 180,
                        correctLevel: 2
                    })
                    setTimeout(() => {
                        uni.canvasToTempFilePath({
                            canvasId: 'qrcodeCanvas',
                            success: (res) => {
                                that.qrcodeImage = res.tempFilePath
                            }
                        }, this)
                    }, 100)
                }
				 
            },
            evaluateOrder(){
                uni.navigateTo({
                    url:"/pages/evaluate/evaluate?id="+this.info.id
@@ -450,6 +568,7 @@
                if (res.code === 200) { 
                    this.info = res.data 
                    uni.$emit('updateOrder',{info:this.info,delete:0})
                    this.showQrcodeImg()
                } 
            }
        }
@@ -470,7 +589,7 @@
            box-sizing: border-box;
            background: #FFE9E9;
            position: fixed;
            bottom: calc(100rpx + env(safe-area-inset-bottom));
            bottom: calc(30rpx + env(safe-area-inset-bottom));
            left: 0;
            display: flex;
            align-items: center;
@@ -571,7 +690,7 @@
                    margin-right: 16rpx;
                }
                .nr-status-type {
                    width: 164rpx;
                    width: 154rpx;
                    height: 38rpx;
                    display: flex;
                    align-items: center;
@@ -583,7 +702,7 @@
                    color: #FA8010;
                }
                .nr-status-type1 {
                    width: 188rpx;
                    width: 158rpx;
                    height: 38rpx;
                    display: flex;
                    align-items: center;
@@ -708,6 +827,63 @@
                        }
                    }
                }
                .comment{
                    width: 100%;
                    display: flex;
                    flex-direction: column;
                    .comment-top {
                        width: 100%;
                        display: flex;
                        align-items: center;
                        justify-content: space-between;
                        text {
                            &:nth-child(1) {
                                font-weight: 600;
                                font-size: 30rpx;
                                color: #222222;
                            }
                            &:nth-child(2) {
                                font-weight: 500;
                                font-size: 36rpx;
                                color: #FE2C2E;
                                &:before {
                                    content: "￥";
                                    font-weight: 500;
                                    font-size: 24rpx;
                                    color: #FE2C2E;
                                }
                            }
                        }
                    }
                    .comment-score{
                        // font-weight: 600;
                        font-size: 28rpx;
                        color: #333333;
                        margin: 10rpx 0;
                        display: flex;
                        width: 100%;
                        .score-item{
                            flex:1;
                            margin: 20rpx 0;
                        }
                    }
                    .comment-row{
                        display: flex;
                        flex-wrap: wrap;
                        .comment-image {
                            margin: 10rpx;
                            width: 100rpx;
                            height: 100rpx;
                            border-radius: 8rpx;
                            border:1px solid #f2f2f2;
                            overflow: hidden;
                            image {
                                width: 100%;
                            }
                        }
                    }
					
                }
                .tuikuan {
                    width: 100%;
                    display: flex;

 small-program/pages/evaluate/evaluate.vue

@@ -197,9 +197,10 @@
                        })
                        try {
                            const uploadResults = await that.uploadFiles(tempFilePaths, maxCount)
                            const addrs = uploadResults.map(item => item.imgaddr)
                            const fullPaths = uploadResults.map(item => item.url || item.path || item)
                            that.photoList = [...that.photoList, ...fullPaths.map(url => ({ url }))]
                            that.form.images = [...that.form.images, ...fullPaths]
                            that.form.images = [...that.form.images, ...addrs]
                            uni.hideLoading()
                            uni.showToast({
                                title: '上传成功',

 small-program/pages/itinerary/itinerary.vue

@@ -88,7 +88,7 @@

                    <view class="card-footer">
                        <view class="footer-actions" v-if="item.type===0">
                            <view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 || item.status==2 || item.status===98">联系门店</view>
                            <view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 ||item.status ===5 || item.status==2 || item.status===98">联系门店</view>
                             <view class="footer-btn contact-btn" v-if="item.status ===0 || item.status ===1"  @click="cancelOrder(item)">取消订单</view>
                            <view class="footer-btn contact-btn" @click="deleteOrder(item)" v-if="item.status ===7 || item.status===96 || item.status == 99">删除订单</view>
                            <view class="footer-btn primary-btn"  @click="payOrder(item)" v-if="item.status ===0">立即支付</view>
@@ -119,7 +119,7 @@
            <view class="phone">
                <view class="phone-head">
                    <view></view>
                    <text>联系客户</text> 
                    <text>{{linkItem.title}}</text> 
                </view>
                <!-- <view class="phone-item">
                    <view>
@@ -129,10 +129,10 @@
                     <view class="line" v-if="serverPhone && serverPhone.length"></view>
                </view> -->
                 <view class="phone-item" >
                     <view>
                        <image src="/static/icon/ic_call@2x.png" mode="widthFix" @click="contactPhoneDo()" ></image>
                        <text>{{linkItem.linkname||''}} </text> 
                        <text style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text> 
                     <view @click="contactPhoneDo()">
                        <image src="/static/icon/ic_call@2x.png" mode="widthFix"  ></image>
                        <text  >{{linkItem.linkname||''}} </text> 
                        <text  style="margin-left: 10px;"> {{linkItem.linkphone||''}}</text> 
                    </view> 
                 </view>  
                 <view style="width: 100%; height: 30rpx;"></view>
@@ -226,6 +226,8 @@
                qrcodeImage:null,
                isLoadingMore: false,
                currentOrder:null,
                contanctType:0,
                linkItem:{title:'',linkname:'',linkphone:''},
                filterTabs: [
                    { label: '全部'  ,value: -1},
                    { label: '待支付',value: 0 },
@@ -246,10 +248,9 @@
        onLoad(options) {
            console.log(options )
            this.activeTab = -1
            if (options.status) {
            if (options.status != null && options.status != undefined) {
                this.activeTab =  Number(options.status)
            }
            this.getFirstPageData()
            var that =this
            uni.$on('updateOrder',function(data){
                console.log('监听到事件来自 update ，携带参数 msg 为：' ,data);
@@ -275,9 +276,18 @@
            this.showDelete=false
            this.showQrcode=false
            this.showPay=false
            this.contanctType =0
            this.showPhone=false
            this.loading=false
            this.currentOrder=null
            this.linkItem={title:'',linkname:'',linkphone:''}
            var orderStatus = uni.getStorageSync("orderStatus");
            console.log(orderStatus,"==================")
            if (orderStatus != null &&orderStatus != undefined) {
                this.activeTab =  Number(orderStatus)
            }
            uni.clearStorageSync("orderStatus")
            // this.getFirstPageData()
        },
        onReachBottom(){
            this.getDataList();
@@ -337,10 +347,20 @@
                    that.showDone()
                } 
            },
            contactPhone(item){
            contactPhone(item,type){
                 this.showPhone = !this.showPhone
                 this.linkItem = item ||{}
                this.linkItem = {title:'',linkname:'',linkphone:''}
                 console.log("==================================",this.showPhone)
                 if(!item){
                     return
                 }
                if(type == 0){
                    this.linkItem = {title:'联系门店',linkname:item.depositShopName,linkphone:item.depositShopPhone}
                }else if(type ==2){
                    this.linkItem = {title:'联系骑手',linkname:item.driverName,linkphone:item.driverPhone}
                }else if(type ==1){
                    this.linkItem = {title:'联系门店',linkname:item.takeShopName,linkphone:item.takeShopPhone}
                }
            },
            contactPhoneDo(){ 
                if(this.linkItem.linkphone !=null && this.linkItem.linkphone!=''){
@@ -685,6 +705,7 @@
        display: block;
        white-space: nowrap;
        overflow: hidden;
        text-align: center;
        text-overflow: ellipsis;
        max-width: 100%;  
    }

 small-program/pages/luggage-storage/luggage-storage.vue

@@ -557,9 +557,10 @@
                        })
                        try {
                            const uploadResults = await this.uploadFiles(tempFilePaths, maxCount)
                            const addrs = uploadResults.map(item => item.imgaddr)
                            const fullPaths = uploadResults.map(item => item.url || item.path || item)
                            this.uploadedImages = [...this.uploadedImages, ...fullPaths.map(url => ({ url }))]
                            this.form.goodsImages = [...this.form.goodsImages, ...fullPaths]
                            this.form.goodsImages = [...this.form.goodsImages, ...addrs]
                            uni.hideLoading()
                            uni.showToast({
                                title: '上传成功',

 small-program/pages/mine/mine.vue

@@ -26,13 +26,13 @@
                <view class="order-card section-card">
                    <view class="section-head">
                        <text class="section-title">我的订单</text>
                        <view class="more-wrap" @click="toAllOrders">
                        <view class="more-wrap" @click="toOrderDetail(-1)">
                            <text class="more-text">全部订单</text>
                            <u-icon name="arrow-right" size="13" color="#999999"></u-icon>
                        </view>
                    </view>
                    <view class="order-grid">
                        <view v-for="(item, index) in orderMenus" :key="index" class="order-item" @click="toOrderDetail(item.label)">
                        <view v-for="(item, index) in orderMenus" :key="index" class="order-item" @click="toOrderDetail(item.status)">
                            <image class="order-icon" :src="item.url" mode="widthFix"></image>
                            <view v-if="item.badge" class="order-badge">{{ item.badge }}</view>
                            <text class="order-label">{{ item.label }}</text>
@@ -83,9 +83,9 @@
            agreeChecked: true,
            userName: '',
            orderMenus: [
                { label: '待支付', url: '/static/icon/mine_ic_daifukuan@2x.png', badge: 0 },
                { label: '待收货', url: '/static/icon/mine_ic_daishouhuo@2x.png', badge: 0 },
                { label: '退款/售后', url: '/static/icon/mine_ic_tuikuan@2x.png', badge: 0 }
                { label: '待支付', url: '/static/icon/mine_ic_daifukuan@2x.png', badge: 0,status:0 },
                { label: '待收货', url: '/static/icon/mine_ic_daishouhuo@2x.png', badge: 0,status:3 },
                { label: '退款/售后', url: '/static/icon/mine_ic_tuikuan@2x.png', badge: 0 ,status:5}
            ],
            menuList: [
                { label: '门店入驻' },
@@ -121,8 +121,8 @@
            this.showAuthLogin = true
        },
        toAllOrders() {
            uni.navigateTo({
                url: '/pages/orders/orders'
            uni.switchTab({
                url: '/pages/itinerary/itinerary'
            })
        },
        handleMenuClick(item) {
@@ -145,8 +145,9 @@
            }
        },
        toOrderDetail(label) {
            uni.navigateTo({
                url: '/pages/orders/orders?status=' + label
            uni.setStorageSync("orderStatus",label)
            uni.switchTab({
                url: '/pages/itinerary/itinerary?status=' + label
            })
        },
        toSetting() {

 small-program/pages/payment-success/payment-success.vue

@@ -16,13 +16,13 @@
            </view>

            <view class="pickup-card">
                <text class="pickup-title">自提码</text>
                <text class="pickup-title">核销码</text>
                <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">{{ orderDetail.memberVerifyCode }}</text>
                <text class="pickup-tip" @tap="copyCode">点击复制自提码</text>
                <text class="pickup-tip" @tap="copyCode">点击复制核销码</text>
            </view>
        </view>
    </view>
@@ -79,8 +79,8 @@
                })
            },
            viewOrder() {
                uni.redirectTo({
                    url: '/pages/itinerary/itinerary?orderId=' + this.orderId
                uni.navigateTo({
                    url:'/pages/delivery-order-detail/delivery-order-detail?userType=0&id='+this.orderId
                })
            },
            copyCode() {
@@ -96,7 +96,7 @@
                        })
                    }
                })
            }
            } 
        }
    }
</script>

 small-program/utils/http.api.js

@@ -47,8 +47,10 @@
    let confirmReceipt = (data = {}) => vm.$u.http.post('web/order/confirmReceipt/'+data.orderId, data);    // 会员确认收货 
    let continuePayOrder = (data = {}) => vm.$u.http.post('web/order/continuePay/'+data.orderId, data);    //继续发起支付
    let orderComment = (data = {}) => vm.$u.http.post('web/order/comment', data);    //订单评价
    let payOverdueFee = (data = {}) => vm.$u.http.post('web/order/payOverdueFee/'+data.orderId, data);    //继续发起支付
    
    vm.$u.api = {
        payOverdueFee,
        orderComment, 
        confirmReceipt,
        cancelOrder,