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

优化：分销商添加不可升级选项

This commit is contained in:
wuhui_zzw 2023-02-24 10:00:19 +08:00
parent 11bd724941
commit 9a2fd36264
7 changed files with 77 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addon/fenxiao/model/Fenxiao.php
View File

@ -516,7 +516,7 @@ class Fenxiao extends BaseModel
$upgrade_level = $item;
break;
}
} else {
} else if ($item[ 'upgrade_type' ] == 1) {
if (( $fenxiao_info[ 'order_num' ] >= $item[ 'order_num' ] && $item[ 'order_num' ] > 0 ) || ( $fenxiao_info[ 'order_money' ] >= $item[ 'order_money' ] && $item[ 'order_money' ] > 0 ) || ( $fenxiao_info[ 'one_fenxiao_order_num' ] >= $item[ 'one_fenxiao_order_num' ] && $item[ 'one_fenxiao_order_num' ] > 0 ) || ( $fenxiao_info[ 'one_fenxiao_order_money' ] >= $item[ 'one_fenxiao_order_money' ] && $item[ 'one_fenxiao_order_money' ] > 0 ) || ( $fenxiao_info[ 'one_fenxiao_total_order' ] >= $item[ 'one_fenxiao_total_order' ] && $item[ 'one_fenxiao_total_order' ] > 0 ) || ( $fenxiao_info[ 'one_child_num' ] >= $item[ 'one_child_num' ] && $item[ 'one_child_num' ] > 0 ) || ( $fenxiao_info[ 'one_child_fenxiao_num' ] >= $item[ 'one_child_fenxiao_num' ] && $item[ 'one_child_fenxiao_num' ] > 0 )) {
$upgrade_level = $item;
break;

2
addon/fenxiao/shop/controller/Level.php
View File

@ -32,7 +32,7 @@ class Level extends BaseShop
$page = input('page', 1);
$page_size = input('page_size', PAGE_LIST_ROWS);
$list = $model->getLevelPageList([ [ 'site_id', '=', $this->site_id ], ['is_default', '=', 0] ], $page, $page_size, 'level_num asc,one_rate asc', $field);
$list = $model->getLevelPageList([ [ 'site_id', '=', $this->site_id ] ], $page, $page_size, 'level_num asc,one_rate asc', $field);
if (!empty($list[ 'data' ][ 'list' ])) {
foreach ($list[ 'data' ][ 'list' ] as $key => $val) {
$fenxiao_model = new Fenxiao();

51
addon/fenxiao/shop/view/fenxiao/lists.html
View File

@ -229,13 +229,13 @@
templet: '#parent_name',
align:'left'
},
// {
// title: '分销等级',
// unresize: 'false',
// width: '15%',
// templet: '#level_name',
// align:'left'
// },
{
title: '分销等级',
unresize: 'false',
width: '15%',
templet: '#level_name',
align:'left'
},
// {
// title: '佣金账户',
// width:'10%',
@ -258,23 +258,26 @@
templet: function(data){
return data.points;
}
},{
title: '贡献值',
unresize: 'false',
width: '8%',
templet: function(data){
return data.contribution;
}
},{
title: '购房券',
unresize: 'false',
width: '8%',
templet: function(data){
return data.house_purchase;
}
},{
},
// {
//
// title: '贡献值',
// unresize: 'false',
// width: '8%',
// templet: function(data){
// return data.contribution;
// }
// },
// {
//
// title: '购房券',
// unresize: 'false',
// width: '8%',
// templet: function(data){
// return data.house_purchase;
// }
// },
{
field: 'status',
title: '当前状态',
templet: '#status',

40
addon/fenxiao/shop/view/level/add.html
View File

@ -23,14 +23,14 @@
<div class="layui-input-block weight-list">
<span value="1" class="{if in_array(1, $level_weight)}disabled{/if}">一级</span>
<span value="2" class="{if in_array(2, $level_weight)}disabled{/if}">二级</span>
<span value="3" class="{if in_array(3, $level_weight)}disabled{/if}">三级</span>
<span value="4" class="{if in_array(4, $level_weight)}disabled{/if}">四级</span>
<span value="5" class="{if in_array(5, $level_weight)}disabled{/if}">五级</span>
<span value="6" class="{if in_array(6, $level_weight)}disabled{/if}">六级</span>
<span value="7" class="{if in_array(7, $level_weight)}disabled{/if}">七级</span>
<span value="8" class="{if in_array(8, $level_weight)}disabled{/if}">八级</span>
<span value="9" class="{if in_array(9, $level_weight)}disabled{/if}">九级</span>
<span value="10" class="{if in_array(10, $level_weight)}disabled{/if}">十级</span>
<!--<span value="3" class="{if in_array(3, $level_weight)}disabled{/if}">三级</span>-->
<!--<span value="4" class="{if in_array(4, $level_weight)}disabled{/if}">四级</span>-->
<!--<span value="5" class="{if in_array(5, $level_weight)}disabled{/if}">五级</span>-->
<!--<span value="6" class="{if in_array(6, $level_weight)}disabled{/if}">六级</span>-->
<!--<span value="7" class="{if in_array(7, $level_weight)}disabled{/if}">七级</span>-->
<!--<span value="8" class="{if in_array(8, $level_weight)}disabled{/if}">八级</span>-->
<!--<span value="9" class="{if in_array(9, $level_weight)}disabled{/if}">九级</span>-->
<!--<span value="10" class="{if in_array(10, $level_weight)}disabled{/if}">十级</span>-->
</div>
<div class="word-aux">
<p>等级权重越大等级越高</p>
@ -127,10 +127,11 @@
<div class="layui-input-block">
<input type="radio" name="upgrade_type" value="1" lay-filter="withdraw_type" title="满足以下任意条件" checked />
<input type="radio" name="upgrade_type" value="2" lay-filter="withdraw_type" title="满足以下全部条件" />
<input type="radio" name="upgrade_type" value="3" lay-filter="withdraw_type" title="不可升级" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-form-item upgrade_where">
<label class="layui-form-label"></label>
<div class="layui-input-block">
<!-- <button class="layui-btn layui-btn-primary level-btn">分销订单总额<input type="hidden" value="2" /></button> -->
@ -149,7 +150,7 @@
</div>
</div>
<div class="layui-card card-common card-brief">
<div class="layui-card card-common card-brief upgrade_where">
<div class="layui-card-header">
<span class="card-title">升级条件限制</span>
</div>
@ -252,14 +253,14 @@
<div class="layui-form-mid">人</div>
<a href="#" class="text-color layui-form-mid" onclick="delDiv(this)">删除</a>
</div>
<div class="form-row">
<button class="layui-btn" lay-submit lay-filter="save">保存</button>
<button class="layui-btn layui-btn-primary" onclick="back()">返回</button>
</div>
</div>
</div>
<div class="form-row">
<button class="layui-btn" lay-submit lay-filter="save">保存</button>
<button class="layui-btn layui-btn-primary" onclick="back()">返回</button>
</div>
</div>
{/block}
{block name="script"}
@ -302,7 +303,7 @@
layer.msg('请选择等级权重');
return;
}
if(arr==arr1){
if(arr==arr1 && data.field.upgrade_type != 3){
layer.msg('请选择升级条件');
return;
}
@ -368,6 +369,13 @@
}
}
});
// 监听：升级方式 改变
form.on("radio(withdraw_type)", function(data){
if(parseInt(data.value) === 3) $(".upgrade_where").hide();
else $(".upgrade_where").show();
});
});
function delDiv(e) {

40
addon/fenxiao/shop/view/level/edit.html
View File

@ -8,6 +8,7 @@
.weight-list span.active{border-color: #ff8143;}
.weight-list span.disabled{background:#f1f1f1;cursor: not-allowed; }
.layui-btn.layui-btn-primary.level-btn span{margin-left: 5px}
.hide{display: none}
</style>
{/block}
{block name="main"}
@ -25,14 +26,14 @@
<div class="layui-input-block weight-list">
<span value="1" class="{if $info.level_num eq 1}active{/if} {if in_array(1, $level_weight)}disabled{/if}">一级</span>
<span value="2" class="{if $info.level_num eq 2}active{/if} {if in_array(2, $level_weight)}disabled{/if}">二级</span>
<span value="3" class="{if $info.level_num eq 3}active{/if} {if in_array(3, $level_weight)}disabled{/if}">三级</span>
<span value="4" class="{if $info.level_num eq 4}active{/if} {if in_array(4, $level_weight)}disabled{/if}">四级</span>
<span value="5" class="{if $info.level_num eq 5}active{/if} {if in_array(5, $level_weight)}disabled{/if}">五级</span>
<span value="6" class="{if $info.level_num eq 6}active{/if} {if in_array(6, $level_weight)}disabled{/if}">六级</span>
<span value="7" class="{if $info.level_num eq 7}active{/if} {if in_array(7, $level_weight)}disabled{/if}">七级</span>
<span value="8" class="{if $info.level_num eq 8}active{/if} {if in_array(8, $level_weight)}disabled{/if}">八级</span>
<span value="9" class="{if $info.level_num eq 9}active{/if} {if in_array(9, $level_weight)}disabled{/if}">九级</span>
<span value="10" class="{if $info.level_num eq 10}active{/if} {if in_array(10, $level_weight)}disabled{/if}">十级</span>
<!--<span value="3" class="{if $info.level_num eq 3}active{/if} {if in_array(3, $level_weight)}disabled{/if}">三级</span>-->
<!--<span value="4" class="{if $info.level_num eq 4}active{/if} {if in_array(4, $level_weight)}disabled{/if}">四级</span>-->
<!--<span value="5" class="{if $info.level_num eq 5}active{/if} {if in_array(5, $level_weight)}disabled{/if}">五级</span>-->
<!--<span value="6" class="{if $info.level_num eq 6}active{/if} {if in_array(6, $level_weight)}disabled{/if}">六级</span>-->
<!--<span value="7" class="{if $info.level_num eq 7}active{/if} {if in_array(7, $level_weight)}disabled{/if}">七级</span>-->
<!--<span value="8" class="{if $info.level_num eq 8}active{/if} {if in_array(8, $level_weight)}disabled{/if}">八级</span>-->
<!--<span value="9" class="{if $info.level_num eq 9}active{/if} {if in_array(9, $level_weight)}disabled{/if}">九级</span>-->
<!--<span value="10" class="{if $info.level_num eq 10}active{/if} {if in_array(10, $level_weight)}disabled{/if}">十级</span>-->
</div>
<div class="word-aux">
<p>等级权重越大等级越高</p>
@ -128,10 +129,11 @@
<div class="layui-input-block">
<input type="radio" name="upgrade_type" value="1" lay-filter="withdraw_type" title="满足以下任意条件" checked />
<input type="radio" name="upgrade_type" value="2" lay-filter="withdraw_type" {if $info.upgrade_type == 2} checked {/if} title="满足以下全部条件" />
<input type="radio" name="upgrade_type" value="3" lay-filter="withdraw_type" {if $info.upgrade_type == 3} checked {/if} title="不可升级" />
</div>
</div>
<div class="layui-form-item">
<div class="layui-form-item upgrade_where {if $info.upgrade_type == 3}hide{/if}">
<label class="layui-form-label"></label>
<div class="layui-input-block">
<!-- <button class="layui-btn layui-btn-primary level-btn {if $info.fenxiao_order_num > 0}border-color{/if}">分销订单总数<input type="hidden" value="1" /></button>
@ -150,7 +152,7 @@
</div>
</div>
<div class="layui-card card-common card-brief">
<div class="layui-card card-common card-brief upgrade_where {if $info.upgrade_type == 3}hide{/if}">
<div class="layui-card-header">
<span class="card-title">升级条件限制</span>
</div>
@ -254,22 +256,14 @@
<div class="layui-form-mid">人</div>
<a href="#" class="text-color layui-form-mid" onclick="delDiv(this)">删除</a>
</div>
<div class="form-row">
<input type="hidden" name="level_id" value="{$info.level_id}">
<button class="layui-btn" lay-submit lay-filter="save">保存</button>
<button class="layui-btn layui-btn-primary" onclick="back()">返回</button>
</div>
</div>
</div>
{else/}
<div class="form-row">
<input type="hidden" name="level_id" value="{$info.level_id}">
<button class="layui-btn" lay-submit lay-filter="save">保存</button>
<button class="layui-btn layui-btn-primary" onclick="back()">返回</button>
</div>
{/if}
</div>
{/block}
{block name="script"}
@ -315,7 +309,7 @@
layer.msg('请选择等级权重');
return;
}
if(arr==arr1){
if(arr==arr1 && data.field.upgrade_type != 3){
layer.msg('请选择升级条件');
return;
}
@ -382,6 +376,12 @@
}
}
});
// 监听：升级方式 改变
form.on("radio(withdraw_type)", function(data){
if(parseInt(data.value) === 3) $(".upgrade_where").hide();
else $(".upgrade_where").show();
});
});
function delDiv(e) {

2
addon/fenxiao/shop/view/level/lists.html
View File

@ -136,6 +136,8 @@
upgrade_content += data.order_money == 0 ? '' : '自购订单总额大于' + data.order_money + ' 并且 ';
upgrade_content += data.one_child_num == 0 ? '' : '下线人数大于' + data.one_child_num + ' 并且 ';
upgrade_content += data.one_child_fenxiao_num == 0 ? '' : '下线分销商人数大于' + data.one_child_fenxiao_num + ' 并且 ';
}else if(data.upgrade_type == 3){
upgrade_content += '不可升级';
}
var upgrade_content = upgrade_content.replace(/ 或者 $/g,"");
var upgrade_content = upgrade_content.replace(/ 并且 $/g,"");

4
config/menu_shop.php
View File

@ -1962,7 +1962,7 @@ return [
'name' => 'PROMOTION_FENXIAO_APPLY',
'title' => '分销商申请',
'url' => 'fenxiao://shop/fenxiao/apply',
'is_show' => 0,
'is_show' => 1,
'sort' => 4,
'child_list' => [
[
@ -2001,7 +2001,7 @@ return [
'name' => 'PROMOTION_FENXIAO_LEVEL',
'title' => '分销等级',
'url' => 'fenxiao://shop/level/lists',
'is_show' => 0,
'is_show' => 1,
'is_control' => 1,
'sort' => 99,
'child_list' => [