From 41532b5b5da61af2ad368cffee676d59caf2cee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 26 May 2023 17:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/CommodityOrder/CommodityOrder.vue |  6 +++---
 pages/goodsorderRate/goodsorderRate.vue | 12 +++++++++---
 pages/orderDetails/orderDetails.vue     |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

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 @@
 					<span v-if="item.orderStatus=='RECEIVED_GOODS'">待评价</span>
 					<span v-if="item.orderStatus=='EVALUATED'">已完成</span>
 					<span v-if="item.orderStatus=='PAY'">待发货</span>
-					<span v-if="item.orderStatus=='REFUNDED'">退款成功</span>
+					<span v-if="item.orderStatus=='REFUNDED'">已退款</span>
 					<span v-if="item.orderStatus=='WAIT_RETURNED_GOODS'">待退货</span>
 					<span v-if="item.orderStatus=='RETURNED_GOODS'">退款成功</span>
 				</view>
@@ -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}`
 				})
 			},
 			//支付