删除无用代码

src/components/OrderList.tsx

@@ -1,5 +1,6 @@
 import {Avatar, Cell, Space, Tabs, Button, TabPane} from '@nutui/nutui-react-taro'
 import {useEffect, useState, CSSProperties} from "react";
+import Taro from '@tarojs/taro';
 import {BszxPay} from "@/api/bszx/bszxPay/model";
 import {InfiniteLoading} from '@nutui/nutui-react-taro'
 import dayjs from "dayjs";
@@ -50,29 +51,55 @@ function OrderList(props: any) {
   const [tapIndex, setTapIndex] = useState<string | number>('0')
 
   console.log(props.statusBarHeight, 'ppp')
-  const reload = async () => {
-    pageShopOrder({page}).then(res => {
-      let newList: BszxPay[] | undefined = []
+
+  const getOrderStatusParams = (index: string | number) => {
+    let params: { payStatus?: number; deliveryStatus?: number; orderStatus?: number } = {};
+    switch (index) {
+      case '1': // 待付款
+        params.payStatus = 0;
+        break;
+      case '2': // 待发货
+        params.payStatus = 1;
+        params.deliveryStatus = 10;
+        break;
+      case '3': // 已收货
+        params.deliveryStatus = 30;
+        break;
+      case '4': // 已完成
+        params.orderStatus = 1;
+        break;
+      case '0': // 全部
+      default:
+        break;
+    }
+    return params;
+  };
+
+  const reload = async (resetPage = false) => {
+    const currentPage = resetPage ? 1 : page;
+    const params = getOrderStatusParams(tapIndex);
+    pageShopOrder({ page: currentPage, ...params }).then(res => {
+      let newList: ShopOrder[] | undefined = [];
       if (res?.list && res?.list.length > 0) {
-        newList = list?.concat(res.list)
-        setHasMore(true)
+        newList = resetPage ? res.list : list?.concat(res.list);
+        setHasMore(true);
       } else {
-        newList = res?.list
-        setHasMore(false)
+        newList = res?.list;
+        setHasMore(false);
       }
       setList(newList || []);
-    })
-  }
+      setPage(currentPage);
+    });
+  };
 
   const reloadMore = async () => {
-    setPage(page + 1)
+    setPage(page + 1);
     reload();
-  }
+  };
 
   useEffect(() => {
-    setPage(2)
-    reload()
-  }, [])
+    reload(true); // 首次加载或tab切换时重置页码
+  }, [tapIndex]); // 监听tapIndex变化
 
   return (
     <>
@@ -116,12 +143,12 @@ function OrderList(props: any) {
         >
           {list?.map(item => {
             return (
-              <Cell style={{padding: '16px'}}>
+              <Cell style={{padding: '16px'}} onClick={() => Taro.navigateTo({url: `/shop/orderDetail/index?orderId=${item.orderId}`})}>
                 <Space direction={'vertical'} className={'w-full flex flex-col'}>
                   <div className={'order-no flex justify-between'}>
                     <span className={'text-gray-700 font-bold text-sm'}
-                          onClick={() => copyText(`${item.orderNo}`)}>{item.orderNo}</span>
-                    <span className={'text-orange-500'}>待付款</span>
+                          onClick={(e) => {e.stopPropagation(); copyText(`${item.orderNo}`)}}>{item.orderNo}</span>
+                    <span className={'text-orange-500'}>待付款</span> {/* 这里可以根据item.orderStatus显示不同的状态 */}
                   </div>
                   <div
                     className={'create-time text-gray-400 text-xs'}>{dayjs(item.createTime).format('YYYY年MM月DD日 HH:mm:ss')}</div>