From 70fb42b5f386711c6bcf090f1b1b8cb826fa304d Mon Sep 17 00:00:00 2001 From: chen Date: Thu, 17 Sep 2026 15:47:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(commission):=20=E5=AF=B9=E9=BD=90=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E9=BB=98=E8=AE=A4=E8=A7=92=E8=89=B2=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=8F=8AUniApp=E5=90=88=E4=BC=99=E8=82=A1=E4=B8=9C=E5=B9=B3?= =?UTF-8?q?=E7=BA=A7=E5=BE=AE=E6=A0=87=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/view/shopro/dashboard/index.html | 30 ++++++++++++------- public/assets/js/backend/shopro/dashboard.js | 9 +++++- .../commission/components/commission-info.vue | 1 + uniapp/pages/commission/team.vue | 15 ++++++++++ 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/application/admin/view/shopro/dashboard/index.html b/application/admin/view/shopro/dashboard/index.html index 4930230..504cca9 100644 --- a/application/admin/view/shopro/dashboard/index.html +++ b/application/admin/view/shopro/dashboard/index.html @@ -491,30 +491,38 @@ - +
- 付 - 随时应兑现金备付金 (应付责任) + 豆 + 马豆价值与汇率核算
- 资金备付需求 + 汇率动态增值
- ¥{{ state.finance.rigid_cash_liability }} + ¥{{ state.madow.total_madow_cny }} + 当前折合总价值
- ① 会员未提现收益 (随时可申请提现): - ¥{{ state.finance.commission_float }} + ① 全网持豆总量: + {{ state.madow.total_madow }} 豆
- ② 会员账户钱包余额 (可消费或提现): - ¥{{ state.finance.user_balance_float }} + ② 当前汇率单价 (1豆): +
+ ¥{{ state.madow.current_rate }} + (每万豆约 ¥{{ state.madow.rate_per_wan }}) +
+
+
+ ③ 汇率计算公式: + 0.00000075 × {{ state.madow.history_order_n }} 单
- ③ 待审核打款准备金: - ¥{{ state.finance.pending_withdraw_amount }} + 算法:基础汇率 × 累计完成单数 N + 日结池明细 →
diff --git a/public/assets/js/backend/shopro/dashboard.js b/public/assets/js/backend/shopro/dashboard.js index bd6997c..85df25a 100644 --- a/public/assets/js/backend/shopro/dashboard.js +++ b/public/assets/js/backend/shopro/dashboard.js @@ -50,7 +50,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'moment'], function ( inactive_count: 0, active_rate: 0, role_list: [], - role_stats: {} + role_stats: {}, + role_names: { + taster: '品酒师', + maker: '创客', + venue: '酒道馆', + county: '区县代理', + partner: '合伙股东', + } }, finance: { commission_float: '0.00', diff --git a/uniapp/pages/commission/components/commission-info.vue b/uniapp/pages/commission/components/commission-info.vue index f61efdd..570c7ad 100644 --- a/uniapp/pages/commission/components/commission-info.vue +++ b/uniapp/pages/commission/components/commission-info.vue @@ -22,6 +22,7 @@ {{ roleNames.venue || '酒道馆' }} {{ roleNames.county || '区县' }} + {{ roleNames.partner || '合伙股东' }} diff --git a/uniapp/pages/commission/team.vue b/uniapp/pages/commission/team.vue index 1239492..ce2b5f1 100644 --- a/uniapp/pages/commission/team.vue +++ b/uniapp/pages/commission/team.vue @@ -229,6 +229,12 @@ > {{ roleNames.county || '区县代理' }} + + {{ roleNames.partner || '合伙股东' }} + @@ -411,6 +417,12 @@ > {{ roleNames.county || '区县代理' }} + + {{ roleNames.partner || '合伙股东' }} + @@ -1277,6 +1289,9 @@ &.tag-county { background: #b45309; } + &.tag-partner { + background: #dc2626; + } } // 空状态