bztang
/
bztang-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加：贡献值分红提现设置、积分活动提现设置、每日红包-额外奖励提现设置、分享奖励提现设置、服务津贴提现设置 

修复：微社区提现设置无效的问题
This commit is contained in:
wuhui_zzw 2023-12-04 13:35:34 +08:00
parent 0e7fc6b7fb
commit 40e10dbd9a
19 changed files with 482 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/commission/src/widgets/CommissionWithdrawWidget.php
View File

@ -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();
}
}

85
plugins/commission/views/admin/withdraw-set.blade.php
View File

@ -1,4 +1,10 @@
<link rel="stylesheet" type="text/css" href="{{static_url('yunshop/goods/vue-goods1.css')}}"/>
<div class='panel panel-default'>
{{--分销佣金提现设置--}}
<div class="vue-main-title">
<div class="vue-main-title-left"></div>
<div class="vue-main-title-content">{{ trans('Yunshop\Commission::index.tab_income') }}设置</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
@ -7,7 +13,6 @@
<span class="help-block">当前分销商的佣金达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
@ -28,23 +33,18 @@
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label"></label>
<div class="col-sm-9 col-xs-12">
<div class="cost">
<label class='radio-inline'>
<div class="input-group">
<div class="input-group-addon" id="commission_poundage_hint"
style="width: 120px;">@if($set['poundage_type'] == 1) 固定金额 @else
手续费比例 @endif</div>
<input type="text" name="withdraw[commission][poundage_rate]"
class="form-control" value="{{ $set['poundage_rate'] ?? '' }}"
placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="commission_poundage_unit">@if($set['poundage_type'] == 1) 元 @else
% @endif</div>
</div>
</label>
<div class="input-group">
<div class="input-group-addon" id="commission_poundage_hint"
style="width: 120px;">@if($set['poundage_type'] == 1) 固定金额 @else
手续费比例 @endif</div>
<input type="text" name="withdraw[commission][poundage_rate]"
class="form-control" value="{{ $set['poundage_rate'] ?? '' }}"
placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="commission_poundage_unit">@if($set['poundage_type'] == 1) 元 @else
% @endif</div>
</div>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">最高提现额度</label>
<div class="col-sm-9 col-xs-12">
@ -53,7 +53,6 @@
<span class="help-block">当前分销商的佣金每天最高提现此额度，超过则只能到此额度</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">最高提现次数</label>
<div class="col-sm-9 col-xs-12">
@ -62,6 +61,48 @@
<span class="help-block">当前分销商的佣金每天最高提现次数，超过则不能提现</span>
</div>
</div>
{{--分享奖励提现设置--}}
<div class="vue-main-title">
<div class="vue-main-title-left"></div>
<div class="vue-main-title-content">分享奖励设置</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
<input type="text" name="withdraw[commission_share_reward][roll_out_limit]" class="form-control" value="{{$commissionShareReward['roll_out_limit']}}"/>
<span class="help-block">当前分销商的佣金达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
<div class="switch">
<label class='radio-inline'>
<input type='radio' name='withdraw[commission_share_reward][poundage_type]' value='1' @if($commissionShareReward['poundage_type'] == 1) checked @endif />
固定金额
</label>
<label class='radio-inline'>
<input type='radio' name='withdraw[commission_share_reward][poundage_type]' value='0' @if(empty($commissionShareReward['poundage_type'])) checked @endif />
手续费比例
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label"></label>
<div class="col-sm-9 col-xs-12">
<div class="input-group">
<div class="input-group-addon" id="commission_share_reward_poundage_hint" style="width: 120px;">
@if($commissionShareReward['poundage_type'] == 1) 固定金额 @else 手续费比例 @endif
</div>
<input type="text" name="withdraw[commission_share_reward][poundage_rate]" class="form-control" value="{{ $commissionShareReward['poundage_rate'] ?? '' }}" placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="commission_share_reward_poundage_unit">
@if($commissionShareReward['poundage_type'] == 1) 元 @else % @endif
</div>
</div>
</div>
</div>
</div>
<script language="javascript">
$(function () {
@ -75,5 +116,17 @@
$("#commission_poundage_hint").html('手续费比例')
}
});
$(":radio[name='withdraw[commission_share_reward][poundage_type]']").click(function () {
if ($(this).val() == 1) {
$("#commission_share_reward_poundage_unit").html('元');
$("#commission_share_reward_poundage_hint").html('固定金额');
}
else {
$("#commission_share_reward_poundage_unit").html('%');
$("#commission_share_reward_poundage_hint").html('手续费比例')
}
});
})
</script>

