From eb65b48c97ddf0d29b1b72ae99828d1564078256 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 23 Apr 2025 16:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/order.vue | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index b8ca571..12e68d6 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -98,7 +98,7 @@ const doRefund = (v: any) => {
 				</view>
 			</template>
 			<view class="h-20rpx" />
-			<view class="flex-col justify-center card p-3 m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i" @tap="doToDetail(v)">
+			<view class="flex-col justify-center card p-3 m-b-20rpx" v-for="(v, i) in pageHook.list" :key="i">
 				<view class="flex-row items-center">
 					<image class="w-110rpx h-110rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
 					<view class="flex-1 m-l-20rpx">
@@ -128,24 +128,22 @@ const doRefund = (v: any) => {
 						</view>
 					</view>
 				</view>
-				<!-- <view class="flex justify-between items-center ml-[100rpx]">
-					<view class="absolute top-0 right-0 bottom-0 left-0 h-80rpx">
-						<scroll-view scroll-x class="flex-row-center whitespace-nowrap">
-							<view class="flex-row items-center">
-								<view class="inline-flex! flex-col justify-center h-180rpx m-r-20rpx" v-for="(pV, pI) in v.carList" :key="pI">
-									<image class="w-160rpx h-120rpx rounded-8rpx" :src="filePath(pV.productPic)" mode="aspectFill" />
-									<view class="w-160rpx m-t-10rpx sub-text-24 show-line text-center">
-										{{ pV.productName }}
-									</view>
-								</view>
+				<view class="flex items-center ml-[120rpx]">
+					<scroll-view v-if="v.orderStatus == 5 && v.orderType == 2" scroll-x class="flex-row-center whitespace-nowrap">
+						<view class="flex-row items-center">
+							<view class="inline-flex! flex-col items-center m-r-20rpx" v-for="(pV, pI) in v.carList" :key="pI">
+								<image class="w-60rpx h-60rpx rounded-8rpx" :src="filePath(pV.productPic)" mode="aspectFill" />
+								<view class="w-80rpx m-t-10rpx sub-text-24 show-line text-center">{{ pV.productName }}</view>
 							</view>
-						</scroll-view>
+						</view>
+					</scroll-view>
+					<view v-if="v.carList?.length && v.orderStatus == 5 && v.orderType == 2" class="w-200rpx m-x-10rpx second-text-26">
+						共 {{ v.carList.length }} 件
+					</view>
+					<view v-if="['5', '10'].includes(v.orderStatus)" class="w-500rpx flex-row items-center justify-end">
+						<!-- <view v-if="v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款</view> -->
+						<view v-if="v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)">核销码</view>
 					</view>
-					<view v-if="v.carList?.length" class="m-t-2rpx m-r-20rpx second-text-26">共 {{ v.carList.length }} 件</view>
-				</view> -->
-				<view v-if="['5', '10'].includes(v.orderStatus)" class="flex-row items-center justify-end">
-					<!-- <view v-if="v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款</view> -->
-					<view v-if="v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)">核销码</view>
 				</view>
 			</view>
 		</z-paging>