Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Home/Controller/PromoteController.class.php

@@ -867,7 +867,6 @@ class PromoteController extends BaseController
         $realName = I('real_name', '');
         $status = I('status', 'all');
         $promoteType = I('promote_type', 0);
-
         $loginer = $this->getLoginPromote();
 
         $map = [];
@@ -950,6 +949,8 @@ class PromoteController extends BaseController
         $this->assign('count', $count);
         $this->assign('pagination', $pagination);
         $this->assign('records', $records);
+        $this->assign('promoteType',$promoteType);
+        $this->assign('promoteTypeTitle',$promoteTypeTitle);
         $this->display();
     }
 
@@ -1077,6 +1078,16 @@ class PromoteController extends BaseController
 
     public function edit_chlid($id = 0)
     {
+        $promoteType = $_REQUEST['promote_type'];
+        if($promoteType == 0) {
+            $promoteTypeTitle = "部门长管理";
+        }
+        if($promoteType == 1) {
+            $promoteTypeTitle = "组长管理";
+        }
+        if($promoteType == 2) {
+            $promoteTypeTitle = "推广员管理";
+        }
         if (IS_POST) {
             $type = $_REQUEST['type'];
             $map['id'] = $id;
@@ -1185,7 +1196,7 @@ class PromoteController extends BaseController
         } else {
             $promote = A('Promote', 'Event');
             $this->meta_title = '子帐号';
-            $promote->baseinfo('edit_chlid', $id);
+            $promote->baseinfo('edit_chlid', $id,$promoteTypeTitle);
         }
 
     }

Application/Home/Event/PromoteEvent.class.php

@@ -17,11 +17,12 @@ class PromoteEvent extends BaseEvent {
 	/**
 	获取基本信息
 	*/
-    public function baseinfo($tem_edit,$id=0) {
+    public function baseinfo($tem_edit,$id=0,$promotetitle=0) {
         $model = M('Promote','tab_');
         $data = $model->find($id);
         $data['bank_area'] = explode(',', $data['bank_area']);
         $this->assign("data",$data);
+        $this->assign('promotetitle',$promotetitle);
         $this->display($tem_edit);
     }
 

Application/Home/View/default/Promote/children.html

@@ -83,7 +83,7 @@
                   </td>
                   <td>{$record.create_time|date='Y-m-d H:i:s',###}</td>
                   <td>
-                    <a href="{:U('Promote/edit_chlid','id='.$record['id'])}" class="editbtn">修改</a>
+                    <a href="{:U('Promote/edit_chlid',['id'=>$record['id'],'promote_type'=>$promoteType])}" class="editbtn">修改</a>
                     <if condition="$record['status'] eq 1">
                       <a href="javascript:;" class="froze-btn editbtn">冻结</a>
                     <elseif condition="$record['status'] eq 2"/>

Application/Home/View/default/Promote/edit_chlid.html

@@ -8,7 +8,7 @@
     <div class="page-list normal_list promote-edit_chlid-form">
       <div class="trunk-title">
       	<div class="location">
-				<div class="location-container">当前位置：<span>管理中心></span><span>二级渠道></span><span>修改子渠道</span></div>
+				<div class="location-container">当前位置：<span>管理中心></span><span>{$promotetitle}></span><span>修改子渠道</span></div>
 				</div>
       	<img src="__IMG__/20180207/icon_normal_ziqudao.png"><span class="title_main">修改子渠道</span>
       </div>