From 6e5ec474a43edc4e076be105840c2f4908622ae7 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 18 Dec 2024 14:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/tradingPlatform.vue              |  4 ++--
 pages_order/components/order/myOrderList.vue | 25 ++++++++++++++++++++-----
 pages_order/components/order/orderList.vue   | 13 +++++++++----
 pages_order/tradingPlatform/nowOrder.vue     |  4 ++--
 4 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/pages/index/tradingPlatform.vue b/pages/index/tradingPlatform.vue
index 78484f4..26b0803 100644
--- a/pages/index/tradingPlatform.vue
+++ b/pages/index/tradingPlatform.vue
@@ -71,10 +71,10 @@
 				mixinsListApi: 'getMyProductlist',
 				type: [
 					{
-						name: this.$t('other.spotTrading')
+						name: this.$t('other.futuresTrading')
 					},
 					{
-						name: this.$t('other.futuresTrading')
+						name: this.$t('other.spotTrading')
 					},
 				],
 				chartData: [
diff --git a/pages_order/components/order/myOrderList.vue b/pages_order/components/order/myOrderList.vue
index abd0bd0..121bd06 100644
--- a/pages_order/components/order/myOrderList.vue
+++ b/pages_order/components/order/myOrderList.vue
@@ -38,15 +38,22 @@
 						提货时间：{{ item.takeTime }}
 					</view>
 					<!--审核状态 0审核中 1 审核通过 2审核未通过-->
-					<!--<view class="text-hidden-1">-->
-					<!--  审核状态：{{ item.auditStatus == 0? '审核中' : (item.auditStatus == 1? '审核通过' : '审核未通过') }}-->
-					<!--</view>-->
+					<view class="text-hidden-1">
+						审核状态：{{ item.auditStatus == 0? '审核中' : (item.auditStatus == 1? '审核通过' : '审核未通过') }}
+					</view>
+					
+					<!--审核状态 0审核中 1 审核通过 2审核未通过-->
+					<view class="tip">
+						<img v-if="item.auditStatus==0" src="/pages_order/static/order/3.svg" style="width: 100%;height: 100%;" />
+						<img v-if="item.auditStatus==1" src="/pages_order/static/order/1.svg" style="width: 100%;height: 100%;" />
+						<img v-if="item.auditStatus==2" src="/pages_order/static/order/2.svg" style="width: 100%;height: 100%;" />
+					</view>
 				</view>
 			</view>
 			
 			<view class="bottom">
 				<view class="uni-color-btn"
-				v-if="item.orderFlag == 0"
+				v-if="item.auditStatus == 0 && item.orderFlag < 2"
 				@click.stop="closeOrder(item.id)">
 					取消订单
 				</view>
@@ -135,6 +142,7 @@
 		height: calc(90vh - 180rpx);
 	
 		.content {
+			position: relative;
 			margin: 10rpx 0;
 			.box-flex{
 				display: flex;
@@ -142,8 +150,8 @@
 				.left {
 					width: 200rpx;
 					height: 100%;
-					height: 100%;
 					border-radius: 10rpx;
+					flex-shrink: 0;
 
 					image {
 						width: 100%;
@@ -175,5 +183,12 @@
 			
 		}
 
+		.tip {
+			width: 80rpx;
+			height: 80rpx;
+			position: absolute;
+			top: 20rpx;
+			right: 20rpx;
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/pages_order/components/order/orderList.vue b/pages_order/components/order/orderList.vue
index ce92a4e..1c587c1 100644
--- a/pages_order/components/order/orderList.vue
+++ b/pages_order/components/order/orderList.vue
@@ -39,12 +39,17 @@
 					</view>
 				</view>
 
-				<view class="tip" v-if="item.showStatus == 0">
 					<!--审核状态 0审核中 1 审核通过 2审核未通过-->
-					<img v-if="item.auditStatus==0" src="../../static/order/3.svg" style="width: 100%;height: 100%;" />
-					<img v-if="item.auditStatus==1" src="../../static/order/1.svg" style="width: 100%;height: 100%;" />
-					<img v-if="item.auditStatus==2" src="../../static/order/2.svg" style="width: 100%;height: 100%;" />
+				<view class="tip" v-if="item.showStatus == 0">
+					<img v-if="item.auditStatus==0" src="/pages_order/static/order/3.svg" style="width: 100%;height: 100%;" />
+					<img v-if="item.auditStatus==1" src="/pages_order/static/order/1.svg" style="width: 100%;height: 100%;" />
+					<img v-if="item.auditStatus==2" src="/pages_order/static/order/2.svg" style="width: 100%;height: 100%;" />
 				</view>
+				<!-- <view class="tip">
+					<img v-if="item.auditStatus==0" src="/pages_order/static/order/3.svg" style="width: 100%;height: 100%;" />
+					<img v-if="item.auditStatus==1" src="/pages_order/static/order/1.svg" style="width: 100%;height: 100%;" />
+					<img v-if="item.auditStatus==2" src="/pages_order/static/order/2.svg" style="width: 100%;height: 100%;" />
+				</view> -->
 
 			</view>
 
diff --git a/pages_order/tradingPlatform/nowOrder.vue b/pages_order/tradingPlatform/nowOrder.vue
index 7b53ccc..ef256ae 100644
--- a/pages_order/tradingPlatform/nowOrder.vue
+++ b/pages_order/tradingPlatform/nowOrder.vue
@@ -49,12 +49,12 @@
 				</view>
 				<!--检测视频-->
 				<view class="item"
-				v-if="fatherData.video">
+				v-if="fatherData.reportVideo">
 					<view>检测视频</view>
 					<view class="list-video">
 						<view class="video"
 						:key="index"
-						v-for="(item, index) in fatherData.video.split(',')">
+						v-for="(item, index) in fatherData.reportVideo.split(',')">
 							<video :src="item"></video>
 						</view>
 					</view>