|
@@ -181,20 +181,20 @@ export default {
|
|
|
clearTimeout(this.timer);
|
|
clearTimeout(this.timer);
|
|
|
}
|
|
}
|
|
|
if (res.status === 'PROCESSING' || res.status === 'CANCELLED') {
|
|
if (res.status === 'PROCESSING' || res.status === 'CANCELLED') {
|
|
|
- // this.$dialog
|
|
|
|
|
- // .alert({
|
|
|
|
|
- // title: '提示',
|
|
|
|
|
- // message:
|
|
|
|
|
- // res.status === 'CANCELLED' ? '订单支付失败,点击重新下单' : '订单已支付,点击查看订单详情'
|
|
|
|
|
- // })
|
|
|
|
|
- // .then(() => {
|
|
|
|
|
- // if (res.status === 'CANCELLED') {
|
|
|
|
|
- // this.$router.back();
|
|
|
|
|
- // } else {
|
|
|
|
|
- // this.$router.replace('/orderDetail?id=' + res.id);
|
|
|
|
|
- // }
|
|
|
|
|
- // // on close
|
|
|
|
|
- // });
|
|
|
|
|
|
|
+ this.$dialog
|
|
|
|
|
+ .alert({
|
|
|
|
|
+ title: '提示',
|
|
|
|
|
+ message:
|
|
|
|
|
+ res.status === 'CANCELLED' ? '订单支付失败,点击重新下单' : '订单已支付,点击查看订单详情'
|
|
|
|
|
+ })
|
|
|
|
|
+ .then(() => {
|
|
|
|
|
+ if (res.status === 'CANCELLED') {
|
|
|
|
|
+ this.$router.back();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.$router.replace('/orderDetail?id=' + res.id);
|
|
|
|
|
+ }
|
|
|
|
|
+ // on close
|
|
|
|
|
+ });
|
|
|
} else if (next) {
|
|
} else if (next) {
|
|
|
this.timer = setTimeout(() => {
|
|
this.timer = setTimeout(() => {
|
|
|
this.getOrder(next);
|
|
this.getOrder(next);
|