From 33c2164b1785a4b3c128f71ff577a989e2d91bdc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 15:09:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/shop/pages/order-details/order-details.vue | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/small-program/shop/pages/order-details/order-details.vue b/small-program/shop/pages/order-details/order-details.vue
index ddf5bee..1e92830 100644
--- a/small-program/shop/pages/order-details/order-details.vue
+++ b/small-program/shop/pages/order-details/order-details.vue
@@ -223,7 +223,7 @@
</view>
<view style="width: 100%; height: calc(210rpx + env(safe-area-inset-bottom));"></view>
</view>
- <view class="tips" v-if="info.overdueStatus !==0">
+ <view class="tips" v-if="info.overdueStatus !==0 &&info.overdueStatus !==2">
<image src="/static/icon/ic_waring@2x.png" mode="widthFix"></image>
<text v-if="info.overdueStatus ===1">宸茶秴杩囧彇浠舵椂闂达紝宸蹭骇鐢熻秴鏃惰垂鐢細楼{{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
<text v-if="info.overdueStatus ===3">宸茶秴杩囧彇浠舵椂闂达紝绛夊緟瀹㈡埛鏀粯瓒呮椂璐圭敤锛毬{((info.overdueFee || 0)/100).toFixed(2)}}鍏�</text>
@@ -234,6 +234,7 @@
<view class="btn kong" @click="contactPhoneDo(info.takePhone)" v-if="info.status === 1 || info.status === 5" >鑱旂郴瀹㈡埛</view>
<view class="btn kong" @click="contactPhoneDo(info.driverPhone)" v-if="info.type ===1&&(info.status === 4 || info.status === 3)">鑱旂郴楠戞墜</view>
<view class="btn you" v-if="info.status ===1 || info.status ===4 " @click="hexiaoOrder(info)" >鏀朵欢鏍搁攢</view>
+ <view class="btn you" v-if="info.status ==2 || info.status ===3 || info.status ===4 " @click="printerOrder(info)" >鎵撳嵃鏍囩</view>
<view class="btn you" v-if="info.status ===5 &&(info.overdueStatus ==0 || info.overdueStatus == 1)" @click="hexiaoOrder(info)" >纭鍒板簵</view>
<view class="btn you" v-if="info.status ===5 && (info.overdueStatus == 4 || info.overdueStatus == 2)" @click="hexiaoOrder(info)" >鍙栦欢鏍搁攢</view>
</view>
@@ -266,6 +267,7 @@
},
data() {
return {
+ loading:false,
id:null,
qrcodeImage:null,
showCancel:false,
@@ -307,6 +309,27 @@
cancelOrder(item){
this.showCancel = !this.showCancel
},
+ async printerOrder(){
+ if(this.loading){
+ return
+ }
+ this.loading =true
+ try{
+ var that =this
+ that.$u.api.printOrderLabel({ orderId: this.id }).then(res=>{
+ if (res.code === 200 ) {
+ uni.showToast({
+ title:'鍙戣捣鎵撳嵃璇锋眰鎴愬姛',
+ icon:'none'
+ })
+ }
+ that.loading =false
+ })
+ }catch(e){
+ this.loading =false
+ }
+
+ },
async cancelOrderDo(){
var that =this
let res = await that.$u.api.cancelOrder({ orderId: this.id });
--
Gitblit v1.9.3