From 7ab5130cff81d3f1f11c5fdf705c641abdc136b5 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Wed, 2 Jul 2025 11:28:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=80=80=E8=B4=A7=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单列表页面添加标签页切换功能，支持筛选未退还和已退还订单
- 修改订单相关API和store，增加hasReturn参数用于筛选不同状态的订单
- 调整订单列表页面的布局和样式
---
 src/common/apis/shop/index.ts            |  9 ++++----
 src/pages/order/components/OrderList.vue | 26 ++++++++++++++++++------
 src/pinia/stores/order.ts                |  6 +++---
 src/router/index.ts                      |  6 ++++++
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/src/common/apis/shop/index.ts b/src/common/apis/shop/index.ts
index 2adc436..5a31e4f 100644
--- a/src/common/apis/shop/index.ts
+++ b/src/common/apis/shop/index.ts
@@ -57,19 +57,20 @@ export function fakeQyLoginApi(params: {corpid: string, userid: string}) {
 }
 
 /** 根据openid获取用户订单信息 */
-export function getOrdersByOpenIdApi(corpid: string, openid: string) {
+export function getOrdersByOpenIdApi(corpid: string, openid: string, hasReturn: number) {
   return request<ApiResponseData<GetOrdersByOpenIdDTO>>({
     url: `order/user/${openid}`,
     method: "get",
-    params: { corpid }
+    params: { corpid, hasReturn }
   })
 }
 
 /** 根据openid获取用户订单信息 */
-export function getOrdersByQyUserIdApi(qyUserId: number) {
+export function getOrdersByQyUserIdApi(qyUserId: number, hasReturn: number) {
   return request<ApiResponseData<GetOrdersByOpenIdDTO>>({
     url: `order/user/qy/${qyUserId}`,
-    method: "get"
+    method: "get",
+    params: { hasReturn }
   })
 }
 
diff --git a/src/pages/order/components/OrderList.vue b/src/pages/order/components/OrderList.vue
index 16c4b8e..684cc6e 100644
--- a/src/pages/order/components/OrderList.vue
+++ b/src/pages/order/components/OrderList.vue
@@ -1,18 +1,28 @@
 <script setup lang="ts">
-import { onMounted } from 'vue'
+import { onMounted, ref } from 'vue'
 import { useOrderStore } from '@/pinia/stores/order'
 import { useWxStoreOutside } from '@/pinia/stores/wx'
 
+const activeTab = ref(0);
+
 const router = useRouter()
 const orderStore = useOrderStore()
-const wxStore = useWxStoreOutside()
+const wxStore = useWxStoreOutside();
+
+const hasReturn = ref<number>(0);
+
+// 处理标签页切换
+const handleTabChange = (tabIndex: number) => {
+  hasReturn.value = tabIndex;
+  orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId, hasReturn.value);
+}
 
 onMounted(() => {
-  orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId)
+  orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId, hasReturn.value)
 })
 
 onBeforeRouteUpdate(() => {
-  orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId)
+  orderStore.getOrders(wxStore.corpid, wxStore.openid, wxStore.qyUserId, hasReturn.value)
 })
 
 const statusMap: Record<number, string> = {
@@ -30,7 +40,11 @@ const getStatusText = (status: number) => {
 
 <template>
   <div class="order-list">
-    <h2>我的订单</h2>
+    <!-- 状态切换标签页 -->
+    <van-tabs v-model:active="activeTab" @change="handleTabChange">
+      <van-tab title="未退还"></van-tab>
+      <van-tab title="已退还"></van-tab>
+    </van-tabs>
     
     <div v-if="orderStore.orders.length === 0" class="empty">
       暂无订单
@@ -85,7 +99,7 @@ const getStatusText = (status: number) => {
 
 <style scoped>
 .order-list {
-  padding: 20px;
+  padding: 8px;
 }
 
 .empty {
diff --git a/src/pinia/stores/order.ts b/src/pinia/stores/order.ts
index 4011669..a3c0381 100644
--- a/src/pinia/stores/order.ts
+++ b/src/pinia/stores/order.ts
@@ -16,11 +16,11 @@ export const useOrderStore = defineStore("order", () => {
   const orderGoods = ref<ShopOrderGoodsEntity[]>([])
   const goods = ref<Goods[]>([])
 
-  const getOrders = async (corpid: string, openid: string, qyUserId: number) => {
+  const getOrders = async (corpid: string, openid: string, qyUserId: number, hasReturn: number) => {
     try {
       const { data } = qyUserId ? 
-      await getOrdersByQyUserIdApi(qyUserId) 
-      : await getOrdersByOpenIdApi(corpid, openid);
+      await getOrdersByQyUserIdApi(qyUserId, hasReturn) 
+      : await getOrdersByOpenIdApi(corpid, openid, hasReturn);
       
       // 重组订单结构
       orders.value = data.orders.map(order => ({
diff --git a/src/router/index.ts b/src/router/index.ts
index 936f466..9d6b63c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -58,6 +58,12 @@ export const routes: RouteRecordRaw[] = [
     component: () => import('@/pages/order/components/OrderList.vue'),
     meta: {
       title: '订单列表',
+      layout: {
+        navBar: {
+          showNavBar: true,
+          showLeftArrow: true
+        }
+      },
       requiresAuth: true
     }
   },