diff --git a/addon/fenxiao/model/Fenxiao.php b/addon/fenxiao/model/Fenxiao.php
index 94dd426f..c483952d 100644
--- a/addon/fenxiao/model/Fenxiao.php
+++ b/addon/fenxiao/model/Fenxiao.php
@@ -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;
diff --git a/addon/fenxiao/shop/controller/Level.php b/addon/fenxiao/shop/controller/Level.php
index 6b8f9d79..c01d2730 100644
--- a/addon/fenxiao/shop/controller/Level.php
+++ b/addon/fenxiao/shop/controller/Level.php
@@ -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();
diff --git a/addon/fenxiao/shop/view/fenxiao/lists.html b/addon/fenxiao/shop/view/fenxiao/lists.html
index 3e600df3..b9674eb7 100644
--- a/addon/fenxiao/shop/view/fenxiao/lists.html
+++ b/addon/fenxiao/shop/view/fenxiao/lists.html
@@ -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',
diff --git a/addon/fenxiao/shop/view/level/add.html b/addon/fenxiao/shop/view/level/add.html
index abd30e43..96be78aa 100644
--- a/addon/fenxiao/shop/view/level/add.html
+++ b/addon/fenxiao/shop/view/level/add.html
@@ -23,14 +23,14 @@
一级
二级
- 三级
- 四级
- 五级
- 六级
- 七级
- 八级
- 九级
- 十级
+
+
+
+
+
+
+
+
-
+
+
+
+
+
{/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) {
diff --git a/addon/fenxiao/shop/view/level/edit.html b/addon/fenxiao/shop/view/level/edit.html
index 702c7766..98d6063b 100644
--- a/addon/fenxiao/shop/view/level/edit.html
+++ b/addon/fenxiao/shop/view/level/edit.html
@@ -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}
{/block}
{block name="main"}
@@ -25,14 +26,14 @@
一级
二级
- 三级
- 四级
- 五级
- 六级
- 七级
- 八级
- 九级
- 十级
+
+
+
+
+
+
+
+
-