diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue index c1548ab..05c0047 100644 --- a/pages/CommodityOrder/CommodityOrder.vue +++ b/pages/CommodityOrder/CommodityOrder.vue @@ -18,7 +18,7 @@ 待评价 已完成 待发货 - 退款成功 + 已退款 待退货 退款成功 @@ -157,7 +157,7 @@ uni.setStorageSync("Refresh", 'Refresh') setTimeout(e => { uni.navigateTo({ - url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.orderNoitem)}&delta=${3}` + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.orderNoitem)}&delta=${1}` }) // uni.navigateTo({ // url: `/pages/orderDetails/orderDetails?goodsOrderId=${this.orderNoitem.goodsOrderId}` @@ -228,7 +228,7 @@ //评价 rate(item) { uni.navigateTo({ - url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}&delta=${3}` + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}&delta=${1}` }) }, //订单详情页面 diff --git a/pages/goodsorderRate/goodsorderRate.vue b/pages/goodsorderRate/goodsorderRate.vue index 7197507..2cb2028 100644 --- a/pages/goodsorderRate/goodsorderRate.vue +++ b/pages/goodsorderRate/goodsorderRate.vue @@ -114,9 +114,15 @@ } that.timer = setTimeout(e => { that.imgs = [] - uni.navigateTo({ - url: `/pages/ratesuccess/ratesuccess?delta=${that.delta}` - }) + if (that.delta == 2) { + uni.navigateBack({ + delta: 2 + }) + } else if (that.delta == 1) { + uni.navigateBack({ + delta: 1 + }) + } }, 1500) } else { that.imgs = [] diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue index e0f7503..5732264 100644 --- a/pages/orderDetails/orderDetails.vue +++ b/pages/orderDetails/orderDetails.vue @@ -199,7 +199,7 @@ this.goodsOrderinfo() setTimeout(e => { uni.navigateTo({ - url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.order)}&delta=${4}` + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.order)}&delta=${2}` }) }, 1000) } else { @@ -225,7 +225,7 @@ //评价 rate() { uni.navigateTo({ - url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.order)}&delta=${4}` + url: `/pages/goodsorderRate/goodsorderRate?item=${JSON.stringify(this.order)}&delta=${2}` }) }, //支付