From 26978de65cce6196f481a65a59b5d09d42b247fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 26 Jan 2026 22:55:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(shop):=20=E5=AE=8C=E5=96=84=E5=88=86?= =?UTF-8?q?=E9=94=80=E5=95=86=E4=B8=9A=E5=8A=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在ShopDealerCapital模型中新增分销商昵称字段 - 在ShopDealerUser模型中新增类型和头像字段 - 更新资本流水页面显示分销商昵称和用户ID组合信息 - 修改收益列标题为收益类型并隐藏对方用户列 - 更新分销商用户页面类型标签文本并添加二维码生成功能 - 添加二维码预览弹窗支持复制链接和打开原图 - 优化分销商用户编辑弹窗界面布局和字段验证 - 新增关联用户选择功能并完善表单验证规则 - 添加支付密码管理和佣金信息展示功能 --- src/api/shop/shopDealerCapital/model/index.ts | 2 + src/api/shop/shopDealerUser/model/index.ts | 4 + .../shopDealerCapital/components/search.vue | 16 +- src/views/shop/shopDealerCapital/index.vue | 18 +- .../components/shopDealerUserEdit.vue | 428 ++++++++++++------ src/views/shop/shopDealerUser/index.vue | 65 ++- 6 files changed, 363 insertions(+), 170 deletions(-) diff --git a/src/api/shop/shopDealerCapital/model/index.ts b/src/api/shop/shopDealerCapital/model/index.ts index b62e6e5..bc9bd11 100644 --- a/src/api/shop/shopDealerCapital/model/index.ts +++ b/src/api/shop/shopDealerCapital/model/index.ts @@ -8,6 +8,8 @@ export interface ShopDealerCapital { id?: number; // 分销商用户ID userId?: number; + // 分销商昵称 + nickName?: string; // 订单ID orderId?: number; // 订单编号 diff --git a/src/api/shop/shopDealerUser/model/index.ts b/src/api/shop/shopDealerUser/model/index.ts index d443ef2..4f57555 100644 --- a/src/api/shop/shopDealerUser/model/index.ts +++ b/src/api/shop/shopDealerUser/model/index.ts @@ -6,8 +6,12 @@ import type { PageParam } from '@/api'; export interface ShopDealerUser { // 主键ID id?: number; + // 类型 0经销商 1企业 2集团 + type?: number; // 自增ID userId?: number; + // 头像 + avatar?: string; // 姓名 realName?: string; // 手机号 diff --git a/src/views/shop/shopDealerCapital/components/search.vue b/src/views/shop/shopDealerCapital/components/search.vue index ad1a2c6..218dfcd 100644 --- a/src/views/shop/shopDealerCapital/components/search.vue +++ b/src/views/shop/shopDealerCapital/components/search.vue @@ -57,12 +57,12 @@ const handleExport = async () => { const array: (string | number)[][] = [ [ - '用户ID', - '流动类型', + '订单号', + '用户', + '收益类型', '金额', - '订单编号', - '对方用户ID', - `创建时间`, + '描述', + '创建时间', '租户ID' ] ]; @@ -73,11 +73,11 @@ list.value = data?.list || []; list.value?.forEach((d: ShopDealerCapital) => { array.push([ - `${d.userId}`, + `${d.orderNo}`, + `${d.nickName}(${d.userId})`, `${d.flowType == 10 ? '佣金收入' : ''}`, `${d.money}`, - `${d.orderNo}`, - `${d.toUserId}`, + `${d.comments}`, `${d.createTime}`, `${d.tenantId}` ]); diff --git a/src/views/shop/shopDealerCapital/index.vue b/src/views/shop/shopDealerCapital/index.vue index e051abc..c8b1752 100644 --- a/src/views/shop/shopDealerCapital/index.vue +++ b/src/views/shop/shopDealerCapital/index.vue @@ -24,7 +24,7 @@ - {{ record.nickName }} + {{ record.nickName }}({{ record.userId }}) 显示 @@ -135,7 +135,7 @@ fixed: 'left' }, { - title: '收益', + title: '收益类型', dataIndex: 'flowType', key: 'flowType', align: 'center', @@ -177,13 +177,13 @@ }; } }, - { - title: '对方用户', - dataIndex: 'toUserId', - key: 'toUserId', - align: 'center', - customRender: ({ text }) => (text ? `ID: ${text}` : '-') - }, + // { + // title: '对方用户', + // dataIndex: 'toUserId', + // key: 'toUserId', + // align: 'center', + // customRender: ({ text }) => (text ? `ID: ${text}` : '-') + // }, { title: '描述', dataIndex: 'comments', diff --git a/src/views/shop/shopDealerUser/components/shopDealerUserEdit.vue b/src/views/shop/shopDealerUser/components/shopDealerUserEdit.vue index 502f42b..14648fc 100644 --- a/src/views/shop/shopDealerUser/components/shopDealerUserEdit.vue +++ b/src/views/shop/shopDealerUser/components/shopDealerUserEdit.vue @@ -1,11 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 基础信息 + + + + + + + + + + + + 经销商 + 企业 + 集团 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 佣金信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +