From 795ab0eb135c8a553ba19c65a80ca16a6229477f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 28 Apr 2025 17:33:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=E8=AE=A2=E9=A4=90=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E6=92=AD=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/order.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue
index 12e68d6..a09370e 100644
--- a/src/pages/tabbar/order.vue
+++ b/src/pages/tabbar/order.vue
@@ -57,7 +57,6 @@ const pageHook = hooks.usePage(
 )
 const query = (page: number, pagesize: number) => {
 	const isLogin = hooks.useStaticCheckLogin()
-	console.log(isLogin, "isLogin")
 
 	if (!isLogin) return
 	pageHook.startPage(page, pagesize, false, state.pa)
@@ -129,7 +128,7 @@ const doRefund = (v: any) => {
 					</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">
+					<scroll-view v-if="['5', '20'].includes(v.orderStatus) && 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" />
@@ -137,7 +136,10 @@ const doRefund = (v: any) => {
 							</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">
+					<view
+						v-if="v.carList?.length && ['5', '20'].includes(v.orderStatus) && 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">

From 56396b760cab85c9c57ee11a4cbb7c23e087bc86 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 29 Apr 2025 15:08:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=BA=97=E9=93=BA=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sheep/api/merchant.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/sheep/api/merchant.ts b/src/sheep/api/merchant.ts
index 6addb29..a41cce7 100644
--- a/src/sheep/api/merchant.ts
+++ b/src/sheep/api/merchant.ts
@@ -28,4 +28,16 @@ export default {
 				showLoading: false,
 			},
 		}),
+	/**
+	 * 店铺分类查询
+	 */
+	selectCatgory: (params: any) =>
+		request({
+			url: "/wallet/mch-catgory/app/select",
+			method: "GET",
+			params,
+			custom: {
+				showLoading: false,
+			},
+		}),
 }