From 0d35370adec8d756ae76d57b45429c6e08573bd7 Mon Sep 17 00:00:00 2001
From: zyx <as123498@qq.com>
Date: Thu, 24 Oct 2019 17:50:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B6=E6=8C=81=E5=8F=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E6=90=9C=E7=B4=A2=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E6=A1=86=EF=BC=8C=E6=89=B6?=
 =?UTF-8?q?=E6=8C=81=E5=8F=B7=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E6=AD=A3=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=B0=86?=
 =?UTF-8?q?text=5Fresource=E7=9A=84=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E6=94=B9=E5=9B=9E=E4=B8=80=E8=88=AC=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PromoteController.class.php    |   1 +
 .../Admin/View/Promote/shortCutMenu.html      |   2 +-
 .../Admin/View/Promote/shortCutMenuEdit.html  |   4 +-
 .../TestResourceController.class.php          |  15 ++-
 .../default/TestResource/protectLogList.html  |   2 +-
 .../TestResource/supportNumberList.html       | 101 ++++++++++++++++--
 Data/update.sql                               |   9 --
 7 files changed, 111 insertions(+), 23 deletions(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index db3697742..3762d2e45 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -937,6 +937,7 @@ unset($_REQUEST['parent_id']);
 
         $where['id'] = I("id");
         $save['icon'] = I("icon");
+        $save['name'] = I("name");
 
         M('quick_menu', 'tab_')->startTrans();  //事物
         try{
diff --git a/Application/Admin/View/Promote/shortCutMenu.html b/Application/Admin/View/Promote/shortCutMenu.html
index f72fd9812..68877f7b6 100644
--- a/Application/Admin/View/Promote/shortCutMenu.html
+++ b/Application/Admin/View/Promote/shortCutMenu.html
@@ -27,7 +27,7 @@
 						<td>{$list.id}</td>
 						<td>{$list.name}</td>
 						<td>{$list.url}</td>
-						<td><img src="{$list.icon}" style="width: 100px"/></td>
+						<td><img src="{$list.icon|get_cover='path'}" style="width: 100px"/></td>
 						<td><a href="{:U('promote/shortCutMenuEdit',array('id'=>$list['id']))}">编辑</a></td>
 					</tr>
 				</volist>
diff --git a/Application/Admin/View/Promote/shortCutMenuEdit.html b/Application/Admin/View/Promote/shortCutMenuEdit.html
index edf559c64..10d74ecf5 100644
--- a/Application/Admin/View/Promote/shortCutMenuEdit.html
+++ b/Application/Admin/View/Promote/shortCutMenuEdit.html
@@ -73,13 +73,13 @@
 						<tr>
 							<td class="l">菜单名称：</td>
 							<td class="r">
-								<input type="text" class="txt " name="user_password" value="{$data['name']}" disabled="disabled" placeholder="请输入菜单名称">
+								<input type="text" class="txt " name="name" value="{$data['name']}" placeholder="请输入菜单名称">
 							</td>
 						</tr>
 						<tr>
 							<td class="l">菜单跳转地址：</td>
 							<td class="r">
-								<input type="text" class="txt " name="role_name" value="{$data['url']}" disabled="disabled" placeholder="请输入菜单跳转地址">
+								<input type="text" class="txt " name="url" value="{$data['url']}" disabled="disabled" placeholder="请输入菜单跳转地址">
 							</td>
 						</tr>
 						<tr>
diff --git a/Application/Home/Controller/TestResourceController.class.php b/Application/Home/Controller/TestResourceController.class.php
index fe03d36c2..4f7f381b8 100644
--- a/Application/Home/Controller/TestResourceController.class.php
+++ b/Application/Home/Controller/TestResourceController.class.php
@@ -33,8 +33,8 @@ class TestResourceController extends BaseController
       if(!empty(I('user_account'))){
           $map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
       }
-      if(!empty(I('promote_name'))){
-          $map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
+      if(!empty(I('promote_id'))){
+          $map['tab_test_resource.promote_id']=I('promote_id');
       }
 
       $map['user.promote_id']=session("promote_auth.pid");
@@ -45,7 +45,6 @@ class TestResourceController extends BaseController
           ->page($page,$row)
           ->order('tab_test_resource.create_time DESC')
           ->select();
-//      echo M('test_resource','tab_')->_sql();die();
 
       foreach ($data as $key => $value) {
           $data[$key]['create_time'] = date('Y-m-d H:m:i',$value['create_time']);
@@ -606,5 +605,15 @@ class TestResourceController extends BaseController
         $this->display();
     }
 
+    public function getChildPromoteList()
+    {
+        $promoteId = intval(I('post.promote_id', 0));
+        $promoteId = empty($promoteId) ? PID : $promoteId;
+        $promoteList = getAllPromoteListByType(3, false, $promoteId);
+        $data['status'] = 1;
+        $data['data'] = $promoteList;
+
+        $this->ajaxReturn($data);
+    }
 
 }
\ No newline at end of file
diff --git a/Application/Home/View/default/TestResource/protectLogList.html b/Application/Home/View/default/TestResource/protectLogList.html
index 93c8c63f1..59b3d3dfd 100644
--- a/Application/Home/View/default/TestResource/protectLogList.html
+++ b/Application/Home/View/default/TestResource/protectLogList.html
@@ -48,7 +48,7 @@
                     <select id="server_id" name="server_name" class="reselect select_gallery"  style="width:101px">
                         <option game-id="0" value="">请选择区服</option>
                         <volist name=":getServer_name_on($_POST['game_name'])" id="vo">
-                          <option value="{$vo.server_name}"     <if condition="$_REQUEST['server_name'] eq $vo['server_name']">selected="selected"</if>>{$_POST['server_name']}</option>
+                          <option value="{$vo.server_name}"     <if condition="$_REQUEST['server_name'] eq $vo['server_name']">selected="selected"</if>>{$vo.server_name}</option>
                         </volist>
 
                     </select>
diff --git a/Application/Home/View/default/TestResource/supportNumberList.html b/Application/Home/View/default/TestResource/supportNumberList.html
index 1843338e2..7cc17060c 100644
--- a/Application/Home/View/default/TestResource/supportNumberList.html
+++ b/Application/Home/View/default/TestResource/supportNumberList.html
@@ -46,10 +46,13 @@
 
           <div class="form-group normal_space fl">
               <span id="server_js">
-                    <select id="server_id" name="server_name" class="reselect select_gallery"  style="width:101px">
+                    <select id="server_id" name="server_name" class="reselect select_gallery"
+                            style="width:101px">
                         <option game-id="0" value="">请选择区服</option>
-                        <volist name=":getServer_name_on($_REQUEST['game_name'])" id="vo">
-                          <option value="{$vo.server_name}"     <if condition="$_REQUEST['server_name'] eq $vo['server_name']">selected="selected"</if>>{$_REQUEST['server_name']}</option>
+                        <volist name=":getServer_name_on($_GET['game_name'])" id="vo">
+                          <option value="{$vo.server_name}"
+                          <if condition="$_REQUEST['server_name'] eq $vo['server_name']">selected="selected"</if>
+                          >{$vo.server_name}</option>
                         </volist>
 
                     </select>
@@ -64,9 +67,36 @@
             <input type="text" name="user_account" id="user_account" class="txt normal_txt"  style="width:110px;" placeholder="测试账号" value="{:I('user_account')}" onKeyDown="webchat_chkkeysend(event);">
           </div>
 
-          <div class="form-group normal_space fl">
-            <input type="text" name="promote_name" id="promote_name" class="txt normal_txt"  style="width:110px;" placeholder="推广员" value="{:I('promote_name')}" onKeyDown="webchat_chkkeysend(event);">
-          </div>
+<!--          <div class="form-group normal_space fl">-->
+<!--            <input type="text" name="promote_name" id="promote_name" class="txt normal_txt"  style="width:110px;" placeholder="推广员" value="{:I('promote_name')}" onKeyDown="webchat_chkkeysend(event);">-->
+<!--          </div>-->
+
+            <if condition="$thisParentPromoteId eq 0">
+              <div class="form-group normal_space fl">
+                <select id="team_leader_id" name="team_leader_id" class="reselect select_gallery" style="min-width:130px;">
+                  <option value="0">组长账号</option>
+                  <volist name=":getAllPromoteListByType(1)" id="vo">
+                    <option value="{$vo.id}" <if condition="$vo.id eq $_GET['team_leader_id']"> selected="selected" </if>>{$vo['account']}({$vo['real_name']})</option>
+                  </volist>
+                </select>
+              </div>
+            </if>
+            <input id="promotesid" value="{$_GET['promote_id']}" type="hidden"/>
+            <div class="form-group normal_space fl">
+              <select id="promote_id" name="promote_id" class="reselect select_gallery" style="min-width:130px;">
+                <option value="0">推广员账号</option>
+                <notempty name="teamLeaderData">
+                  <volist name="teamLeaderData" id="vo">
+                    <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+                  </volist>
+                </notempty>
+                <if condition="$_GET['team_leader_id'] gt 0">
+                  <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
+                    <option value="{$vo.id}" <if condition="$vo.id eq $_GET['promote_id']"> selected="selected" </if>>{$vo['account']}({$vo['real_name']})</option>
+                  </volist>
+                </if>
+              </select>
+            </div>
 
           <div class="form-group normal_space fl">
             <input type="submit" class="submit" id='submit' value="查询" style="cursor:pointer;">
@@ -162,6 +192,7 @@
   <script type="text/javascript">
 
     $().ready(function(){
+
       setValue('row','{:I("get.row",10)}');
       $("#pagehtml a").on("click",function(event){
         event.preventDefault();//使a自带的方法失效，即无法调整到href中的URL(http://www.baidu.com)
@@ -170,6 +201,43 @@
         $('#data_form').submit();
       });
 
+      $('#team_leader_id').change(function () {
+        var promoteId = parseInt($(this).val());
+        var promoteValue = $(this).find("option:selected").text();
+        var html = "<option value='' selected>推广员账号</option>";
+
+        if (promoteId > 0) {
+          html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
+
+          $.ajax({
+            url: "{:U('getChildPromoteList')}",
+            type: "post",
+            data: {promote_id:promoteId},
+            dataType: 'json',
+            success: function (data) {
+              var promoteData = data.data;
+
+              if (promoteData.length > 0) {
+                for (var i in promoteData) {
+                  html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>";
+                }
+              }
+
+              showPromoteSelect(html);
+            }
+          });
+        } else {
+          showPromoteSelect(html);
+        }
+      });
+
+      function showPromoteSelect(html)
+      {
+        $("#promote_id").empty();
+        $('#promote_id').html(html);
+        $("#promote_id").select2();
+      }
+
       $('#sdate').datetimepicker({
         lang:'ch',
         format:'Y-m-d',
@@ -277,7 +345,9 @@
         +'/game_name/'+$('#game_id').val()
         +'/server_name/'+$('#server_id').val()
         +'/role_name/'+$('#role_name').val()
-        +'/user_account/'+$('#user_account').val()+'/promote_name/'+$('#promote_name').val();
+        +'/user_account/'+$('#user_account').val()
+        +'/promote_id/'+$('#promote_id').val()
+        +'/team_leader_id/'+$('#team_leader_id').val();
       console.log(formsUrl);
       $('#forms').attr('action',formsUrl);
 
@@ -397,6 +467,23 @@
         })
       }
     })
+    checkPromote();
+    function checkPromote() {
+      var promoteId = parseInt($('#team_leader_id').val());
+      var promoteValue = $('#team_leader_id').find("option:selected").text();
 
+      var promote_id = $('#promotesid').val();
+
+
+      if (promoteId > 0) {
+        var html = "<option value='" + promoteId + "' ";
+        if (promote_id == 1) {
+          html += "selected='selected'";
+        }
+        html +=" >"+ promoteValue + "</option>";
+        $('#promote_id').children().first().after(html);
+        console.log(promote_id);
+      }
+    }
   </script>
 </block>
diff --git a/Data/update.sql b/Data/update.sql
index b4e5fac89..ce1797271 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -168,15 +168,6 @@ ADD COLUMN `user_token`  char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT
 -- ----------------------------
 alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '运营平台 0双平台 1and 2ios 3超级签'
 
--- ----------------------------
--- 2019-10-17 zyx
--- ----------------------------
-ALTER TABLE `tab_test_resource`
-MODIFY COLUMN `user_account`  varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户帐号' AFTER `user_id`;
-ALTER TABLE `tab_test_resource`
-MODIFY COLUMN `role_name`  varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色名' AFTER `phone`,
-MODIFY COLUMN `promote_account`  varchar(30) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '所属推广员账号' AFTER `promote_id`;
-
 -- 2019-10-22 cxj
 UPDATE `sys_model` SET list_grid = "id:编号\r\nsort:排序\r\ngame_name:游戏名称\r\ngame_type_name:游戏类型\r\ngame_type_id:游戏类型\r\ngame_appid:游戏appid\r\ngame_status|get_info_status:显示状态\r\npay_status|get_info_status:支付状态\r\nicon:图片id\r\napply_status:审核状态\r\ncategory:开放类型\r\nrecommend_status|get_info_status*1:推荐状态\r\nrelation_game_id:关联游戏id\r\nrelation_game_name:关联游戏名称\r\nsdk_version:运营平台\r\ndevelopers:开发商\r\ndow_num:下载\r\nonline_status:上线状态\r\ncreate_time:创建时间\r\nserver_type:混服管理\r\nid:操作:[EDIT]&id=[id]|编辑,Game/del?ids=[id]|删除" where id = 15;