From 007013409384c49221e61e4761e291cd38b851fc Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Tue, 26 Aug 2025 19:36:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/shop/brandDetail.vue       |  6 +++--
 src/pages/shop/detail.vue            | 21 +++++++++------
 src/pages/tabbar/coopMerchant.vue    |  4 +--
 src/pages/tabbar/individualOrder.vue |  5 +++-
 src/pages/tabbar/order.vue           | 39 ++++++++++++++--------------
 5 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/pages/shop/brandDetail.vue b/src/pages/shop/brandDetail.vue
index d4c37da..547fd78 100644
--- a/src/pages/shop/brandDetail.vue
+++ b/src/pages/shop/brandDetail.vue
@@ -96,13 +96,15 @@ const toDetail = async (v: any) => {
 						<view class="sub-text-34">{{ v.name }}</view>
 						<view class="m-t-10rpx">
 							<view class="flex justify-between items-center">
-								<view>
+								<view class="flex-1">
 									<view v-if="v.phone" class="flex items-center">
 										<image class="w-24rpx h-24rpx" src="@/static/page/phone.svg" />
 										<view class="second-text-28 ml-1">{{ v.phone }}</view>
 									</view>
 								</view>
-								<tm-tag size="xs">{{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }}</tm-tag>
+								<tm-tag class="max-w-160rpx" size="xs">
+									{{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }}
+								</tm-tag>
 							</view>
 							<view class="second-text-24">
 								<view v-if="v.jobTime != ',,'" class="second-text-28">营业时间：</view>
diff --git a/src/pages/shop/detail.vue b/src/pages/shop/detail.vue
index 9402a96..c010460 100644
--- a/src/pages/shop/detail.vue
+++ b/src/pages/shop/detail.vue
@@ -24,19 +24,24 @@
 							<view class="sub-text-34">{{ state.detail.name }}</view>
 							<view class="m-t-10rpx">
 								<view class="flex justify-between items-center">
-									<view>
-										<view v-if="state.detail.phone" class="flex items-center">
+									<view class="flex-1">
+										<view
+											v-if="state.detail.phone"
+											v-for="(item, index) in state.detail.phone.split('/')"
+											:key="index"
+											class="flex items-center"
+										>
 											<image class="w-24rpx h-24rpx" src="@/static/page/phone.svg" />
-											<view class="second-text-28 ml-1">{{ state.detail.phone?.slice(0, 11) }}</view>
+											<view class="second-text-28 ml-1">{{ item.trim() }}</view>
 											<view
 												class="second-text-20 bg-#f8f8f8 ml-1 p-0.3 flex items-center rounded-1 border border-solid border-b-coolGray"
-												@tap="doPhone"
+												@tap="doPhone(item)"
 											>
 												联系商家
 											</view>
 										</view>
 									</view>
-									<tm-tag size="xs">
+									<tm-tag class="max-w-160rpx" size="xs">
 										{{ state.detail.deptName?.length > 5 ? state.detail.deptName.substring(0, 5) + "..." : state.detail.deptName }}
 									</tm-tag>
 								</view>
@@ -331,13 +336,13 @@ const submitPay = async () => {
 }
 
 // 联系商家
-const doPhone = () => {
-	if (isEmpty(state.detail.phone)) {
+const doPhone = (item: string) => {
+	if (isEmpty(item)) {
 		uni.showToast({ title: "该商户没有预留电话", icon: "none" })
 		return
 	}
 	;(window as any).dd
-		.callPhone({ phoneNum: state.detail.phone.slice(0, 11) })
+		.callPhone({ phoneNum: item.trim() })
 		.then((res) => {})
 		.catch((err) => {})
 }
diff --git a/src/pages/tabbar/coopMerchant.vue b/src/pages/tabbar/coopMerchant.vue
index 92d498f..c63513f 100644
--- a/src/pages/tabbar/coopMerchant.vue
+++ b/src/pages/tabbar/coopMerchant.vue
@@ -113,13 +113,13 @@ const toDetail = async (v: any) => {
 					</view>
 					<view class="m-t-10rpx">
 						<view class="flex justify-between items-center">
-							<view>
+							<view class="flex-1">
 								<view v-if="v.phone" class="flex items-center">
 									<image class="w-24rpx h-24rpx" src="@/static/page/phone.svg" />
 									<view class="second-text-28 ml-1">{{ v.phone }}</view>
 								</view>
 							</view>
-							<tm-tag size="xs">{{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }}</tm-tag>
+							<tm-tag class="max-w-160rpx" size="xs">{{ v.deptName.length > 5 ? v.deptName.substring(0, 5) + "..." : v.deptName }}</tm-tag>
 						</view>
 						<view class="second-text-24">
 							<view v-if="v.jobTime != ',,'" class="second-text-28">营业时间：</view>
diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index b042d56..e959f35 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -27,7 +27,10 @@
 						:quickDate="[]"
 						drawerSize="900"
 					>
-						<view class="w-100rpx text-center second-text-28 text-30 mb-4rpx">筛选</view>
+						<view class="mb-6rpx flex items-center gap-1">
+							<image class="w-[30rpx] h-[30rpx]" src="@/static/page/filter.svg" />
+							<view class="text-center second-text-28 text-30 whitespace-nowrap">筛选</view>
+						</view>
 					</tm-between-time>
 				</view>
 			</template>
diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 3783b45..b16371b 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -93,38 +93,35 @@ const doRefund = (v: any) => {
 			@scroll="pageHook.scroll"
 		>
 			<template #top>
-				<view class="h-30rpx" />
-				<view class="bg-white rounded-16rpx px-20rpx">
+				<view class="bg-white rounded-16rpx px-20rpx my-20rpx">
 					<z-tabs :list="data.tabs" @change="doTab" />
 				</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">
-				<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">
+				<view class="flex-row">
+					<image class="w-80rpx h-80rpx rounded-8rpx" :src="filePath(v.logoPic)" mode="aspectFill" />
+					<view class="flex-1 ml-20rpx">
 						<view class="flex-row items-center justify-between">
-							<view class="flex-row items-center">
-								<view class="main-text-28">{{ v.merchantName }}</view>
-								<!-- <view class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" /> -->
-							</view>
+							<view class="main-text-28">{{ 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>
 						</view>
-						<view class="flex-row items-center justify-between m-t-5rpx">
+						<view class="flex-row items-center justify-between mt-5rpx">
 							<view class="second-text-20">
 								<text>下单时间</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">
+						<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> -->
 							<view class="main-text-30 whitespace-nowrap color-red! text-right">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
 						</view>
 					</view>
@@ -132,22 +129,24 @@ const doRefund = (v: any) => {
 
 				<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) && v.orderType == 2" scroll-x>
-							<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-80rpx h-80rpx rounded-8rpx" :src="filePath(pV.productPic)" mode="aspectFill" />
-									<view class="m-t-10rpx sub-text-24 show-line text-center">{{ pV.productName }}</view>
+						<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>
 								</view>
 							</view>
 						</scroll-view>
 					</view>
 					<view
-						v-if="v.carList?.length && ['5', '20'].includes(v.orderStatus) && v.orderType == 2"
+						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>
+
 				<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> -->
 					<view v-if="v.orderStatus == 5 && v.orderType == 2" class="m-l-20rpx botder_btn" @tap.stop="doToDetail(v)">核销码</view>