From e1e25bad3cb050bc860f8d3116b622b2691ebf94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 16 Oct 2025 02:50:50 +0800 Subject: [PATCH] =?UTF-8?q?feat(dealer):=20=E6=B7=BB=E5=8A=A0=E6=8E=A8?= =?UTF-8?q?=E8=8D=90=E4=BA=BA=E5=85=B3=E7=B3=BB=E6=9F=A5=E8=AF=A2=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基础URL为本地地址- 新增根据用户ID查询推荐人关系的API接口 - 在首页Header组件中集成推荐人信息获取逻辑 - 调整收益明细页面标题显示 - 在订单页面展示DealerId信息- 添加shopDealerReferee和shopUserReferee相关API及类型引用 --- config/env.ts | 2 +- src/api/shop/shopDealerReferee/index.ts | 13 +++++++++++++ src/api/shop/shopUserReferee/index.ts | 15 +++++++++++++++ src/dealer/capital/index.config.ts | 2 +- src/dealer/orders/index.tsx | 1 + src/pages/index/Header.tsx | 10 ++++++++++ 6 files changed, 41 insertions(+), 2 deletions(-) diff --git a/config/env.ts b/config/env.ts index de8e281..c3f95e2 100644 --- a/config/env.ts +++ b/config/env.ts @@ -2,7 +2,7 @@ export const ENV_CONFIG = { // 开发环境 development: { - API_BASE_URL: 'https://cms-api.websoft.top/api', + API_BASE_URL: 'http://127.0.0.1:9200/api', APP_NAME: '开发环境', DEBUG: 'true', }, diff --git a/src/api/shop/shopDealerReferee/index.ts b/src/api/shop/shopDealerReferee/index.ts index 949794f..1c49451 100644 --- a/src/api/shop/shopDealerReferee/index.ts +++ b/src/api/shop/shopDealerReferee/index.ts @@ -99,3 +99,16 @@ export async function getShopDealerReferee(id: number) { } return Promise.reject(new Error(res.message)); } + +/** + * 根据userId查询推荐关系 + */ +export async function getShopDealerRefereeByUserId(userId: number) { + const res = await request.get>( + '/shop/shop-dealer-referee/getByUserId/' + userId + ); + if (res.code === 0 && res.data) { + return res.data; + } + return Promise.reject(new Error(res.message)); +} diff --git a/src/api/shop/shopUserReferee/index.ts b/src/api/shop/shopUserReferee/index.ts index 5f7cc55..432c60e 100644 --- a/src/api/shop/shopUserReferee/index.ts +++ b/src/api/shop/shopUserReferee/index.ts @@ -1,6 +1,7 @@ import request from '@/utils/request'; import type { ApiResult, PageResult } from '@/api'; import type { ShopUserReferee, ShopUserRefereeParam } from './model'; +import type {ShopDealerReferee} from "@/api/shop/shopDealerReferee/model"; /** * 分页查询用户推荐关系表 @@ -99,3 +100,17 @@ export async function getShopUserReferee(id: number) { } return Promise.reject(new Error(res.message)); } + + +/** + * 根据userId查询推荐关系 + */ +export async function getShopUserRefereeByUserId(userId: number) { + const res = await request.get>( + '/shop/shop-user-referee/getByUserId/' + userId + ); + if (res.code === 0 && res.data) { + return res.data; + } + return Promise.reject(new Error(res.message)); +} diff --git a/src/dealer/capital/index.config.ts b/src/dealer/capital/index.config.ts index c5e4e41..7f34c37 100644 --- a/src/dealer/capital/index.config.ts +++ b/src/dealer/capital/index.config.ts @@ -1,3 +1,3 @@ export default definePageConfig({ - navigationBarTitleText: '电费收益' + navigationBarTitleText: '收益明细' }) diff --git a/src/dealer/orders/index.tsx b/src/dealer/orders/index.tsx index 1352e22..e470bc4 100644 --- a/src/dealer/orders/index.tsx +++ b/src/dealer/orders/index.tsx @@ -133,6 +133,7 @@ const DealerOrder: React.FC = () => { + DealerId:{Taro.getStorageSync('DealerId')} {/* 间推收益用户 */} {(order.firstNickname || order.firstUserId) && ( diff --git a/src/pages/index/Header.tsx b/src/pages/index/Header.tsx index 04e4472..1fe1e3f 100644 --- a/src/pages/index/Header.tsx +++ b/src/pages/index/Header.tsx @@ -15,6 +15,7 @@ import MySearch from "./MySearch"; import './Header.scss'; import navTo from "@/utils/common"; import UnifiedQRButton from "@/components/UnifiedQRButton"; +import {getShopDealerRefereeByUserId} from "@/api/shop/shopDealerReferee"; const Header = (props: any) => { // 使用新的useShopInfo Hook @@ -110,6 +111,15 @@ const Header = (props: any) => { console.error('获取用户信息失败:', error) } } + // 查找上级推荐人 + if(Taro.getStorageSync('UserId')){ + const dealer = await getShopDealerRefereeByUserId(Taro.getStorageSync('UserId')) + if(dealer){ + Taro.setStorageSync('DealerId', dealer.dealerId) + Taro.setStorageSync('Dealer', dealer) + } + } + } /* 获取用户手机号 */