refactor(clinicPrescription): 优化订单列表查询逻辑并移除冗余代码
- 移除页面中对 pageShopOrder 和 listShopOrderGoods 接口的引用 - 调整搜索条件,使用 doctorId 替代 userId 作为查询参数 - 删除未使用的 Taro 引入及状态栏高度相关逻辑 - 移除未生效的 props.searchParams 扩展属性 - 精简组件代码结构,提高可维护性
This commit is contained in:
@@ -4,9 +4,8 @@ import {View, Text} from '@tarojs/components'
|
||||
import Taro from '@tarojs/taro';
|
||||
import {InfiniteLoading} from '@nutui/nutui-react-taro'
|
||||
import dayjs from "dayjs";
|
||||
import {pageShopOrder, updateShopOrder, createOrder} from "@/api/shop/shopOrder";
|
||||
import {updateShopOrder, createOrder} from "@/api/shop/shopOrder";
|
||||
import {ShopOrder, ShopOrderParam} from "@/api/shop/shopOrder/model";
|
||||
import {listShopOrderGoods} from "@/api/shop/shopOrderGoods";
|
||||
import {ShopOrderGoods} from "@/api/shop/shopOrderGoods/model";
|
||||
import {copyText} from "@/utils/common";
|
||||
import PaymentCountdown from "@/components/PaymentCountdown";
|
||||
@@ -189,9 +188,8 @@ function OrderList(props: OrderListProps) {
|
||||
// 合并搜索条件,tab的statusFilter优先级更高
|
||||
const searchConditions: any = {
|
||||
page: currentPage,
|
||||
type: 1,
|
||||
userId: statusParams.userId, // 用户ID
|
||||
...props.searchParams, // 搜索关键词等其他条件
|
||||
doctorId: statusParams.userId, // 用户ID
|
||||
// ...props.searchParams, // 搜索关键词等其他条件
|
||||
};
|
||||
|
||||
// statusFilter总是添加到搜索条件中(包括-1表示全部)
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import {useState, useCallback, useRef, useEffect} from "react";
|
||||
import Taro from '@tarojs/taro'
|
||||
import {Space, Button, Input} from '@nutui/nutui-react-taro'
|
||||
import {View} from '@tarojs/components';
|
||||
import OrderList from "./components/OrderList";
|
||||
@@ -9,7 +8,6 @@ import './index.scss'
|
||||
|
||||
function ClinicPrescriptionList() {
|
||||
const {params} = useRouter();
|
||||
const [statusBarHeight, setStatusBarHeight] = useState<number>(0) // 默认值为0
|
||||
const [searchParams, setSearchParams] = useState<ShopOrderParam>({
|
||||
statusFilter: params.statusFilter != undefined && params.statusFilter != '' ? parseInt(params.statusFilter) : -1
|
||||
})
|
||||
@@ -52,12 +50,6 @@ function ClinicPrescriptionList() {
|
||||
reload(newSearchParams).then()
|
||||
}
|
||||
useEffect(() => {
|
||||
// 获取状态栏高度
|
||||
Taro.getSystemInfo({
|
||||
success: (res) => {
|
||||
setStatusBarHeight(res.statusBarHeight ?? 0)
|
||||
},
|
||||
})
|
||||
reload().then()
|
||||
}, []);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user