From 40e10dbd9a66a43aeebfa730060d73a24ae5897e Mon Sep 17 00:00:00 2001 From: wuhui_zzw <1760308791@qq.com> Date: Mon, 4 Dec 2023 13:35:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=B4=A1=E7=8C=AE?= =?UTF-8?q?=E5=80=BC=E5=88=86=E7=BA=A2=E6=8F=90=E7=8E=B0=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E3=80=81=E7=A7=AF=E5=88=86=E6=B4=BB=E5=8A=A8=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E3=80=81=E6=AF=8F=E6=97=A5=E7=BA=A2=E5=8C=85?= =?UTF-8?q?-=E9=A2=9D=E5=A4=96=E5=A5=96=E5=8A=B1=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E3=80=81=E5=88=86=E4=BA=AB=E5=A5=96=E5=8A=B1?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AE=BE=E7=BD=AE=E3=80=81=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=B4=A5=E8=B4=B4=E6=8F=90=E7=8E=B0=E8=AE=BE=E7=BD=AE=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=BE=AE=E7=A4=BE=E5=8C=BA=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/widgets/CommissionWithdrawWidget.php | 2 + .../views/admin/withdraw-set.blade.php | 85 +++++++++++++++---- .../cultural-space/src/PluginApplication.php | 4 + .../widget/CulturalSpaceWithdrawWidget.php | 20 +++++ .../views/widget/withdraw/set.blade.php | 57 +++++++++++++ .../src/PluginApplication.php | 2 +- .../src/widgets/WithdrawWidget.php | 2 +- .../views/admin/withdraw/index.blade.php | 22 ++--- .../PointActivityWithdrawWidget.php | 20 +++++ .../point-activity/src/PluginApplication.php | 4 + .../views/widget/withdraw/set.blade.php | 57 +++++++++++++ .../src/widgets/RedPacketWithdrawWidget.php | 2 + .../views/admin/withdraw-set.blade.php | 73 +++++++++++++++- .../src/widgets/ShareholderWithdrawWidget.php | 2 + .../views/admin/withdraw-set.blade.php | 70 ++++++++++++++- .../team-dividend/src/PluginApplication.php | 12 +-- .../widgets/TeamDividendWithdrawWidget.php | 2 + .../views/admin/withdraw-set.blade.php | 69 ++++++++++++++- .../withdraw/withdraw-income.blade.php | 16 +++- 19 files changed, 482 insertions(+), 39 deletions(-) create mode 100644 plugins/cultural-space/src/admin/widget/CulturalSpaceWithdrawWidget.php create mode 100644 plugins/cultural-space/views/widget/withdraw/set.blade.php create mode 100644 plugins/point-activity/src/Backend/Controllers/PointActivityWithdrawWidget.php create mode 100644 plugins/point-activity/views/widget/withdraw/set.blade.php diff --git a/plugins/commission/src/widgets/CommissionWithdrawWidget.php b/plugins/commission/src/widgets/CommissionWithdrawWidget.php index 313d1328..f421cf37 100644 --- a/plugins/commission/src/widgets/CommissionWithdrawWidget.php +++ b/plugins/commission/src/widgets/CommissionWithdrawWidget.php @@ -15,8 +15,10 @@ class CommissionWithdrawWidget extends Widget public function run() { $set = Setting::get('withdraw.commission', ['roll_out_limit' => '', 'poundage_rate' => '', 'max_roll_out_limit' => '', 'max_time_out_limit' => '']); + $commissionShareReward = Setting::get('withdraw.commission_share_reward', ['roll_out_limit' => '', 'poundage_rate' => '']); return view('Yunshop\Commission::admin.withdraw-set', [ 'set' => $set, + 'commissionShareReward' => $commissionShareReward ])->render(); } } \ No newline at end of file diff --git a/plugins/commission/views/admin/withdraw-set.blade.php b/plugins/commission/views/admin/withdraw-set.blade.php index a1bcdd7b..7b1796b0 100644 --- a/plugins/commission/views/admin/withdraw-set.blade.php +++ b/plugins/commission/views/admin/withdraw-set.blade.php @@ -1,4 +1,10 @@ +
+ {{--分销佣金提现设置--}} +
+
+
{{ trans('Yunshop\Commission::index.tab_income') }}设置
+
@@ -7,7 +13,6 @@ 当前分销商的佣金达到此额度时才能提现
-
@@ -28,23 +33,18 @@
-
- +
+
@if($set['poundage_type'] == 1) 固定金额 @else + 手续费比例 @endif
+ +
@if($set['poundage_type'] == 1) 元 @else + % @endif
-
@@ -53,7 +53,6 @@ 当前分销商的佣金每天最高提现此额度，超过则只能到此额度
-
@@ -62,6 +61,48 @@ 当前分销商的佣金每天最高提现次数，超过则不能提现
+ {{--分享奖励提现设置--}} +
+
+
分享奖励设置
+
+
+ +
+ + 当前分销商的佣金达到此额度时才能提现 +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+
+ @if($commissionShareReward['poundage_type'] == 1) 固定金额 @else 手续费比例 @endif +
+ +
+ @if($commissionShareReward['poundage_type'] == 1) 元 @else % @endif +
+
+
+
+
diff --git a/plugins/cultural-space/src/PluginApplication.php b/plugins/cultural-space/src/PluginApplication.php index f169b721..e3ac7bb3 100644 --- a/plugins/cultural-space/src/PluginApplication.php +++ b/plugins/cultural-space/src/PluginApplication.php @@ -124,6 +124,10 @@ class PluginApplication extends \app\common\services\PluginApplication{ public function getWidgetItems() { return [ + 'withdraw.contribution_bonus' => [ + 'title' => '贡献值分红提现', + 'class' => 'Yunshop\CulturalSpace\admin\widget\CulturalSpaceWithdrawWidget', + ], 'vue-goods.cultural_space' => [ 'title' => '文创空间', 'class' => \Yunshop\CulturalSpace\admin\widget\CulturalSpaceWidget::class, diff --git a/plugins/cultural-space/src/admin/widget/CulturalSpaceWithdrawWidget.php b/plugins/cultural-space/src/admin/widget/CulturalSpaceWithdrawWidget.php new file mode 100644 index 00000000..4f5ab106 --- /dev/null +++ b/plugins/cultural-space/src/admin/widget/CulturalSpaceWithdrawWidget.php @@ -0,0 +1,20 @@ + '', 'poundage_rate' => '']); + + return view('Yunshop\CulturalSpace::widget.withdraw.set', [ + 'set' => $set, + ])->render(); + } +} \ No newline at end of file diff --git a/plugins/cultural-space/views/widget/withdraw/set.blade.php b/plugins/cultural-space/views/widget/withdraw/set.blade.php new file mode 100644 index 00000000..d90ab327 --- /dev/null +++ b/plugins/cultural-space/views/widget/withdraw/set.blade.php @@ -0,0 +1,57 @@ +
+
+ +
+ + 当前分销商的佣金达到此额度时才能提现 +
+
+ +
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
+
+
+ diff --git a/plugins/micro-communities/src/PluginApplication.php b/plugins/micro-communities/src/PluginApplication.php index 4332400b..286dcdd1 100644 --- a/plugins/micro-communities/src/PluginApplication.php +++ b/plugins/micro-communities/src/PluginApplication.php @@ -65,7 +65,7 @@ class PluginApplication extends \app\common\services\PluginApplication public function getWidgetItems() { return ['withdraw.tab_micro_communities' => [ - 'title' => '微社区', + 'title' => '微社区提现', 'class' => 'Yunshop\MicroCommunities\widgets\WithdrawWidget' ]]; } diff --git a/plugins/micro-communities/src/widgets/WithdrawWidget.php b/plugins/micro-communities/src/widgets/WithdrawWidget.php index 0f474463..f3be672e 100644 --- a/plugins/micro-communities/src/widgets/WithdrawWidget.php +++ b/plugins/micro-communities/src/widgets/WithdrawWidget.php @@ -13,7 +13,7 @@ class WithdrawWidget extends Widget { public function run() { - $set = Setting::get('withdraw.micro_communities_withdraw', ['roll_out_limit' => '', 'poundage_rate' => '']); + $set = Setting::get('withdraw.microCommunities', ['roll_out_limit' => '', 'poundage_rate' => '']); return view('Yunshop\MicroCommunities::admin.withdraw.index', [ 'set' => $set, ])->render(); diff --git a/plugins/micro-communities/views/admin/withdraw/index.blade.php b/plugins/micro-communities/views/admin/withdraw/index.blade.php index fa8d9cc5..da5b674d 100644 --- a/plugins/micro-communities/views/admin/withdraw/index.blade.php +++ b/plugins/micro-communities/views/admin/withdraw/index.blade.php @@ -2,7 +2,7 @@
- 奖励金额达到此额度时才能提现
@@ -13,12 +13,12 @@
@@ -31,13 +31,13 @@
diff --git a/plugins/shareholder-dividend/src/widgets/ShareholderWithdrawWidget.php b/plugins/shareholder-dividend/src/widgets/ShareholderWithdrawWidget.php index e4696817..6e3d8717 100644 --- a/plugins/shareholder-dividend/src/widgets/ShareholderWithdrawWidget.php +++ b/plugins/shareholder-dividend/src/widgets/ShareholderWithdrawWidget.php @@ -18,8 +18,10 @@ class ShareholderWithdrawWidget extends Widget public function run() { $set = Setting::get('withdraw.shaerholderDividend', ['roll_out_limit' => '', 'poundage_rate' => '']); + $weightIncomeSet = Setting::get('withdraw.weight_income', ['roll_out_limit' => '', 'poundage_rate' => '']); return view('Yunshop\ShareholderDividend::admin.withdraw-set', [ 'set' => $set, + 'weightIncomeSet' => $weightIncomeSet ])->render(); } } \ No newline at end of file diff --git a/plugins/shareholder-dividend/views/admin/withdraw-set.blade.php b/plugins/shareholder-dividend/views/admin/withdraw-set.blade.php index cdde42e7..c3ba1168 100644 --- a/plugins/shareholder-dividend/views/admin/withdraw-set.blade.php +++ b/plugins/shareholder-dividend/views/admin/withdraw-set.blade.php @@ -1,4 +1,10 @@ +
+ {{--股东分红提现设置--}} +
+
+
{{ SHAREHOLDER_DIVIDEND_CUSTOM_NAME }}提现设置
+
@@ -7,7 +13,6 @@ 当前股东分红金额达到此额度时才能提现
-
@@ -44,6 +49,58 @@
+ {{--加权收益提现设置--}} +
+
+
加权收益提现设置
+
+
+ +
+ + 当前股东分红金额达到此额度时才能提现 +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
+
+ + + + +
diff --git a/plugins/team-dividend/src/PluginApplication.php b/plugins/team-dividend/src/PluginApplication.php index b736bad3..e2d1eac2 100644 --- a/plugins/team-dividend/src/PluginApplication.php +++ b/plugins/team-dividend/src/PluginApplication.php @@ -653,12 +653,12 @@ class PluginApplication extends \app\common\services\PluginApplication 'type_name' => $title.$dividend, 'class' => 'Yunshop\TeamDividend\models\TeamDividendModel', ], - 'storeManager' => [ - 'title' => '店补', - 'type' => 'storeManager', - 'type_name' => '店长店补', - 'class' => 'Yunshop\TeamDividend\Common\models\StoreManagerRecordModel', - ], + // 'storeManager' => [ + // 'title' => '店补', + // 'type' => 'storeManager', + // 'type_name' => '店长店补', + // 'class' => 'Yunshop\TeamDividend\Common\models\StoreManagerRecordModel', + // ], 'teamDividendCultural' => [ 'title' => $teamDividendCulturalName, 'type' => 'teamDividendCultural', diff --git a/plugins/team-dividend/src/widgets/TeamDividendWithdrawWidget.php b/plugins/team-dividend/src/widgets/TeamDividendWithdrawWidget.php index ee4a8cac..c73d4848 100644 --- a/plugins/team-dividend/src/widgets/TeamDividendWithdrawWidget.php +++ b/plugins/team-dividend/src/widgets/TeamDividendWithdrawWidget.php @@ -10,8 +10,10 @@ class TeamDividendWithdrawWidget extends Widget public function run() { $set = Setting::get('withdraw.teamDividend', ['roll_out_limit' => '', 'poundage_rate' => '']); + $teamDividendCulturalSet = Setting::get('withdraw.teamDividendCultural', ['roll_out_limit' => '', 'poundage_rate' => '']); return view('Yunshop\TeamDividend::admin.withdraw-set', [ 'set' => $set, + 'teamDividendCulturalSet' => $teamDividendCulturalSet ])->render(); } } \ No newline at end of file diff --git a/plugins/team-dividend/views/admin/withdraw-set.blade.php b/plugins/team-dividend/views/admin/withdraw-set.blade.php index 73a62f12..9faf2cd8 100644 --- a/plugins/team-dividend/views/admin/withdraw-set.blade.php +++ b/plugins/team-dividend/views/admin/withdraw-set.blade.php @@ -1,4 +1,10 @@ +
+ {{--经销商提成提现设置--}} +
+
+
{{ trans('Yunshop\TeamDividend::index.withdraw') }}设置
+
@@ -7,7 +13,6 @@ 当前代理的佣金达到此额度时才能提现
-
@@ -44,6 +49,56 @@
+ {{--服务津贴提现设置--}} +
+
+
服务津贴提现设置
+
+
+ +
+ + 当前代理的佣金达到此额度时才能提现 +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
+
+ +
diff --git a/resources/views/finance/withdraw/withdraw-income.blade.php b/resources/views/finance/withdraw/withdraw-income.blade.php index 65bce828..5914c3c2 100644 --- a/resources/views/finance/withdraw/withdraw-income.blade.php +++ b/resources/views/finance/withdraw/withdraw-income.blade.php @@ -673,11 +673,25 @@ @endfor
-
+
+
+ +
+
+ +
时 至
+ +
时
+
+ 当前可提现时间，例如：9至17，则代表只能在9时0分0秒至17时0分0秒(下午5时0分0秒)进行提现申请。为空则默认为当天0时0分0秒至23时59分59秒可以提现 +
+
+
+