From 159869a381f5019c230ea19d86f2abf0529dee6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sun, 19 Oct 2025 13:59:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(dealer):=20=E6=9B=B4=E6=96=B0=E7=BB=8F?= =?UTF-8?q?=E9=94=80=E5=95=86=E8=B5=84=E6=9C=AC=E5=92=8C=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 ShopDealerCapitalParam 接口中新增 userId 和 month 字段 - 在 ShopDealerOrder 接口添加商品名称字段 title - 修改资本页面默认日期为年月格式，并调整相关查询逻辑 - 调整订单页面收益显示文案及逻辑，支持多级佣金展示 - 修改首页跳转链接，将“收益明细”改为“电费订单”并指向订单页面 --- src/api/shop/shopDealerCapital/model/index.ts | 2 ++ src/api/shop/shopDealerOrder/model/index.ts | 2 ++ src/dealer/capital/index.tsx | 16 +++++++++----- src/dealer/index.tsx | 2 +- src/dealer/orders/index.tsx | 22 +++++++------------ 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/api/shop/shopDealerCapital/model/index.ts b/src/api/shop/shopDealerCapital/model/index.ts index 4117083..4870565 100644 --- a/src/api/shop/shopDealerCapital/model/index.ts +++ b/src/api/shop/shopDealerCapital/model/index.ts @@ -32,5 +32,7 @@ export interface ShopDealerCapital { export interface ShopDealerCapitalParam extends PageParam { id?: number; orderNo?: string; + userId?: number; + month?: string, keywords?: string; } diff --git a/src/api/shop/shopDealerOrder/model/index.ts b/src/api/shop/shopDealerOrder/model/index.ts index b60994e..446ea83 100644 --- a/src/api/shop/shopDealerOrder/model/index.ts +++ b/src/api/shop/shopDealerOrder/model/index.ts @@ -6,6 +6,8 @@ import type { PageParam } from '@/api'; export interface ShopDealerOrder { // 主键ID id?: number; + // 商品名称 + title?: string; // 买家用户ID userId?: number; // 昵称 diff --git a/src/dealer/capital/index.tsx b/src/dealer/capital/index.tsx index 41f5407..ade2842 100644 --- a/src/dealer/capital/index.tsx +++ b/src/dealer/capital/index.tsx @@ -11,8 +11,9 @@ import navTo from "@/utils/common"; const DealerCapital: React.FC = () => { const [loading, setLoading] = useState(false) const d = new Date() + const currMonth = `${d.getFullYear()}${d.getMonth() + 1}`; const currDate = `${d.getFullYear()}-${d.getMonth() + 1}-${d.getDate()}`; - const [date, setDate] = useState(currDate) + const [date, setDate] = useState(currMonth) const [show1, setShow1] = useState(false) const [refreshing, setRefreshing] = useState(false) const [loadingMore, setLoadingMore] = useState(false) @@ -24,7 +25,7 @@ const DealerCapital: React.FC = () => { // 获取订单数据 const fetchCapital = useCallback(async (page: number = 1, isRefresh: boolean = false) => { - if (!dealerUser?.userId) return + // if (!dealerUser?.userId) return try { if (isRefresh) { @@ -37,7 +38,9 @@ const DealerCapital: React.FC = () => { const result = await pageShopDealerCapital({ page, - limit: 10 + limit: 10, + month: date, + userId: Taro.getStorageSync('UserId') }) if (result?.list) { @@ -94,7 +97,7 @@ const DealerCapital: React.FC = () => { if (dealerUser?.userId) { fetchCapital(1) } - }, [fetchCapital]) + }, [fetchCapital,date]) const renderCapitalItem = (item: ShopDealerCapital) => ( { - {item.comments && ( + {item.orderNo && ( - {item.comments} + {item.orderNo} )} @@ -187,6 +190,7 @@ const DealerCapital: React.FC = () => { pickerProps={{ popupProps: {zIndex: 1220}, }} + type={'year-month'} defaultValue={new Date(`${currDate}`)} showChinese onCancel={() => setShow1(false)} diff --git a/src/dealer/index.tsx b/src/dealer/index.tsx index 2eaabbd..6862840 100644 --- a/src/dealer/index.tsx +++ b/src/dealer/index.tsx @@ -209,7 +209,7 @@ const DealerIndex: React.FC = () => { border: 'none' } as React.CSSProperties} > - navigateToPage('/dealer/capital/index')}> + navigateToPage('/dealer/orders/index')}> diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx index e470bc4..93e2759 100644 --- a/src/dealer/orders/index.tsx +++ b/src/dealer/orders/index.tsx @@ -44,7 +44,7 @@ const DealerOrder: React.FC = () => { const result = await pageShopDealerOrder({ isInvalid: 0, isSettled: 1, - resourceId: Taro.getStorageSync('UserId'), + resourceId: Taro.getStorageSync('UserId') == 33658 ? undefined : Taro.getStorageSync('UserId'), month: date, page, limit: 10 @@ -122,7 +122,7 @@ const DealerOrder: React.FC = () => { - 客户名称：{order.comments} + 客户名称：{order.title} @@ -133,34 +133,28 @@ const DealerOrder: React.FC = () => { - DealerId：{Taro.getStorageSync('DealerId')} - {/* 间推收益用户 */} + {/*DealerId：{Taro.getStorageSync('DealerId')}*/} + {/* 一级佣金30 */} {(order.firstNickname || order.firstUserId) && ( - 自有收益：{order.firstNickname || `用户${order.firstUserId}`} (¥{order.firstMoney || '0.00'}) + 一级佣金：{order.firstNickname || `用户${order.firstUserId}`} (¥{order.firstMoney || '0.00'}) )} {/* 一级分销商 */} - {(order.nickname || order.userId) && ( + {(order.secondUserId || order.secondUserId) && ( - 合作方收益：{order.nickname || `用户${order.userId}`} (¥{order.secondMoney || '0.00'}) + 二级佣金：{order.secondNickname || `用户${order.secondUserId}`} (¥{order.secondMoney || '0.00'}) )} {/* 三级分销商 */} {(order.thirdUserId !== undefined && order.thirdUserId > 0) && ( - 联盟收益补贴：{order.thirdNickname || `用户${order.thirdUserId}`} (¥{order.thirdMoney || '0.00'}) + 三级佣金：{order.thirdNickname || `用户${order.thirdUserId}`} (¥{order.thirdMoney || '0.00'}) )} - {/* 如果都没有信息 */} - {!(order.firstNickname || order.firstUserId || order.nickname || order.userId || order.thirdNickname || order.thirdUserId) && ( - - 暂无收益用户 - - )}