From 2b9cd0d9c50fae99402da7857addfe643fcbc6d8 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 23 四月 2026 20:05:42 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/pages/delivery-order-detail/delivery-order-detail.vue | 398 ++++++++++++++++++++++++++++-------
small-program/pages/evaluate/evaluate.vue | 192 ++++++++++++++---
small-program/pages/itinerary/itinerary.vue | 27 +
small-program/utils/http.api.js | 2
4 files changed, 495 insertions(+), 124 deletions(-)
diff --git a/small-program/pages/delivery-order-detail/delivery-order-detail.vue b/small-program/pages/delivery-order-detail/delivery-order-detail.vue
index c87f17d..94c2c3f 100644
--- a/small-program/pages/delivery-order-detail/delivery-order-detail.vue
+++ b/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>瀹夊窘鐪佸悎鑲ュ競铚�灞卞尯鑾茶姳绉戞妧浜т笟鍥璅401</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>瀹夊窘鐪佸悎鑲ュ競铚�灞卞尯鑾茶姳绉戞妧浜т笟鍥璅401</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;
diff --git a/small-program/pages/evaluate/evaluate.vue b/small-program/pages/evaluate/evaluate.vue
index 3dc8bb9..f5d9049 100644
--- a/small-program/pages/evaluate/evaluate.vue
+++ b/small-program/pages/evaluate/evaluate.vue
@@ -4,20 +4,19 @@
<view class="rate-block">
<view class="title-row">
<text class="title-label">瀵勪欢闂ㄥ簵锛�</text>
- <text class="title-value">涓搧蹇繍鍗楃珯鏃楄埌搴�</text>
+ <text class="title-value">{{info.depositShopName||''}}</text>
</view>
<view class="star-row">
<view class="star-list">
- <!-- <view
+ <view
v-for="n in 5"
:key="'shop-' + n"
class="star-item"
- :class="{ active: n <= shopRate, dashed: n === 1 || n === 3 }"
- @tap="shopRate = n"
- >鈽�</view> -->
- <u-rate :count="count" activeColor="#FFC331" v-model="value"></u-rate>
+ :class="{ active: n < form.depositScore, dashed: n === 1 || n === 3 }"
+ @tap="form.depositScore = n+1"
+ >鈽�</view>
</view>
- <text class="rate-text">{{ shopRate }}鏄�</text>
+ <text class="rate-text">{{ form.depositScore }}鏄�</text>
</view>
</view>
@@ -26,67 +25,67 @@
<view class="rate-block">
<view class="title-row">
<text class="title-label">閰嶉�佸徃鏈猴細</text>
- <text class="title-value">寮犱紵</text>
+ <text class="title-value">{{info.driverName || ''}}</text>
</view>
- <view class="star-row no-text-row">
+ <view class="star-row">
<view class="star-list">
- <!-- <view
+ <view
v-for="n in 5"
:key="'driver-' + n"
class="star-item"
- :class="{ active: n <= driverRate, dashed: n === 1 }"
- @tap="driverRate = n"
- >鈽�</view> -->
- <u-rate :count="count" activeColor="#FFC331" v-model="value"></u-rate>
+ :class="{ active: n < form.driverScore, dashed: n === 1 }"
+ @tap=" form.driverScore = n+1"
+ >鈽�</view>
</view>
+ <text class="rate-text">{{ form.driverScore }}鏄�</text>
</view>
</view>
<view class="divider"></view>
- <view class="rate-block">
+ <view class="rate-block" v-if="info.type ===1 && info.takeShopId ">
<view class="title-row">
<text class="title-label">鏀朵欢闂ㄥ簵锛�</text>
- <text class="title-value">涓搧蹇繍鍚堣偉绔欐棗鑸板簵</text>
+ <text class="title-value">{{info.takeShopName || 0}}</text>
</view>
- <view class="star-row no-text-row">
+ <view class="star-row">
<view class="star-list">
- <!-- <view
+ <view
v-for="n in 5"
:key="'receive-' + n"
class="star-item"
- :class="{ active: n <= receiveRate, dashed: n === 1 }"
- @tap="receiveRate = n"
- >鈽�</view> -->
- <u-rate :count="count" activeColor="#FFC331" v-model="value"></u-rate>
+ :class="{ active: n < form.takeScore, dashed: n === 1 }"
+ @tap="form.takeScore = n+1"
+ >鈽�</view>
</view>
+ <text class="rate-text">{{ form.takeScore }}鏄�</text>
</view>
</view>
<view class="divider"></view>
<view class="upload-row">
- <view class="upload-box">
+ <view class="upload-box" @click="chooseAndUploadImage(9)">
<view class="upload-plus">+</view>
<text class="upload-text">涓婁紶鐓х墖</text>
</view>
<view v-for="(item, index) in photoList" :key="index" class="photo-box">
- <image class="photo-image" :src="item" mode="aspectFill"></image>
- <text class="photo-delete">鍒犻櫎</text>
+ <image class="photo-image" :src="item.url" mode="aspectFill"></image>
+ <text class="photo-delete" @click="deleteImage(index)">鍒犻櫎</text>
</view>
</view>
<view class="textarea-box">
<view class="textarea-placeholder-wrap">
<view class="textarea-icon"></view>
- <textarea v-model="content" class="textarea" maxlength="200" placeholder="璇疯璇存偍瀵规湰娆℃湇鍔＄殑鎰熷彈" placeholder-class="textarea-placeholder"></textarea>
+ <textarea v-model="form.content" class="textarea" maxlength="200" placeholder="璇疯璇存偍瀵规湰娆℃湇鍔＄殑鎰熷彈" placeholder-class="textarea-placeholder"></textarea>
</view>
- <text class="textarea-count">{{ content.length }}/200</text>
+ <text class="textarea-count">{{ form.content.length }}/200</text>
</view>
</view>
<view class="submit-wrap">
- <view class="submit-btn">鎻愪氦璇勪环</view>
+ <view class="submit-btn" @click="orderComment">鎻愪氦璇勪环</view>
</view>
</view>
</template>
@@ -95,16 +94,139 @@
export default {
data() {
return {
- shopRate: 2,
- driverRate: 0,
- receiveRate: 0,
- content: '',
+ id:null,
+ info:{},
+ form:{
+ content: "",
+ depositScore: 5,
+ driverScore: 5,
+ orderId: null,
+ takeScore: 5,
+ fileList:[]
+ },
photoList: [
'/static/icon/nav_home_sel@2x.png',
'/static/icon/nav_xingcheng_sel@2x.png'
- ],
- count: 5,
- value: 2
+ ]
+ }
+ },
+ onShow() {
+ this.info={}
+ this.getUserDetail()
+ },
+ onLoad(options) {
+ this.id = options.id
+ this.photoList=[]
+ this.form={
+ content: "",
+ depositScore: 5,
+ driverScore: 5,
+ orderId: this.id,
+ takeScore: 5,
+ images:[]
+ }
+ },
+ methods:{
+ deleteImage(index) {
+ this.photoList.splice(index, 1)
+ this.form.images.splice(index, 1)
+ },
+ async uploadFiles(filePaths, maxCount = 9) {
+ if (!filePaths || filePaths.length === 0) {
+ return []
+ }
+ const limitedPaths = filePaths.slice(0, maxCount)
+ const uploadTasks = limitedPaths.map(filePath => {
+ return new Promise((resolve, reject) => {
+ uni.uploadFile({
+ url: this.$baseUrl + '/web/public/upload',
+ filePath: filePath,
+ name: 'file',
+ formData: {
+ folder: 'orders'
+ },
+ success: (res) => {
+ if (res.statusCode === 200) {
+ const data = JSON.parse(res.data)
+ if (data.code === 200) {
+ resolve(data.data)
+ } else {
+ reject(new Error(data.msg || '涓婁紶澶辫触'))
+ }
+ } else {
+ reject(new Error('涓婁紶澶辫触'))
+ }
+ },
+ fail: (err) => {
+ reject(err)
+ }
+ })
+ })
+ })
+ try {
+ const results = await Promise.all(uploadTasks)
+ return results
+ } catch (error) {
+ uni.showToast({
+ title: '涓婁紶澶辫触',
+ icon: 'none'
+ })
+ throw error
+ }
+ },
+ async chooseAndUploadImage(maxCount = 9) {
+ const currentCount = this.form.images.length
+ const remainingCount = maxCount - currentCount
+ if (remainingCount <= 0) {
+ uni.showToast({
+ title: `鏈�澶氫笂浼�${maxCount}寮犲浘鐗嘸,
+ icon: 'none'
+ })
+ return
+ }
+ var that = this
+ uni.chooseImage({
+ count: remainingCount,
+ sizeType: ['compressed'],
+ sourceType: ['album', 'camera'],
+ success: async (res) => {
+ const tempFilePaths = res.tempFilePaths
+ uni.showLoading({
+ title: '涓婁紶涓�...',
+ mask: true
+ })
+ try {
+ const uploadResults = await that.uploadFiles(tempFilePaths, maxCount)
+ 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]
+ uni.hideLoading()
+ uni.showToast({
+ title: '涓婁紶鎴愬姛',
+ icon: 'success'
+ })
+ } catch (error) {
+ uni.hideLoading()
+ }
+ }
+ })
+ },
+ async orderComment(){
+ var that =this
+ let res = await that.$u.api.orderComment(this.form);
+ if (res.code === 200 ) {
+ this.info.commentStatus == 1
+ uni.$emit('updateOrder',{info:this.info,delete:0})
+ 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})
+ }
}
}
}
diff --git a/small-program/pages/itinerary/itinerary.vue b/small-program/pages/itinerary/itinerary.vue
index 3db4fcb..45bf1f8 100644
--- a/small-program/pages/itinerary/itinerary.vue
+++ b/small-program/pages/itinerary/itinerary.vue
@@ -26,7 +26,7 @@
<view class="content-wrap">
<view class="page-padding card-list">
<view v-for="(item, index) in dataList" :key="item.id" class="order-card">
- <view class="order-head" :class="item.mode === 'city' ? 'city-head-bg' : 'local-head-bg'">
+ <view class="order-head" :class="item.mode === 'city' ? 'city-head-bg' : 'local-head-bg'" @click="jumpOrderDetail(item.id)">
<view v-if="item.type === 0" class="head-local">
<view class="mode-tag local-tag">灏卞湴瀵勫瓨</view>
<view class="head-copy single-copy">
@@ -34,7 +34,7 @@
<text class="head-user">{{ item.takeUser ||'' }}</text>
</view>
<text v-if="item.status < 7" class=" status-text status-orange">{{ item.statusName||'' }}</text>
- <text v-else-if="item.status ===7" class=" status-text">{{ item.statusName||'' }}</text>
+ <text v-else-if="item.status ===7" class=" status-text status-grey">{{ item.statusName||'' }}</text>
<text v-else-if="item.status >7" class=" status-text status-grey">{{ item.statusName||'' }}</text>
</view>
<view v-else class="head-city">
@@ -49,15 +49,14 @@
</view>
<view class="head-copy city-right align-right">
<text v-if="item.status < 7" class=" status-text status-orange">{{ item.statusName||'' }}</text>
- <text v-else-if="item.status ===7" class="status-text">{{ item.statusName||'' }}</text>
+ <text v-else-if="item.status ===7" class="status-text status-grey" >{{ item.statusName||'' }}</text>
<text v-else-if="item.status >7" class=" status-text status-grey">{{ item.statusName||'' }}</text>
- <text class="head-name text-ellipsis">{{ item.takeShopName||'瀵瑰瀵�' }}</text>
+ <text class="head-name text-ellipsis">{{ item.takeShopName || item.takeLocation||'' }}</text>
<text class="head-user">{{ item.takeUser||'' }}</text>
</view>
</view>
</view>
-
- <view class="goods-area" v-if="item.detailList">
+ <view class="goods-area" v-if="item.detailList" @click="jumpOrderDetail(item.id)">
<view v-for="goods in item.detailList " :key="goods.luggageName" class="goods-row">
<view class="goods-left">
<text class="goods-name">{{ goods.luggageName ||'' }}</text>
@@ -94,7 +93,7 @@
<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>
<view class="footer-btn primary-btn" v-if="item.status >=1 &&item.status <7 " @click="openQrcode(item)" >鏍搁攢鐮�</view>
- <view class="footer-btn primary-btn" v-if="item.status ===7 && !commentStatus ">璇勪环璁㈠崟</view>
+ <view class="footer-btn primary-btn" @click="evaluateOrder(item)" v-if="item.status ===7 && !item.commentStatus ">璇勪环璁㈠崟</view>
</view>
<view class="footer-actions" v-else>
<view class="footer-btn contact-btn" @click="contactPhone(item,0)" v-if="item.status ===1 || item.status ==2">鑱旂郴闂ㄥ簵</view>
@@ -106,7 +105,7 @@
<view class="footer-btn primary-btn" @click="cancelOrder(item)" v-if="item.status ===1">鐢宠閫�娆�</view>
<view class="footer-btn primary-btn" v-if="item.status ===1 || (item.takeShopId && item.status ===5)" @click="openQrcode(item)" >鏍搁攢鐮�</view>
<view class="footer-btn primary-btn" @click="doneOrder(item)" v-if="!item.takeShopId && item.status ===5">纭鏀惰揣</view>
- <view class="footer-btn primary-btn" v-if="item.status ===7 && !commentStatus ">璇勪环璁㈠崟</view>
+ <view class="footer-btn primary-btn" @click="evaluateOrder(item)" v-if="item.status ===7 && !item.commentStatus ">璇勪环璁㈠崟</view>
</view>
</view>
</view>
@@ -197,11 +196,13 @@
</view>
</view>
</u-popup>
+ <custom-tabbar></custom-tabbar>
</view>
</template>
<script>
import { mapState } from 'vuex'
+ import CustomTabbar from '@/components/custom-tabbar/custom-tabbar.vue'
import drawQrcode from 'weapp-qrcode'
export default {
computed: {
@@ -261,6 +262,7 @@
if(item.id==data.info.orderId){
console.log('鐩戝惉鍒颁簨浠舵潵鑷� update 02锛�' ,data);
item.status = data.info.orderStatus
+ item.commentStatus = data.info.commentStatus
}
})
}
@@ -473,7 +475,12 @@
},
jumpOrderDetail(id){
uni.navigateTo({
- url:'/pages/details-entry/details-entry?userType='+this.userType+'&id='+id
+ url:'/pages/delivery-order-detail/delivery-order-detail?userType=0&id='+id
+ })
+ },
+ evaluateOrder(item){
+ uni.navigateTo({
+ url:"/pages/evaluate/evaluate?id="+item.id
})
}
}
@@ -675,9 +682,11 @@
}
.text-ellipsis {
+ display: block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ max-width: 100%;
}
.city-arrow {
diff --git a/small-program/utils/http.api.js b/small-program/utils/http.api.js
index 4036dfb..5e70c24 100644
--- a/small-program/utils/http.api.js
+++ b/small-program/utils/http.api.js
@@ -46,8 +46,10 @@
let cancelOrder = (data = {}) => vm.$u.http.post('web/order/cancel', data); // 鍙栨秷璁㈠崟
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); //璁㈠崟璇勪环
vm.$u.api = {
+ orderComment,
confirmReceipt,
cancelOrder,
deleteOrder,
--
Gitblit v1.9.3