|
|
|
@ -826,11 +826,7 @@ |
|
|
|
￥<text style="font-size: 60rpx;">{{payAmountText}}</text> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="btn" |
|
|
|
style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 100rpx;border-radius: 100rpx;text-align: center;font-size: 28rpx;font-weight: 700;line-height: 100rpx;margin: 40rpx auto;" |
|
|
|
@tap="wxPayment"> |
|
|
|
确认付款 |
|
|
|
</view> |
|
|
|
|
|
|
|
<view class="box1" style="display: flex;padding: 40rpx;"> |
|
|
|
<view style="flex: 1;"> |
|
|
|
<view style="height: 42rpx;line-height: 42rpx;display: flex;"> |
|
|
|
@ -847,6 +843,11 @@ |
|
|
|
alt="" style="width: 36rpx;height: 36rpx;" /> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="btn" |
|
|
|
style="background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));width: 90%;height: 100rpx;border-radius: 100rpx;text-align: center;font-size: 28rpx;font-weight: 700;line-height: 100rpx;margin: 40rpx auto;" |
|
|
|
@tap="wxPayment"> |
|
|
|
确认付款 |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
</uni-popup> |
|
|
|
@ -1423,24 +1424,67 @@ |
|
|
|
} |
|
|
|
return false; |
|
|
|
}, |
|
|
|
returnPopupProp(item) { |
|
|
|
shouldCheckCancelOrderLatest(item) { |
|
|
|
return item && item.deliveryType == 1 && item.status == 2; |
|
|
|
}, |
|
|
|
getOrderDetailForCancelCheck(id) { |
|
|
|
return this.tui.request("/mall/order/detail/" + id, "GET", {}, false, true, true).then((res) => { |
|
|
|
if (res.code == 200) { |
|
|
|
return res.result; |
|
|
|
} |
|
|
|
this.tui.toast(res.message || "订单状态校验失败"); |
|
|
|
return null; |
|
|
|
}).catch(() => { |
|
|
|
this.tui.toast("订单状态校验失败"); |
|
|
|
return null; |
|
|
|
}); |
|
|
|
}, |
|
|
|
async returnPopupProp(item) { |
|
|
|
let latestItem = item; |
|
|
|
this.payData = item; |
|
|
|
if (item.status == 0) { |
|
|
|
this.cancelUnpaidOrder(item); |
|
|
|
return; |
|
|
|
} |
|
|
|
if (this.isNoResponsibilityCancel(item)) { |
|
|
|
if (this.shouldCheckCancelOrderLatest(item)) { |
|
|
|
let latestDetail = await this.getOrderDetailForCancelCheck(item.id); |
|
|
|
if (!latestDetail) { |
|
|
|
return; |
|
|
|
} |
|
|
|
let isNoResponsibility = this.isNoResponsibilityCancel(latestDetail); |
|
|
|
if (!isNoResponsibility && latestDetail.status != item.status) { |
|
|
|
this.getOrderDetail(latestDetail.id); |
|
|
|
uni.showModal({ |
|
|
|
title: '提示', |
|
|
|
content: '订单状态已发生变化，请确认是否取消订单', |
|
|
|
confirmText: '继续退款', |
|
|
|
success: (res) => { |
|
|
|
if (res.confirm) { |
|
|
|
this.openResponsibilityCancelPopup(latestDetail); |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
return; |
|
|
|
} |
|
|
|
latestItem = latestDetail; |
|
|
|
this.payData = latestDetail; |
|
|
|
} |
|
|
|
if (this.isNoResponsibilityCancel(latestItem)) { |
|
|
|
this.$refs.noResponsibilityCancelPopup.open('center'); |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
this.openResponsibilityCancelPopup(latestItem); |
|
|
|
}, |
|
|
|
openResponsibilityCancelPopup(item) { |
|
|
|
this.payData = item; |
|
|
|
if (this.payData.otherOrder == 1) { |
|
|
|
this.refundType = 3 |
|
|
|
this.refundTypeStatus = 2 |
|
|
|
this.sellTime = 3 |
|
|
|
} |
|
|
|
if(this.orderDetail.deliveryInfo && this.orderDetail.deliveryInfo.arriveTime){ |
|
|
|
this.arriveTime = this.orderDetail.deliveryInfo.arriveTime ? this.formatTimeText(this.orderDetail.deliveryInfo.arriveTime) : '未到店' |
|
|
|
if(this.payData.deliveryInfo && this.payData.deliveryInfo.arriveTime){ |
|
|
|
this.arriveTime = this.payData.deliveryInfo.arriveTime ? this.formatTimeText(this.payData.deliveryInfo.arriveTime) : '未到店' |
|
|
|
} |
|
|
|
if (this.payData.shopMakeTime != null && this.payData.deliveryInfo && this.payData.deliveryInfo.acceptTime) { |
|
|
|
const date1 = new Date(this.payData.deliveryInfo.acceptTime); |
|
|
|
|
wangfukang
3 weeks ago