diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index 812f193..4087744 100644 --- a/package1/order/orderDetail.vue +++ b/package1/order/orderDetail.vue @@ -685,12 +685,18 @@ - + 确定要取消拼团吗 - - 确认取消 + + + + 取消 + + + 确认 + @@ -1084,7 +1090,12 @@ this.peisongTime = `${fmt(hours1)}时${fmt(minutes1)}分${fmt(seconds1)}秒`; } - this.$refs.returnPopup.open('bottom'); + if(this.orderDetail.status != 10){ + this.$refs.returnPopup.open('bottom'); + }else{ + this.$refs.returnPopupBuy.open() + } + }, returnPopupPropBuy(item) { this.payData = item; diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue index 973ef5e..776446f 100644 --- a/package1/runErrand/runErrand.vue +++ b/package1/runErrand/runErrand.vue @@ -1238,7 +1238,7 @@ height: 150rpx; display: flex; background: #fff; - z-index: 9999; + z-index: 99; box-shadow: 0 -20rpx 30rpx rgba(0, 0, 0, 0.3); }