From 0e0cc53992b323528eaf78c444a90554ad7c3b19 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 13 Dec 2023 10:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_details/index.vue    |  2 +-
 pages/users/order_list/index.vue | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 7625e9d..8af8de6 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -83,7 +83,7 @@
 
 							</view>
 							<view class='iconfont'
-								:class='(orderInfo.status == 3 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status > 3 && orderInfo.status != 9 ? "t-color":"")'
+								:class='(orderInfo.status == 1 ? "icon-webicon318":"icon-yuandianxiao") + " " +(orderInfo.status >=1 && orderInfo.status != 9 ? "t-color":"")'
 								v-if="orderInfo.order_type == 0"></view>
 								
 								
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index fd38af4..36a03c3 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -63,7 +63,7 @@
 					<view v-if="orderList.length > 0">
 						<block v-if="orderStatus == 0">
 							<view class='item' v-for="(item,index) in orderList" :key="index">
-								<view @click='goOrderDetails(item.group_order_id)'>
+								<view @click='goOrderDetails(item.group_order_id, item)'>
 									<view class='title acea-row row-between-wrapper'>
 										<view class="acea-row row-middle left-wrapper">
 											{{item.group_order_sn}}
@@ -153,7 +153,7 @@
 						<!-- 待发货 待收货 待评价 已完成 -->
 						<block v-else>
 							<view class='item' v-for="(item,index) in orderList" :key="index">
-								<view @click='goOrderDetails(item.order_id)'>
+								<view @click='goOrderDetails(item.order_id, item)'>
 									<view class='title acea-row row-between-wrapper'>
 										<view class="acea-row row-middle left-wrapper" @click.stop="goMall(item)">
 											<text class="iconfont icon-shangjiadingdan"></text>
@@ -565,11 +565,10 @@ import { Toast } from '../../../libs/uniApi';
 				/**
 				 * 去订单详情
 				 */
-				goOrderDetails: function(order_id) {
+				goOrderDetails: function(order_id, item) {
 
 					let self = this
             
-
 					if (!order_id) return that.$util.Tips({
 						title: '缺少订单号无法查看订单详情'
 					});
@@ -578,14 +577,12 @@ import { Toast } from '../../../libs/uniApi';
 						title: '正在加载',
 					})
 					openOrderSubscribe().then(() => {
-
 						uni.hideLoading();
-						if (self.orderStatus == 0) {
+						if (self.orderStatus == 0 || (item&&item.order_status==1)) {
 							uni.navigateTo({
 								url: '/pages/order_details/stay?order_id=' + order_id
 							})
 						} else if (self.orderStatus == 1) {
-
 							uni.navigateTo({
 								url: `/pages/order_details/stay?order_id=${order_id}&orderStatus=${self.orderStatus}`
 							})
@@ -599,10 +596,9 @@ import { Toast } from '../../../libs/uniApi';
 					})
 					// #endif
 					// #ifndef MP
-          console.log(self.orderStatus);
-					if (self.orderStatus == 0) {
+					if (self.orderStatus == 0||(item&&item.order_status==1)) {
 						uni.navigateTo({
-							url: '/pages/order_details/stay?order_id=' + order_id
+							url: '/pages/order_details/stay?order_id=' + item.group_order_id
 						})
 					} else if (self.orderStatus == 1) {
 						// uni.navigateTo({