From cdb506f01fba087c2ac9791e4c22a4d290a6f8d8 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Thu, 18 Sep 2025 17:17:47 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E8=B4=AD=E4=B9=B0=E8=AF=A6=E6=83=85=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index b16371b..0a878a7 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -100,52 +100,61 @@ const doRefund = (v: any) => {
 
 			<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">
-					<image class="w-80rpx h-80rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+					<image class="size-130rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
 					<view class="flex-1 ml-20rpx">
 						<view class="flex-row items-center justify-between">
-							<view class="main-text-28">{{ v.merchantName }}</view>
+							<view class="main-text-30">{{ v.merchantName }}</view>
 							<!-- <view class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" /> -->
-							<tm-tag v-if="v.orderStatus == 1" color="info" size="xs">未支付</tm-tag>
-							<tm-tag v-if="v.orderStatus == 5" color="success" size="xs">已支付</tm-tag>
-							<tm-tag v-if="v.orderStatus == 10" color="error" size="xs">售后</tm-tag>
-							<tm-tag v-if="v.orderStatus == 20" size="xs">已核销</tm-tag>
-							<tm-tag v-if="v.orderStatus == 30" color="info" size="xs">已取消(智能柜)</tm-tag>
+							<tm-tag v-if="v.orderStatus == 1" color="info" size="s">未支付</tm-tag>
+							<tm-tag v-if="v.orderStatus == 5" color="success" size="s">已支付</tm-tag>
+							<tm-tag v-if="v.orderStatus == 10" color="error" size="s">售后</tm-tag>
+							<tm-tag v-if="v.orderStatus == 20" size="s">已核销</tm-tag>
+							<tm-tag v-if="v.orderStatus == 30" color="info" size="s">已取消(智能柜)</tm-tag>
 						</view>
-						<view class="flex-row items-center justify-between mt-5rpx">
-							<view class="second-text-20">
+						<view class="flex-row items-center justify-between mt-5rpx second-text-24">
+							<view>
 								<text>下单时间</text>
-								<text class="m-l-10rpx">{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</text>
+								<text class="ml-10rpx">{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</text>
 							</view>
-							<view class="second-text-22">{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
+							<view>{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
 						</view>
-						<view class="flex-row items-center justify-end mt-5rpx">
-							<!-- <view class="sub-text-24">
-								<text v-if="v.payType == '9'">{{ v.productDesc?.replaceAll(";", "\;\n") }}</text>
-							</view> -->
-							<view class="main-text-30 whitespace-nowrap color-red! text-right">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+						<view class="flex-row items-center justify-end mt-1">
+							<text
+								v-if="v.carList?.length && ['5', '20'].includes(v.orderStatus) && ['1', '2'].includes(v.orderType)"
+								class="second-text-30 mr-2"
+							>
+								共 {{ v.carList.length }} 件
+							</text>
+							<text class="main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</text>
 						</view>
 					</view>
 				</view>
 
-				<view class="flex items-center ml-[20rpx] overflow-hidden gap-2">
-					<view class="w-4/5">
-						<scroll-view v-if="['5', '20'].includes(v.orderStatus) && ['1', '2'].includes(v.orderType)" scroll-x>
-							<view class="flex-row">
-								<view class="flex-col justify-start items-center mr-20rpx" v-for="(pV, pI) in v.carList" :key="pI">
-									<image v-if="v.payType == '9'" class="w-80rpx h-80rpx rounded-8rpx" :src="pV.productPic" mode="aspectFill" />
-									<image v-else class="w-80rpx h-80rpx rounded-8rpx" :src="filePath(pV.productPic)" mode="aspectFill" />
-									<view class="mt-10rpx sub-text-24 text-center min-w-120rpx max-w-200rpx">{{ pV.productName }}</view>
+				<!-- <scroll-view v-if="['5', '20'].includes(v.orderStatus) && ['1', '2'].includes(v.orderType)" scroll-y> -->
+				<view v-if="['5', '20'].includes(v.orderStatus) && ['1', '2'].includes(v.orderType)">
+					<view class="border-2rpx border-dashed border-#eeeeee mt-2"></view>
+					<tm-collapse>
+						<tm-collapse-item :name="i" title="详细购买" titleFontSize="28" activeColor="#000" titleHeight="80" :showBottomLine="false">
+							<view v-if="v.carList.length" class="flex justify-between items-center mb-2 px-3" v-for="(pV, pI) in v.carList" :key="pI">
+								<view class="flex items-center w-6/10">
+									<view class="size-100rpx">
+										<image v-if="v.payType == '9'" class="size-100rpx rounded-8rpx" :src="pV.productPic" mode="aspectFill" />
+										<image v-else class="size-100rpx rounded-8rpx" :src="filePath(pV.productPic)" mode="aspectFill" />
+									</view>
+									<view class="ml-2 overflow-hidden">
+										<view class="sub-text-26 truncate">{{ pV.productName }}</view>
+										<view class="sub-text-26">¥ {{ hooks.useMoney(pV.productPrice) }}</view>
+										<view class="sub-text-26">x {{ pV.productCount }}</view>
+									</view>
 								</view>
+								<view class="sub-text-30 w-3/10">¥ {{ hooks.useMoney(pV.totalPrice) }}</view>
 							</view>
-						</scroll-view>
-					</view>
-					<view
-						v-if="v.carList?.length && ['5', '20'].includes(v.orderStatus) && ['1', '2'].includes(v.orderType)"
-						class="w-1/5 second-text-26 truncate text-center"
-					>
-						共 {{ v.carList.length }} 件
-					</view>
+							<view v-else class="second-text-26 text-center">无数据</view>
+							<view class="border-2rpx border-dashed border-#eeeeee mt-2"></view>
+						</tm-collapse-item>
+					</tm-collapse>
 				</view>
+				<!-- </scroll-view> -->
 
 				<view v-if="['5', '10'].includes(v.orderStatus)" class="w-full flex-row items-center justify-end my-1">
 					<!-- <view v-if="v.orderStatus == 5 && v.orderType == 2" class="botder_btn" @tap.stop="doRefund(v)">退款</view> -->