4
plugins/cultural-space/src/PluginApplication.php
View File

@ -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,

20
plugins/cultural-space/src/admin/widget/CulturalSpaceWithdrawWidget.php Normal file
View File

@ -0,0 +1,20 @@
<?php
namespace Yunshop\CulturalSpace\admin\widget;
use app\common\components\Widget;
use app\common\facades\Setting;
class CulturalSpaceWithdrawWidget extends Widget
{
public function run()
{
$set = Setting::get('withdraw.contributionBonus', ['roll_out_limit' => '', 'poundage_rate' => '']);
return view('Yunshop\CulturalSpace::widget.withdraw.set', [
'set' => $set,
])->render();
}
}

57
plugins/cultural-space/views/widget/withdraw/set.blade.php Normal file
View File

@ -0,0 +1,57 @@
<div class='panel panel-default'>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
<input type="text" name="withdraw[contributionBonus][roll_out_limit]" class="form-control" value="{{$set['roll_out_limit']}}"/>
<span class="help-block">当前分销商的佣金达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
<div class="switch">
<label class='radio-inline'>
<input type='radio' name='withdraw[contributionBonus][poundage_type]' value='1' @if($set['poundage_type'] == 1) checked @endif />
固定金额
</label>
<label class='radio-inline'>
<input type='radio' name='withdraw[contributionBonus][poundage_type]' value='0' @if(empty($set['poundage_type'])) checked @endif />
手续费比例
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label"></label>
<div class="col-sm-9 col-xs-12">
<div class="cost">
<label class='radio-inline'>
<div class="input-group">
<div class="input-group-addon" id="contributionBonus_poundage_hint" style="width: 120px;">
@if($set['poundage_type'] == 1) 固定金额 @else 手续费比例 @endif
</div>
<input type="text" name="withdraw[contributionBonus][poundage_rate]" class="form-control" value="{{ $set['poundage_rate'] ?? '' }}" placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="contributionBonus_poundage_unit">
@if($set['poundage_type'] == 1) 元 @else % @endif
</div>
</div>
</label>
</div>
</div>
</div>
</div>
<script language="javascript">
$(function () {
$(":radio[name='withdraw[contributionBonus][poundage_type]']").click(function () {
if ($(this).val() == 1) {
$("#contributionBonus_poundage_unit").html('元');
$("#contributionBonus_poundage_hint").html('固定金额');
}
else {
$("#contributionBonus_poundage_unit").html('%');
$("#contributionBonus_poundage_hint").html('手续费比例')
}
});
})
</script>

2
plugins/micro-communities/src/PluginApplication.php
View File

@ -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'
]];
}

2
plugins/micro-communities/src/widgets/WithdrawWidget.php
View File

@ -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();

22
plugins/micro-communities/views/admin/withdraw/index.blade.php
View File

