From 20c168a537f8600a9191cb7750219d44abc4550a Mon Sep 17 00:00:00 2001
From: jbrazz <2436953959@qq.com>
Date: Fri, 8 Nov 2019 16:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E6=94=B9=E5=9B=9B=E7=BA=A7?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php              | 12 +-----------
 .../Admin/View/PromoteCoin/send_lists.html       | 16 +++++++++-------
 Application/Common/Common/extend.php             |  2 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index 5830f251a..429235f10 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -572,17 +572,7 @@ function get_game_set_field($game_id,$field=""){
  * @return mixed
  */
 function promote_lists($type){
-    if($type == 1){
-        $map['parent_id'] = 0;
-    }elseif($type == 2){
-        $map['parent_id'] = ['neq',0];
-        $map['grand_id'] = 0;
-    }elseif($type == 3) {
-        $map['parent_id'] = ['gt',0];
-        $map['grand_id'] = ['gt', 0];
-    } else{
-        $map = '';
-    }
+    $map['level'] = $type;
     $data = M('promote','tab_')->where($map)->select();
 
     $items = M('PromoteBalanceCoin', 'tab_')->where(['game_id' => 0])->select();
diff --git a/Application/Admin/View/PromoteCoin/send_lists.html b/Application/Admin/View/PromoteCoin/send_lists.html
index 0cbbfb689..4da2abce1 100644
--- a/Application/Admin/View/PromoteCoin/send_lists.html
+++ b/Application/Admin/View/PromoteCoin/send_lists.html
@@ -29,7 +29,7 @@
 
     <div class="cf main-place top_nav_list navtab_list">
         <h3 class="page_title">平台币发放</h3>
-        <p class="description_text">说明：给一级/二级/三级推广员发放平台币，此平台币只可在会长代充时使用（一级推广员可以给二级/三级推广员转移，二级推广员可以给三级推广员转移）</p>
+        <p class="description_text">说明：给会长/部门长/组长/组员发放平台币，此平台币只可在会长代充时使用（会长可以给部门长/组长/组员转移，部门长可以给组长/组员转移）</p>
     </div>
 
 
@@ -37,9 +37,10 @@
 		<div class="fl button_list">
 		<empty name="model.extend">
 			<div class="tools">
-				<a class=" " href="{:U('send',['promote_type'=>1])}"><span class="button_icon button_icon1"></span>给一级推广员发放</a>
-				<a class=" " href="{:U('send',['promote_type'=>2])}"><span class="button_icon button_icon1"></span>给二级推广员发放</a>
-				<a class=" " href="{:U('send',['promote_type'=>3])}"><span class="button_icon button_icon1"></span>给三级推广员发放</a>
+				<a class=" " href="{:U('send',['promote_type'=>1])}"><span class="button_icon button_icon1"></span>给会长发放</a>
+				<a class=" " href="{:U('send',['promote_type'=>2])}"><span class="button_icon button_icon1"></span>给部门长发放</a>
+                <a class=" " href="{:U('send',['promote_type'=>3])}"><span class="button_icon button_icon1"></span>给组长发放</a>
+                <a class=" " href="{:U('send',['promote_type'=>4])}"><span class="button_icon button_icon1"></span>给组员发放</a>
 				<!--<a class=" ajax-post confirm " target-form="ids" url="{:U('del?model='.$model['id'])}"><span class="button_icon button_icon2"></span>删除</a>-->
 			</div>
 		</empty>
@@ -60,9 +61,10 @@
             <div class="input-list">
                 <select id="promote_type" name="promote_type"  style="width:120px;" class="select_gallery">
                     <option value="">推广员等级</option>
-                    <option value="1">一级推广员</option>
-                    <option value="2">二级推广员</option>
-                    <option value="3">三级推广员</option>
+                    <option value="1">会长</option>
+                    <option value="2">部门长</option>
+                    <option value="3">组长</option>
+                    <option value="4">组员</option>
                 </select>
             </div>
             <div class="input-list">
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 7087594f7..c1a76bd24 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -639,7 +639,7 @@ function get_info_status($type=null,$group=0){
         30=>array(0=>"禁用",1=>"正常"),
         18 => ["平台币","支付宝","微信","聚宝云"],
         19 => ["待审核","已通过","未通过"],
-        20 => ['',"一级推广员",'二级推广员','三级推广员'],
+        20 => ['',"会长",'部门长','组长', '组员'],
         21 => ['',"支付宝","微信","聚宝云","平台币",L('Jtpay')],
         22 => ["双平台","安卓","苹果"],
         23 => ['',"安卓","苹果"],