diff --git a/packages/sonpingDetail/sonpingDetail.vue b/packages/sonpingDetail/sonpingDetail.vue index 1e58951..df64638 100644 --- a/packages/sonpingDetail/sonpingDetail.vue +++ b/packages/sonpingDetail/sonpingDetail.vue @@ -182,9 +182,17 @@ }, // 确认收货 async orderConfirm(){ - await confirmOrder(this.details.order.order_id); - this.$msg('确认收货成功'); - this.getGradingDetail(); + uni.showModal({ + title:"确认收货", + content:'确认收到货物并签收?', + success:async (e) => { + if(e.confirm){ + await confirmOrder(this.details.order.order_id); + this.$msg('确认收货成功'); + this.getGradingDetail(); + } + } + }); }, // 更换收货地址 async changOrderAddress(){ @@ -209,7 +217,11 @@ toSubDetail(id){ if(this.details.order.grading_finish){ this.$url('/packages/sonpingDetail/viewDetail?id='+ id) - + }else{ + uni.showToast({ + icon:'none', + title:'正在评审中' + }) } } } diff --git a/pages/order/order.vue b/pages/order/order.vue index affaf50..1e808f0 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -63,8 +63,6 @@ - - @@ -399,12 +397,20 @@ }, // 确认收货 async orderConfirm(item){ - await confirmOrder(item.order_id); - this.$refs.uToast.show({ - message: '确认收货成功', - type: 'success' + uni.showModal({ + title:"确认收货", + content:'确认收到货物并签收?', + success:async (e) => { + if(e.confirm){ + await confirmOrder(item.order_id); + this.$refs.uToast.show({ + message: '确认收货成功', + type: 'success' + }); + this.confirm(); + } + } }); - this.confirm(); }, // 切换tab switchTab(item){ diff --git a/pages/write/baseInfo.vue b/pages/write/baseInfo.vue index c295d40..b1237c5 100644 --- a/pages/write/baseInfo.vue +++ b/pages/write/baseInfo.vue @@ -128,7 +128,7 @@ 优惠券: - +