@ -2,7 +2,7 @@
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
<input type="text" name="withdraw[micro_communities_withdraw][roll_out_limit]" class="form-control"
<input type="text" name="withdraw[microCommunities][roll_out_limit]" class="form-control"
value="{{$set['roll_out_limit']}}"/>
<span class="help-block">奖励金额达到此额度时才能提现</span>
</div>
@ -13,12 +13,12 @@
<div class="col-sm-9 col-xs-12">
<div class="switch">
<label class='radio-inline'>
<input type='radio' name='withdraw[micro_communities_withdraw][poundage_type]' value='1'
<input type='radio' name='withdraw[microCommunities][poundage_type]' value='1'
@if($set['poundage_type'] == 1) checked @endif />
固定金额
</label>
<label class='radio-inline'>
<input type='radio' name='withdraw[micro_communities_withdraw][poundage_type]' value='0'
<input type='radio' name='withdraw[microCommunities][poundage_type]' value='0'
@if(empty($set['poundage_type'])) checked @endif />
手续费比例
</label>
@ -31,13 +31,13 @@
<div class="cost">
<label class='radio-inline'>
<div class="input-group">
<div class="input-group-addon" id="micro_communities_withdraw_poundage_hint"
<div class="input-group-addon" id="microCommunities_poundage_hint"
style="width: 120px;">@if($set['poundage_type'] == 1) 固定金额 @else
手续费比例 @endif</div>
<input type="text" name="withdraw[micro_communities_withdraw][poundage_rate]"
<input type="text" name="withdraw[microCommunities][poundage_rate]"
class="form-control" value="{{ $set['poundage_rate'] ?? '' }}"
placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="micro_communities_withdraw_poundage_unit">@if($set['poundage_type'] == 1) 元 @else
<div class="input-group-addon" id="microCommunities_poundage_unit">@if($set['poundage_type'] == 1) 元 @else
% @endif</div>
</div>
</label>
@ -47,14 +47,14 @@
</div>
<script language="javascript">
$(function () {
$(":radio[name='withdraw[micro_communities_withdraw][poundage_type]']").click(function () {
$(":radio[name='withdraw[microCommunities][poundage_type]']").click(function () {
if ($(this).val() == 1) {
$("#micro_communities_withdraw_poundage_unit").html('元');
$("#micro_communities_withdraw_poundage_hint").html('固定金额');
$("#microCommunities_poundage_unit").html('元');
$("#microCommunities_poundage_hint").html('固定金额');
}
else {
$("#micro_communities_withdraw_poundage_unit").html('%');
$("#micro_communities_withdraw_poundage_hint").html('手续费比例')
$("#microCommunities_poundage_unit").html('%');
$("#microCommunities_poundage_hint").html('手续费比例')
}
});
})

20
plugins/point-activity/src/Backend/Controllers/PointActivityWithdrawWidget.php Normal file
View File

@ -0,0 +1,20 @@
<?php
namespace Yunshop\PointActivity\Backend\Controllers;
use app\common\components\Widget;
use app\common\facades\Setting;
class PointActivityWithdrawWidget extends Widget
{
public function run()
{
$set = Setting::get('withdraw.pointActivity', ['roll_out_limit' => '', 'poundage_rate' => '']);
return view('Yunshop\PointActivity::widget.withdraw.set', [
'set' => $set,
])->render();
}
}

4
plugins/point-activity/src/PluginApplication.php
View File

@ -44,6 +44,10 @@ class PluginApplication extends \app\common\services\PluginApplication
public function getWidgetItems()
{
return [
'withdraw.point_activity' => [
'title' => '积分活动提现',
'class' => 'Yunshop\PointActivity\Backend\Controllers\PointActivityWithdrawWidget',
],
'vue-goods.point_activity' => [
'title' => '积分活动奖励',
'class' => \Yunshop\PointActivity\Backend\widgets\PointActivityVueWidget::class

57
plugins/point-activity/views/widget/withdraw/set.blade.php Normal file
View File

@ -0,0 +1,57 @@
<div class='panel panel-default'>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
<input type="text" name="withdraw[pointActivity][roll_out_limit]" class="form-control" value="{{$set['roll_out_limit']}}"/>
<span class="help-block">当前分销商的佣金达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
<div class="switch">
<label class='radio-inline'>
<input type='radio' name='withdraw[pointActivity][poundage_type]' value='1' @if($set['poundage_type'] == 1) checked @endif />
固定金额
</label>
<label class='radio-inline'>
<input type='radio' name='withdraw[pointActivity][poundage_type]' value='0' @if(empty($set['poundage_type'])) checked @endif />
手续费比例
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label"></label>
<div class="col-sm-9 col-xs-12">
<div class="cost">
<label class='radio-inline'>
<div class="input-group">
<div class="input-group-addon" id="pointActivity_poundage_hint" style="width: 120px;">
@if($set['poundage_type'] == 1) 固定金额 @else 手续费比例 @endif
</div>
<input type="text" name="withdraw[pointActivity][poundage_rate]" class="form-control" value="{{ $set['poundage_rate'] ?? '' }}" placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="pointActivity_poundage_unit">
@if($set['poundage_type'] == 1) 元 @else % @endif
</div>
</div>
</label>
</div>
</div>
</div>
</div>
<script language="javascript">
$(function () {
$(":radio[name='withdraw[pointActivity][poundage_type]']").click(function () {
if ($(this).val() == 1) {
$("#pointActivity_poundage_unit").html('元');
$("#pointActivity_poundage_hint").html('固定金额');
}
else {
$("#pointActivity_poundage_unit").html('%');
$("#pointActivity_poundage_hint").html('手续费比例')
}
});
})
</script>

2
plugins/red-packet/src/widgets/RedPacketWithdrawWidget.php
View File

@ -10,8 +10,10 @@ class RedPacketWithdrawWidget extends Widget
public function run()
{
$set = Setting::get('withdraw.RedPacket', ['roll_out_limit' => '', 'poundage_rate' => '']);
$bonusSet = Setting::get('withdraw.RedPacketBonus', ['roll_out_limit' => '', 'poundage_rate' => '']);
return view('Yunshop\RedPacket::admin.withdraw-set', [
'set' => $set,
'bonusSet' => $bonusSet,
])->render();
}
}

73
plugins/red-packet/views/admin/withdraw-set.blade.php
View File

@ -1,4 +1,10 @@
<link rel="stylesheet" type="text/css" href="{{static_url('yunshop/goods/vue-goods1.css')}}"/>
<div class='panel panel-default'>
{{--每日红包提现--}}
<div class="vue-main-title">
<div class="vue-main-title-left"></div>
<div class="vue-main-title-content">每日红包提现设置</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
@ -7,7 +13,6 @@
<span class="help-block">当前每天红包金额达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
@ -47,6 +52,61 @@
</div>
</div>
</div>
{{--每日红包额外奖励提现--}}
<div class="vue-main-title">
<div class="vue-main-title-left"></div>
<div class="vue-main-title-content">每日红包额外奖励提现</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
<input type="text" name="withdraw[RedPacketBonus][roll_out_limit]" class="form-control"
value="{{$bonusSet['roll_out_limit']}}"/>
<span class="help-block">当前每天红包金额达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
<div class="switch">
<label class='radio-inline'>
<input type='radio' name='withdraw[RedPacketBonus][poundage_type]' value='1'
@if($bonusSet['poundage_type'] == 1) checked @endif />
固定金额
</label>
<label class='radio-inline'>
<input type='radio' name='withdraw[RedPacketBonus][poundage_type]' value='0'
@if(empty($bonusSet['poundage_type'])) checked @endif />
手续费比例
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label"></label>
<div class="col-sm-9 col-xs-12">
<div class="cost">
<label class='radio-inline'>
<div class="input-group">
<div class="input-group-addon" id="RedPacketBonus_poundage_hint"
style="width: 120px;">@if($bonusSet['poundage_type'] == 1) 固定金额 @else
手续费比例 @endif
</div>
<input type="text" name="withdraw[RedPacketBonus][poundage_rate]"
class="form-control" value="{{ $bonusSet['poundage_rate'] ?? '' }}"
placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="RedPacketBonus_poundage_unit">
@if($bonusSet['poundage_type'] == 1) 元 @else
% @endif
</div>
</div>
</label>
</div>
</div>
</div>
</div>
<script language="javascript">
$(function () {
@ -60,5 +120,16 @@
$("#redPacket_poundage_hint").html('手续费比例');
}
});
$(":radio[name='withdraw[RedPacketBonus][poundage_type]']").click(function () {
if ($(this).val() == 1) {
$("#RedPacketBonus_poundage_unit").html('元');
$("#RedPacketBonus_poundage_hint").html('固定金额');
}
else {
$("#RedPacketBonus_poundage_unit").html('%');
$("#RedPacketBonus_poundage_hint").html('手续费比例');
}
});
})
</script>

2
plugins/shareholder-dividend/src/widgets/ShareholderWithdrawWidget.php
View File

@ -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();
}
}

