From 89980e2228fbbebc2e26511eb1e72b232e1814ef Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 22 Apr 2025 10:08:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/individualOrder.vue | 46 ++++++++++++++--------------
 src/pages/tabbar/order.vue           | 42 ++++++++++---------------
 2 files changed, 39 insertions(+), 49 deletions(-)

diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index 2d99763..b042d56 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -36,8 +36,8 @@
 
 			<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-100rpx h-100rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
-					<view class="flex-1 flex-col m-l-20rpx">
+					<image class="w-110rpx h-110rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+					<view class="flex-1 m-l-20rpx">
 						<view class="flex-row items-center justify-between">
 							<view class="flex-row items-center">
 								<view class="main-text-28">{{ v.merchantName }}</view>
@@ -47,36 +47,36 @@
 							<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>
+						</view>
+						<view class="flex justify-between items-center m-t-5rpx">
+							<view class="second-text-22">
+								<text>{{ v.username }}</text>
+								<text class="m-l-10rpx">{{ v.userMobile }}</text>
+							</view>
+							<view class="second-text-22 h-30rpx">{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
 						</view>
 						<view class="flex justify-between items-center">
-							<view class="flex flex-col">
-								<view class="second-text-22">
-									<text>{{ v.username }}</text>
-									<text class="m-l-10rpx">{{ v.userMobile }}</text>
-								</view>
-								<view class="second-text-22">
-									<text>下单时间</text>
-									<text class="m-l-10rpx">
-										{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
-									</text>
-								</view>
-							</view>
-							<view class="flex flex-col items-end justify-center m-t-5rpx">
-								<view class="second-text-22 h-30rpx">{{ hooks.useEnum("hardwareRefundStatusEnum", v.refundStatus) }}</view>
-								<view class="flex">
-									<view v-if="v.carList?.length" class="m-t-4rpx m-r-10rpx second-text-26">共 {{ v.carList.length }} 件</view>
-									<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
-								</view>
+							<view class="second-text-22">
+								<text>下单时间</text>
+								<text class="m-l-10rpx">{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</text>
 							</view>
+							<view class="main-text-30 color-red! min-w-140rpx text-right">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+							<!-- <view class="second-text-24">共 {{ v.carList.length }} 件</view> -->
 						</view>
+						<view v-if="v.payType == '9'" class="sub-text-24">{{ v.productDesc }}</view>
 					</view>
 				</view>
-				<div class="flex justify-end items-center mt-1">
+				<view class="flex justify-end items-center mt-1">
 					<view v-if="v.orderType == '1' && v.refundStatus" class="ml-1 botder_btn" @tap.stop="refundDetail(v)">售后详情</view>
-					<view v-if="v.orderStatus == '5' && v.orderType == '1'" class="ml-1 botder_btn" @tap.stop="doIndividualRefund(v)">
+					<view
+						v-if="v.orderStatus == '5' && v.orderType == '1' && v.payType != '9'"
+						class="ml-1 botder_btn"
+						@tap.stop="doIndividualRefund(v)"
+					>
 						申请退款
 					</view>
-				</div>
+				</view>
 			</view>
 		</z-paging>
 
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 79a08f9..0ce4d78 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -97,8 +97,8 @@ const doRefund = (v: any) => {
 			<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-row items-center">
-					<image class="w-80rpx h-80rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
-					<view class="flex-1 flex-col m-l-20rpx">
+					<image class="w-110rpx h-110rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+					<view class="flex-1 m-l-20rpx">
 						<view class="flex-row items-center justify-between">
 							<view class="flex-row items-center">
 								<view class="main-text-28">{{ v.merchantName }}</view>
@@ -108,49 +108,39 @@ const doRefund = (v: any) => {
 							<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>
 						</view>
 						<view class="flex-row items-center justify-between m-t-5rpx">
 							<view class="second-text-20">
 								<text>下单时间</text>
-								<text class="m-l-10rpx">
-									{{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
-								</text>
+								<text class="m-l-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>
+						<view class="flex-row items-center justify-between m-t-5rpx">
+							<view class="sub-text-24">
+								<text v-if="v.payType == '9'">{{ v.productDesc }}</text>
+							</view>
+							<view class="main-text-30 color-red! text-right">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+						</view>
 					</view>
 				</view>
-				<view class="relative h-0rpx m-t-[20rpx] flex justify-end items-center">
-					<!-- <view class="absolute top-0 right-0 bottom-0 left-0 h-180rpx">
+				<!-- <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"
-									@tap.stop="
-										router.jump('/pages/merchant/product-detail', {
-											id: pV.productId,
-										})
-									"
-								>
+								<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="inline-flex! h-180rpx">
-									<view class="w-160rpx h-full" />
-								</view>
 							</view>
 						</scroll-view>
-					</view> -->
-					<!-- <view class="absolute top-0 right-0 bottom-0 z-10 flex-col items-end w-160rpx p-x-20rpx bg-white bg-opacity-95"> -->
+					</view>
 					<view v-if="v.carList?.length" class="m-t-2rpx m-r-20rpx second-text-26">共 {{ v.carList.length }} 件</view>
-					<view class="main-text-30 color-red!">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
-					<!-- </view> -->
-				</view>
-				<view v-if="['5', '10'].includes(v.orderStatus)" class="flex-row items-center justify-end p-t-20rpx">
+				</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>