70
plugins/shareholder-dividend/views/admin/withdraw-set.blade.php
View File

@ -1,4 +1,10 @@
<link rel="stylesheet" type="text/css" href="{{static_url('yunshop/goods/vue-goods1.css')}}"/>
<div class='panel panel-default'>
{{--股东分红提现设置--}}
<div class="vue-main-title">
<div class="vue-main-title-left"></div>
<div class="vue-main-title-content">{{ SHAREHOLDER_DIVIDEND_CUSTOM_NAME }}提现设置</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
@ -7,7 +13,6 @@
<span class="help-block">当前股东分红金额达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
@ -44,6 +49,58 @@
</div>
</div>
</div>
{{--加权收益提现设置--}}
<div class="vue-main-title">
<div class="vue-main-title-left"></div>
<div class="vue-main-title-content">加权收益提现设置</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
<input type="text" name="withdraw[weight_income][roll_out_limit]" class="form-control" value="{{$weightIncomeSet['roll_out_limit']}}"/>
<span class="help-block">当前股东分红金额达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
<div class="switch">
<label class='radio-inline'>
<input type='radio' name='withdraw[weight_income][poundage_type]' value='1'
@if($weightIncomeSet['poundage_type'] == 1) checked @endif />
固定金额
</label>
<label class='radio-inline'>
<input type='radio' name='withdraw[weight_income][poundage_type]' value='0'
@if(empty($weightIncomeSet['poundage_type'])) checked @endif />
手续费比例
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label"></label>
<div class="col-sm-9 col-xs-12">
<div class="cost">
<label class='radio-inline'>
<div class="input-group">
<div class="input-group-addon" id="weight_income_poundage_hint" style="width: 120px;">
@if($weightIncomeSet['poundage_type'] == 1) 固定金额 @else 手续费比例 @endif
</div>
<input type="text" name="withdraw[weight_income][poundage_rate]" class="form-control" value="{{ $weightIncomeSet['poundage_rate'] ?? '' }}" placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="weight_income_poundage_unit">
@if($weightIncomeSet['poundage_type'] == 1) 元 @else % @endif
</div>
</div>
</label>
</div>
</div>
</div>
</div>
<script language="javascript">
$(function () {
@ -57,5 +114,16 @@
$("#shaerholderDividend_poundage_hint").html('手续费比例')
}
});
$(":radio[name='withdraw[weight_income][poundage_type]']").click(function () {
if ($(this).val() == 1) {
$("#weight_income_poundage_unit").html('元');
$("#weight_income_poundage_hint").html('固定金额');
}
else {
$("#weight_income_poundage_unit").html('%');
$("#weight_income_poundage_hint").html('手续费比例')
}
});
})
</script>

12
plugins/team-dividend/src/PluginApplication.php
View File

@ -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',

2
plugins/team-dividend/src/widgets/TeamDividendWithdrawWidget.php
View File

@ -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();
}
}

69
plugins/team-dividend/views/admin/withdraw-set.blade.php
View File

@ -1,4 +1,10 @@
<link rel="stylesheet" type="text/css" href="{{static_url('yunshop/goods/vue-goods1.css')}}"/>
<div class='panel panel-default'>
{{--经销商提成提现设置--}}
<div class="vue-main-title">
<div class="vue-main-title-left"></div>
<div class="vue-main-title-content">{{ trans('Yunshop\TeamDividend::index.withdraw') }}设置</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
@ -7,7 +13,6 @@
<span class="help-block">当前代理的佣金达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
@ -44,6 +49,56 @@
</div>
</div>
</div>
{{--服务津贴提现设置--}}
<div class="vue-main-title">
<div class="vue-main-title-left"></div>
<div class="vue-main-title-content">服务津贴提现设置</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现额度</label>
<div class="col-sm-9 col-xs-12">
<input type="text" name="withdraw[teamDividendCultural][roll_out_limit]" class="form-control"
value="{{$teamDividendCulturalSet['roll_out_limit']}}"/>
<span class="help-block">当前代理的佣金达到此额度时才能提现</span>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">提现手续费</label>
<div class="col-sm-9 col-xs-12">
<div class="switch">
<label class='radio-inline'>
<input type='radio' name='withdraw[teamDividendCultural][poundage_type]' value='1'
@if($teamDividendCulturalSet['poundage_type'] == 1) checked @endif />
固定金额
</label>
<label class='radio-inline'>
<input type='radio' name='withdraw[teamDividendCultural][poundage_type]' value='0'
@if(empty($teamDividendCulturalSet['poundage_type'])) checked @endif />
手续费比例
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label"></label>
<div class="col-sm-9 col-xs-12">
<div class="cost">
<label class='radio-inline'>
<div class="input-group">
<div class="input-group-addon" id="teamDividendCultural_poundage_hint" style="width: 120px;">
@if($teamDividendCulturalSet['poundage_type'] == 1) 固定金额 @else 手续费比例 @endif
</div>
<input type="text" name="withdraw[teamDividendCultural][poundage_rate]" class="form-control" value="{{ $teamDividendCulturalSet['poundage_rate'] ?? '' }}" placeholder="请输入提现手续费计算值"/>
<div class="input-group-addon" id="teamDividendCultural_poundage_unit">
@if($teamDividendCulturalSet['poundage_type'] == 1) 元 @else % @endif
</div>
</div>
</label>
</div>
</div>
</div>
</div>
<script language="javascript">
$(function () {
@ -57,5 +112,17 @@
$("#teamDividend_poundage_hint").html('手续费比例')
}
});
$(":radio[name='withdraw[teamDividendCultural][poundage_type]']").click(function () {
if ($(this).val() == 1) {
$("#teamDividendCultural_poundage_unit").html('元');
$("#teamDividendCultural_poundage_hint").html('固定金额');
}
else {
$("#teamDividendCultural_poundage_unit").html('%');
$("#teamDividendCultural_poundage_hint").html('手续费比例')
}
});
})
</script>

16
resources/views/finance/withdraw/withdraw-income.blade.php
View File

@ -673,11 +673,25 @@
</label>
@endfor
</div>
</div>
</div>
<div class="tab-pane active">
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">可提现时间</label>
<div class="col-sm-10 col-xs-12">
<div class="input-group" style="width: 40%!important;">
<input type="text" name="withdraw[income][withdraw_date_time_start]" class="form-control" value="{{ $set['withdraw_date_time_start'] ?? ''}}" placeholder="请输入可提现开始时间"/>
<div class="input-group-addon">时 至 </div>
<input type="text" name="withdraw[income][withdraw_date_time_end]" class="form-control" value="{{ $set['withdraw_date_time_end'] ?? ''}}" placeholder="请输入可提现结束时间"/>
<div class="input-group-addon">时</div>
</div>
<span class='help-block'>当前可提现时间，例如：9至17，则代表只能在9时0分0秒至17时0分0秒(下午5时0分0秒)进行提现申请。为空则默认为当天0时0分0秒至23时59分59秒可以提现</span>
</div>
</div>
</div>
<div class="tab-pane active">
<div class="form-group">
<label class="col-xs-12 col-sm-3 col-md-2 control-label">劳务税显示</label>