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

Application/Home/Common/function.php

@@ -831,24 +831,24 @@ function isParentPromote($parentId, $promoteId)
 }
 
 //获取所有该类型的渠道    $promoteId-渠道ID  $promoteType-1:本账号 2:组长 3:推广员
-function getAllPromoteListByType($promoteType = 1, $retOne = false)
+function getAllPromoteListByType($promoteType = 1, $retOne = false, $promoteId = PID)
 {
     $childPromoteData = array();
 
     switch ($promoteType) {
         case 1:
-            $map['id'] = PID;
+            $map['id'] = $promoteId;
             break;
         case 2:
         case 3:
-            $promoteData = D('Promote')->where(array('id' => PID))->find();
+            $promoteData = D('Promote')->where(array('id' => $promoteId))->find();
 
             if ($promoteData['grand_id'] > 0) {
                 return [];
             } elseif ($promoteData['parent_id'] > 0) {
                 $promoteType--;
             }
-            $childPromoteIds = getAllPromoteIdsByType((string)PID, $promoteType);
+            $childPromoteIds = getAllPromoteIdsByType((string)$promoteId, $promoteType);
             break;
     }
 
@@ -901,10 +901,10 @@ function getAllPromoteIdsByType($promoteIds, $level = 3, $nowLevel = 1)
 }
 
 //获取所有子渠道列表    $type 1-返回数组 2-返回id数组 3-返回id字符串
-function getAllChildPromoteList($type = 1)
+function getAllChildPromoteList($type = 1, $promoteId = PID)
 {
     $childPromoteData = array();
-    $childPromoteIds = getAllChildPromoteIds((string)PID);
+    $childPromoteIds = getAllChildPromoteIds((string)$promoteId);
 
     if (!empty($childPromoteIds)) {
         $map['id'] = ['in', $childPromoteIds];

Application/Home/Controller/QueryController.class.php

@@ -44,14 +44,21 @@ class QueryController extends BaseController
             $map['tab_spend.promote_id'] = ['in', $childPromoteIds];
         }
 
-        $teamLeaderId = I('team_leader_id');//组长账号
+        $teamLeaderId = intval(I('team_leader_id'));//组长账号
         if (!empty($teamLeaderId)) {
             $hasTeamLeaderPermission = hasPromotePermission(PID, $teamLeaderId);
             if ($hasTeamLeaderPermission === false) {
                 $this->error('组长权限异常');
             }
 
-            $map['tab_spend.promote_id'] = $teamLeaderId;
+            $childPromoteIds = getAllChildPromoteList(3, $teamLeaderId);
+            if (empty($childPromoteIds)) {
+                $map['tab_spend.promote_id'] = $teamLeaderId;
+            } else {
+                $childPromoteIds = $teamLeaderId . ',' . $childPromoteIds;
+
+                $map['tab_spend.promote_id'] = ['in', $childPromoteIds];
+            }
         }
 
         $promoteId = I('promote_id');//推广员账号
@@ -61,18 +68,10 @@ class QueryController extends BaseController
                 $this->error('推广员权限异常');
             }
 
-            if (!empty($map['tab_spend.promote_id'])) {
-                $map['_string'] = 'tab_spend.promote_id = ' . $promoteId;
-            } else {
-                $map['tab_spend.promote_id'] = $promoteId;
-            }
+            $map['tab_spend.promote_id'] = $promoteId;
         }
 
         if (!empty(I('own_id'))) {
-            if (!empty($map['_string'])) {
-                unset($map['_string']);
-            }
-
             $map['tab_spend.promote_id'] = I('own_id');//本账号
         }
 
@@ -146,6 +145,7 @@ class QueryController extends BaseController
         empty(I('own_id')) || $parameter['own_id'] = I('own_id');
         empty(I('begtime')) || $parameter['begtime'] = I('begtime');
         empty(I('endtime')) || $parameter['endtime'] = I('endtime');
+        !isset($_REQUEST['pay_way']) || $parameter['pay_way'] = I('pay_way');
 
         $serverData = $this->getServer(I('relation_game_id'), I('sdk_version'));
 
@@ -163,6 +163,9 @@ class QueryController extends BaseController
         $this->assign('pID', PID);
         $this->assign('ownId', I('own_id'));
         $this->assign('payWayData', QueryController::$payWay);
+        if (!empty(I('team_leader_id'))) {
+            $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id'))));
+        }
         $this->meta_title = "订单查询";
         $this->display();
     }
@@ -185,14 +188,21 @@ class QueryController extends BaseController
             $map['tab_user.promote_id'] = ['in', $childPromoteIds];
         }
 
-        $teamLeaderId = I('team_leader_id');//组长账号
+        $teamLeaderId = intval(I('team_leader_id'));//组长账号
         if (!empty($teamLeaderId)) {
             $hasTeamLeaderPermission = hasPromotePermission(PID, $teamLeaderId);
             if ($hasTeamLeaderPermission === false) {
                 $this->error('组长权限异常');
             }
 
-            $map['tab_user.promote_id'] = $teamLeaderId;
+            $childPromoteIds = getAllChildPromoteList(3, $teamLeaderId);
+            if (empty($childPromoteIds)) {
+                $map['tab_user.promote_id'] = $teamLeaderId;
+            } else {
+                $childPromoteIds = $teamLeaderId . ',' . $childPromoteIds;
+
+                $map['tab_user.promote_id'] = ['in', $childPromoteIds];
+            }
         }
 
         $promoteId = I('promote_id');//推广员账号
@@ -202,18 +212,10 @@ class QueryController extends BaseController
                 $this->error('推广员权限异常');
             }
 
-            if (!empty($map['tab_user.promote_id'])) {
-                $map['_string'] = 'tab_user.promote_id = ' . $promoteId;
-            } else {
-                $map['tab_user.promote_id'] = $promoteId;
-            }
+            $map['tab_user.promote_id'] = $promoteId;
         }
 
         if (!empty(I('own_id'))) {
-            if (!empty($map['_string'])) {
-                unset($map['_string']);
-            }
-
             $map['tab_user.promote_id'] = I('own_id');//本账号
         }
 
@@ -276,6 +278,9 @@ class QueryController extends BaseController
         $this->assign('thisParentPromoteId', $thisParentPromoteId);
         $this->assign('pID', PID);
         $this->assign('ownId', I('own_id'));
+        if (!empty(I('team_leader_id'))) {
+            $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id'))));
+        }
         $this->meta_title = '注册明细';
         $this->display();
     }
@@ -998,16 +1003,25 @@ class QueryController extends BaseController
             $spendWhere['tab_spend.promote_id'] = ['in', $childPromoteIds];
         }
 
-        $teamLeaderId = I('team_leader_id');//组长账号
+        $teamLeaderId = intval(I('team_leader_id'));//组长账号
         if (!empty($teamLeaderId)) {
             $hasTeamLeaderPermission = hasPromotePermission(PID, $teamLeaderId);
             if ($hasTeamLeaderPermission === false) {
                 $this->error('组长权限异常');
             }
 
-            $userPlayInfoWhere['tab_user_play_info.promote_id'] = $teamLeaderId;
-            $userGameLoginWhere['tab_user_game_login_record.promote_id'] = $teamLeaderId;
-            $spendWhere['tab_spend.promote_id'] = $teamLeaderId;
+            $childPromoteIds = getAllChildPromoteList(3, $teamLeaderId);
+            if (empty($childPromoteIds)) {
+                $userPlayInfoWhere['tab_user_play_info.promote_id'] = $teamLeaderId;
+                $userGameLoginWhere['tab_user_game_login_record.promote_id'] = $teamLeaderId;
+                $spendWhere['tab_spend.promote_id'] = $teamLeaderId;
+            } else {
+                $childPromoteIds = $teamLeaderId . ',' . $childPromoteIds;
+
+                $userPlayInfoWhere['tab_user_play_info.promote_id'] = ['in', $childPromoteIds];
+                $userGameLoginWhere['tab_user_game_login_record.promote_id'] = ['in', $childPromoteIds];
+                $spendWhere['tab_spend.promote_id'] = ['in', $childPromoteIds];
+            }
         }
 
         $promoteId = I('promote_id');//推广员账号
@@ -1017,24 +1031,12 @@ class QueryController extends BaseController
                 $this->error('推广员权限异常');
             }
 
-            if (!empty($userPlayInfoWhere['tab_apply.promote_id'])) {
-                $userPlayInfoWhere['_string'] = 'tab_user_play_info.promote_id = ' . $promoteId;
-                $userGameLoginWhere['_string'] = 'tab_user_game_login_record.promote_id = ' . $promoteId;
-                $spendWhere['_string'] = 'tab_spend.promote_id = ' . $promoteId;
-            } else {
-                $userPlayInfoWhere['tab_user_play_info.promote_id'] = $promoteId;
-                $userGameLoginWhere['tab_user_game_login_record.promote_id'] = $promoteId;
-                $spendWhere['tab_spend.promote_id'] = $promoteId;
-            }
+            $userPlayInfoWhere['tab_user_play_info.promote_id'] = $promoteId;
+            $userGameLoginWhere['tab_user_game_login_record.promote_id'] = $promoteId;
+            $spendWhere['tab_spend.promote_id'] = $promoteId;
         }
 
         if (!empty(I('own_id'))) {
-            if (!empty($userPlayInfoWhere['_string'])) {
-                unset($userPlayInfoWhere['_string']);
-                unset($userGameLoginWhere['_string']);
-                unset($spendWhere['_string']);
-            }
-
             $userPlayInfoWhere['tab_user_play_info.promote_id'] = I('own_id');
             $userGameLoginWhere['tab_user_game_login_record.promote_id'] = I('own_id');
             $spendWhere['tab_spend.promote_id'] = I('own_id');
@@ -1222,6 +1224,9 @@ class QueryController extends BaseController
         $this->assign('serverData', $serverData['data']);
         $this->assign('thisParentPromoteId', $thisParentPromoteId);
         $this->assign('pID', PID);
+        if (!empty(I('team_leader_id'))) {
+            $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id'))));
+        }
         $this->display();
     }
 
@@ -1256,10 +1261,20 @@ class QueryController extends BaseController
                 $this->error('组长权限异常');
             }
 
-            $map['tab_apply.promote_id'] = $teamLeaderId;
-            $userPlayInfoMap['tab_user_play_info.promote_id'] = $teamLeaderId;
-            $userGameLoginMap['tab_user_game_login_record.promote_id'] = $teamLeaderId;
-            $spendMap['tab_spend.promote_id'] = $teamLeaderId;
+            $childPromoteIds = getAllChildPromoteList(3, $teamLeaderId);
+            if (empty($childPromoteIds)) {
+                $map['tab_apply.promote_id'] = $teamLeaderId;
+                $userPlayInfoMap['tab_user_play_info.promote_id'] = $teamLeaderId;
+                $userGameLoginMap['tab_user_game_login_record.promote_id'] = $teamLeaderId;
+                $spendMap['tab_spend.promote_id'] = $teamLeaderId;
+            } else {
+                $childPromoteIds = $teamLeaderId . ',' . $childPromoteIds;
+
+                $map['tab_apply.promote_id'] = ['in', $childPromoteIds];
+                $userPlayInfoMap['tab_user_play_info.promote_id'] = ['in', $childPromoteIds];
+                $userGameLoginMap['tab_user_game_login_record.promote_id'] = ['in', $childPromoteIds];
+                $spendMap['tab_spend.promote_id'] = ['in', $childPromoteIds];
+            }
         }
 
         $promoteId = intval(I('promote_id'));//推广员账号
@@ -1269,21 +1284,14 @@ class QueryController extends BaseController
                 $this->error('推广员权限异常');
             }
 
-            $map['_string'] = 'tab_apply.promote_id = ' . $promoteId;
-            $userPlayInfoMap['_string'] = 'tab_user_play_info.promote_id = ' . $promoteId;
-            $userGameLoginMap['_string'] = 'tab_user_game_login_record.promote_id = ' . $promoteId;
-            $spendMap['_string'] = 'tab_spend.promote_id = ' . $promoteId;
+            $map['tab_apply.promote_id'] = $promoteId;
+            $userPlayInfoMap['tab_user_play_info.promote_id'] = $promoteId;
+            $userGameLoginMap['tab_user_game_login_record.promote_id'] = $promoteId;
+            $spendMap['tab_spend.promote_id'] = $promoteId;
         }
 
         $ownId = intval(I('own_id'));//本账号
         if (!empty($ownId)) {
-            if (!empty($map['_string'])) {
-                unset($map['_string']);
-                unset($userPlayInfoMap['_string']);
-                unset($userGameLoginMap['_string']);
-                unset($spendMap['_string']);
-            }
-
             $map['tab_apply.promote_id'] = $ownId;
             $userPlayInfoMap['tab_user_play_info.promote_id'] = $ownId;
             $userGameLoginMap['tab_user_game_login_record.promote_id'] = $ownId;
@@ -1476,6 +1484,9 @@ class QueryController extends BaseController
         $this->assign('serverData', $serverData['data']);
         $this->assign('thisParentPromoteId', $thisParentPromoteId);
         $this->assign('pID', PID);
+        if (!empty(I('team_leader_id'))) {
+            $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id'))));
+        }
         $this->display();
     }
 
@@ -2165,4 +2176,21 @@ class QueryController extends BaseController
         $this->assign('count', $count);
         $this->display();
     }
+
+    public function getChildPromoteList()
+    {
+        $promoteId = I('post.promote_id', 0);
+        if ($promoteId == 0) {
+            $data['status'] = 0;
+            $data['msg'] = '数据异常';
+
+            $this->ajaxReturn($data);
+        }
+
+        $promoteList = getAllPromoteListByType(3, false, $promoteId);
+        $data['status'] = 1;
+        $data['data'] = $promoteList;
+
+        $this->ajaxReturn($data);
+    }
 }

Application/Home/View/default/Apply/feature.html

@@ -215,7 +215,7 @@
 <!--                      <span onclick="lookdetail({$vo.id})" style="cursor: pointer;"><u class="lookdetail">查看详情</u></span>-->
                       <div class="site-demo-button" id="layerDemo" style="margin-bottom: 0;">
 <!--                         <button data-method="notice" class="layui-btn">示范一个公告层</button>-->
-                             <span id="detailArr"   onclick="lookdetail({$vo.id})" class="layui-btn" style="cursor: pointer;background:#62A8EA"><u>查看详情</u><u  class="hiddenattr"  style="">{$vo.id}</u></span>
+                             <span id="detailArr"   onclick="lookdetail({$vo.id})" class="layui-btn" style="cursor: pointer;background:#62A8EA"><u>查看详情</u></span>
                           
                       </div>
                     </div>

Application/Home/View/default/Apply/index.html

@@ -105,7 +105,7 @@
 </block>
 
 <block name="body">
-  <div class="page-list normal_list apply-index-list">
+  <div class="page-list normal_list apply-index-list jssearch">
     <div class="trunk-title">
       <div class="location">
         <div class="location-container">当前位置：<span>游戏管理></span><span>{$position}</span></div>
@@ -180,10 +180,11 @@
           </div>
         </div>
 
-        <form action="{:U($game,array('row'=>I('get.row'),'type'=>$type))}" method="post" enctype="multipart/form-data"
-              class="marg_top20">
+<!--        <form action="{:U($game,array('row'=>I('get.row'),'type'=>$type))}" method="post" enctype="multipart/form-data"-->
+<!--              class="marg_top20">-->
           <div class="form-group normal_space fr">
-            <input type="submit" class="submit" value="查询">
+            <input type="submit" class="submit" id='submit' url="{:U($game,array('model'=>$model['name'],'type'=>$type),false)}"
+                   value="查询">
           </div>
           <div class="form-group normal_space fr">
             <select id="game_id" name="game_id" class="reselect select_gallery" style="min-width:200px;width: 175px;">
@@ -218,7 +219,7 @@
             <input id="promote_role" name="promote_role">
           </div>
 
-        </form>
+<!--        </form>-->
       </div>
       <div class="trunk-list">
         <div class="div_bgtab">
@@ -869,5 +870,21 @@
       $('#promote_id').on('change', function () {
           newPromoteId = $(this).val();
       });
+
+      $('#submit').click(function () {
+          var url = $(this).attr('url');
+          console.log(url);
+          var query = $('.jssearch').find('input').serialize();
+          query += "&" + $('.jssearch').find('select').serialize();
+          query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+          query = query.replace(/^&/g, '');
+          if (url.indexOf('?') > 0) {
+              url += '&' + query;
+          } else {
+              url += '?' + query;
+          }
+          window.location.href = url;
+
+      });
   </script>
 </block>

Application/Home/View/default/Apply/my_game.html

@@ -89,7 +89,7 @@
 </block>
 
 <block name="body">
-  <div class="page-list normal_list apply-my_game-list">
+  <div class="page-list normal_list apply-my_game-list jssearch">
     <div class="trunk-title">
       <div class="location">
         <div class="location-container">当前位置：<span>游戏管理></span><span>{$position}</span></div>
@@ -156,10 +156,11 @@
 <!--          <a class="btn_calc" href="javascript:;">审核通过</a>-->
 <!--          <a class="btn_calc examine_a" href="{:U('my_game_ch')}">审核中</a>-->
 <!--        </div>-->
-        <form class="marg_top20" action="{:U($myGame,array('row'=>I('get.row')))}" method="post"
-              enctype="multipart/form-data">
+<!--        <form class="marg_top20" action="{:U($myGame,array('row'=>I('get.row')))}" method="post"-->
+<!--              enctype="multipart/form-data">-->
           <div class="form-group normal_space fr">
-            <input type="submit" class="submit zwm_submit" value="查询">
+            <input type="submit" class="submit" id='submit' url="{:U($myGame,array('model'=>$model['name'],'type'=>$type),false)}"
+                   value="查询">
           </div>
           <div class="form-group normal_space fr">
             <select id="game_id" name="game_id" class="reselect select_gallery" style="min-width:200px;width: 175px;">
@@ -196,7 +197,7 @@
           <div class="form-group normal_space fr" style="display: none;">
             <input id="promote_role" name="promote_role">
           </div>
-        </form>
+<!--        </form>-->
       </div>
       <div class="trunk-list zwm_trunklist">
 
@@ -1031,5 +1032,21 @@
       clipboard.on('error', function(e) {
           // console.log(e);
       });
+
+      $('#submit').click(function () {
+          var url = $(this).attr('url');
+          console.log(url);
+          var query = $('.jssearch').find('input').serialize();
+          query += "&" + $('.jssearch').find('select').serialize();
+          query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+          query = query.replace(/^&/g, '');
+          if (url.indexOf('?') > 0) {
+              url += '&' + query;
+          } else {
+              url += '?' + query;
+          }
+          window.location.href = url;
+
+      });
   </script>
 </block>

Application/Home/View/default/GameDivide/index.html

@@ -135,7 +135,7 @@
 </block>
 
 <block name="body">
-  <div class="page-list normal_list apply-index-list">
+  <div class="page-list normal_list apply-index-list jssearch">
     <div class="trunk-title">
       <div class="location">
         <div class="location-container">当前位置：<span>游戏管理></span><span>分成比例</span></div>
@@ -150,8 +150,8 @@
       <if condition="isset($dataList)">
         <div class="trunk-search clearfix">
           <div class="tab marg_top20" style="clear:both;display: flex;"></div>
-          <form action="{:U('index',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data"
-                class="marg_top20" style="float: left;">
+<!--          <form action="{:U('index',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data"-->
+<!--                class="marg_top20" style="float: left;">-->
             <div class="form-group normal_space fl">
               <select id="relation_game_id" name="relation_game_id" class="reselect select_gallery" style="min-width:200px;width: 175px;">
                 <option value="">请选择游戏</option>
@@ -202,9 +202,10 @@
             </div>
 
             <div class="form-group normal_space fl">
-              <input type="submit" class="submit" value="查询">
+              <input type="submit" class="submit" id='submit' url="{:U('index','model='.$model['name'],false)}"
+                     value="查询">
             </div>
-          </form>
+<!--          </form>-->
         </div>
         <div class="trunk-list">
           <div class="div_bgtab">
@@ -314,6 +315,22 @@
           $('.btn-security-close').on('click', function () {
               window.location.href = "{:U('Promote/index')}";
           });
+
+          $('#submit').click(function () {
+              var url = $(this).attr('url');
+              console.log(url);
+              var query = $('.jssearch').find('input').serialize();
+              query += "&" + $('.jssearch').find('select').serialize();
+              query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+              query = query.replace(/^&/g, '');
+              if (url.indexOf('?') > 0) {
+                  url += '&' + query;
+              } else {
+                  url += '?' + query;
+              }
+              window.location.href = url;
+
+          });
       });
   </script>
 </block>

Application/Home/View/default/PromoteCoin/coinRecord.html

@@ -107,7 +107,7 @@
 </block>
 
 <block name="body">
-	<div class="page-list normal_list apply-index-list">
+	<div class="page-list normal_list apply-index-list jssearch">
 		<div style="position: absolute;margin: .6% 2% 0 2%;margin-top: -30px;color: #6a7082;">
 			<span class="back-btn" style="cursor: pointer;"><i class="iconfont iconreply"></i> 返回</span>
 		</div>
@@ -119,10 +119,11 @@
 		</div>
 		<div class="trunk-content article">
 			<div class="trunk-search clearfix">
-				<form action="{:U('PromoteCoin/coinRecord',array('game_id'=>I('get.game_id')))}" method="post" enctype="multipart/form-data"
-							class="marg_top20">
+<!--				<form action="{:U('PromoteCoin/coinRecord',array('game_id'=>I('get.game_id')))}" method="post" enctype="multipart/form-data"-->
+<!--							class="marg_top20">-->
 					<div class="form-group normal_space fr">
-						<input type="submit" class="submit" value="查询">
+						<input type="submit" class="submit" id='submit' url="{:U('PromoteCoin/coinRecord',array('model'=>$model['name'],'game_id'=>I('get.game_id')),false)}"
+									 value="查询">
 					</div>
 					<div class="form-group normal_space fr">
 						<label>充值时间：</label>
@@ -161,7 +162,7 @@
 							</volist>
 						</select>
 					</div>
-				</form>
+<!--				</form>-->
 			</div>
 			<div class="trunk-list">
 				<div class="div_bgtab">
@@ -204,7 +205,7 @@
 					</table>
 				</div>
 				<div class="pagenation clearfix">
-					<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>8,'xlsname'=>'会长福利_平台币入账记录'),I('post.')))}" >导出</a>
+<!--					<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>8,'xlsname'=>'会长福利_平台币入账记录'),I('post.')))}" >导出</a>-->
 					{$_page}
 				</div>
 			</div>
@@ -254,6 +255,28 @@
 			$('.back-btn').on('click', function () {
 				history.back(-1);
 			});
+
+			$('#submit').click(function () {
+				var sdate = $('#start_time').val();
+				var edate = $('#end_time').val();
+				if (Date.parse(sdate) > Date.parse(edate)) {
+					layer.msg('开始时间必须小于等于结束时间');
+					return false;
+				}
+				var url = $(this).attr('url');
+				console.log(url);
+				var query = $('.jssearch').find('input').serialize();
+				query += "&" + $('.jssearch').find('select').serialize();
+				query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+				query = query.replace(/^&/g, '');
+				if (url.indexOf('?') > 0) {
+					url += '&' + query;
+				} else {
+					url += '?' + query;
+				}
+				window.location.href = url;
+
+			});
 		});
 	</script>
 </block>

Application/Home/View/default/PromoteCoin/myCoin.html

@@ -103,7 +103,7 @@
 </block>
 
 <block name="body">
-  <div class="page-list normal_list apply-index-list">
+  <div class="page-list normal_list apply-index-list jssearch">
     <div class="trunk-title">
       <div class="location">
         <div class="location-container">当前位置：<span>平台币管理></span><span>我的平台币</span></div>
@@ -112,10 +112,11 @@
     </div>
     <div class="trunk-content article">
       <div class="trunk-search clearfix">
-        <form action="{:U('myCoin')}" method="post" enctype="multipart/form-data"
-              class="marg_top20">
+<!--        <form action="{:U('myCoin')}" method="post" enctype="multipart/form-data"-->
+<!--              class="marg_top20">-->
           <div class="form-group normal_space fr">
-            <input type="submit" class="submit" value="查询">
+            <input type="submit" class="submit" id='submit' url="{:U('myCoin','model='.$model['name'],false)}"
+                   value="查询">
           </div>
           <div class="form-group normal_space fr">
             <label>状态：</label>
@@ -151,7 +152,7 @@
               </volist>
             </select>
           </div>
-        </form>
+<!--        </form>-->
       </div>
       <div class="trunk-list">
         <div class="div_bgtab">
@@ -191,7 +192,7 @@
           </table>
         </div>
         <div class="pagenation clearfix">
-          <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>8,'xlsname'=>'会长福利_平台币入账记录'),I('post.')))}" >导出</a>
+<!--          <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>8,'xlsname'=>'会长福利_平台币入账记录'),I('post.')))}" >导出</a>-->
           {$_page}
         </div>
       </div>
@@ -206,6 +207,22 @@
 
       $(document).ready(function () {
           $(".select_gallery").select2();
+
+          $('#submit').click(function () {
+              var url = $(this).attr('url');
+              console.log(url);
+              var query = $('.jssearch').find('input').serialize();
+              query += "&" + $('.jssearch').find('select').serialize();
+              query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+              query = query.replace(/^&/g, '');
+              if (url.indexOf('?') > 0) {
+                  url += '&' + query;
+              } else {
+                  url += '?' + query;
+              }
+              window.location.href = url;
+
+          });
       });
   </script>
 </block>

Application/Home/View/default/Public/promote_base.html

@@ -71,7 +71,12 @@
 			<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>游戏管理</span><i class="arrow_icon"></i></div>
 			<div class="navContent jsnavContent">
 				<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
-				<a href="{:U('Apply/index')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq index or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">专服管理</a>
+				<a href="{:U('Apply/gameSpecialList')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq gameSpecialList or ACTION_NAME eq specialMyGameList ) '>active</if> ">专服管理</a>
+				<a href="{:U('Apply/gameList')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq gameList or ACTION_NAME eq myGameList ) '>active</if> ">混服管理</a>
+				<if condition="getParentPromoteId(PID) eq 0">
+					<a href="{:U('GameDivide/index')}" class="<if condition='CONTROLLER_NAME eq GameDivide and (ACTION_NAME eq index ) '>active</if> ">分成比例</a>
+					<a href="{:U('Promote/setChildGamePermission')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq setChildGamePermission ) '>active</if> ">设置</a>
+				</if>
 				<a href="{:U('Apply/feature')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq feature or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">资料专区</a>
 			</div>
 

Application/Home/View/default/Query/dailySummary.html

@@ -89,7 +89,12 @@
           <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>
-              <volist name=":getAllPromoteListByType(3)" id="vo">
+              <notempty name="teamLeaderData">
+                <volist name="teamLeaderData" id="vo">
+                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+                </volist>
+              </notempty>
+              <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                 <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
               </volist>
             </select>
@@ -447,6 +452,36 @@
           setValue('server_id', {$Think.request.server_id |default = '""'});
           setValue('row', '{:I("get.row",10)}');
 
+          $('#team_leader_id').change(function () {
+              var promoteId = parseInt($(this).val());
+              var promoteValue = $(this).find("option:selected").text();
+
+              $.ajax({
+                  url: "{:U('getChildPromoteList')}",
+                  type: "post",
+                  data: {promote_id:promoteId},
+                  dataType: 'json',
+                  success: function (data) {
+                      var html = "<option value='' selected>推广员账号</option>";
+                      html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
+
+                      if (data.status == 1) {
+                          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>";
+                              }
+                          }
+                      }
+
+                      $("#promote_id").empty();
+                      $('#promote_id').html(html);
+                      $("#promote_id").select2();
+                  }
+              });
+          });
+
           $('#own').on('click', function () {
               var ownId = $('#own_id').val();
               var checkBox = $(this).children('i');

Application/Home/View/default/Query/recharge.html

@@ -52,7 +52,7 @@
       right: 10px;
     }
   </style>
-  <div class="page-search normal_list query-recharge-search">
+  <div class="page-search normal_list query-recharge-search jssearch">
     <div class="trunk-title">
       <div class="location">
         <div class="location-container">当前位置：<span>数据管理></span><span>订单查询</span></div>
@@ -63,8 +63,35 @@
     </div>
     <div class="trunk-content article">
       <div class="trunk-search clearfix">
-        <form action="{:U('Query/recharge',['version'=>I(" request.version
-        ",1),'row'=>I("get.row")])}" method="post" enctype="multipart/form-data" class="normal_form">
+<!--        <form action="{:U('Query/recharge',['version'=>I(" request.version-->
+<!--        ",1),'row'=>I("get.row")])}" method="post" enctype="multipart/form-data" class="normal_form">-->
+        <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(2)" id="vo">
+                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+              </volist>
+            </select>
+          </div>
+        </if>
+
+        <eq name="pID|isMinPromote" value="0">
+          <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>
+              <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
+                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+              </volist>
+            </select>
+          </div>
+        </eq>
+
         <div class="form-group normal_space fl">
           <select id="relation_game_id" name="relation_game_id" class="reselect select_gallery">
             <option value="">请选择游戏</option>
@@ -102,28 +129,6 @@
                  value="{:I('user_account')}">
         </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(2)" id="vo">
-                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
-              </volist>
-            </select>
-          </div>
-        </if>
-
-        <eq name="pID|isMinPromote" value="0">
-          <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>
-              <volist name=":getAllPromoteListByType(3)" id="vo">
-                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
-              </volist>
-            </select>
-          </div>
-        </eq>
-
         <div class="form-group normal_space fl">
           <label class="form-title select-title" style="position: relative;">起止时间：</label>
           <div class="select-time">
@@ -154,7 +159,8 @@
         </div>
 
         <div class="form-group normal_space fl">
-          <input type="submit" class="submit" id='submit' value="查询">
+          <input type="submit" class="submit" id='submit' url="{:U('Query/recharge','model='.$model['name'],false)}"
+                 value="查询">
         </div>
 
         <div class="form-group normal_space fl" style="margin-left: 60px;">
@@ -164,7 +170,7 @@
           </label>
         </div>
         <!-- <input type="hidden" name="version" value="{:I('version',1)}"> -->
-        </form>
+<!--        </form>-->
       </div>
     </div>
     <div class="page-list apply-app_apply-list query-recharge-list">
@@ -272,6 +278,36 @@
               endDate: date
           });
 
+          $('#team_leader_id').change(function () {
+              var promoteId = parseInt($(this).val());
+              var promoteValue = $(this).find("option:selected").text();
+
+              $.ajax({
+                  url: "{:U('getChildPromoteList')}",
+                  type: "post",
+                  data: {promote_id:promoteId},
+                  dataType: 'json',
+                  success: function (data) {
+                      var html = "<option value='' selected>推广员账号</option>";
+                      html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
+
+                      if (data.status == 1) {
+                          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>";
+                              }
+                          }
+                      }
+
+                      $("#promote_id").empty();
+                      $('#promote_id').html(html);
+                      $("#promote_id").select2();
+                  }
+              });
+          });
+
           $('#own').on('click',function () {
               var ownId = $('#own_id').val();
               var checkBox = $(this).children('i');
@@ -342,16 +378,25 @@
           $('#submit').click(function () {
               var sdate = $('#sdate').val();
               var edate = $('#edate').val();
-              // if(sdate =='' || edate==''){
-              //   layer.msg('请完整时间搜索框');
-              //   return false;
-              // }
               if (Date.parse(sdate) > Date.parse(edate)) {
                   layer.msg('开始时间必须小于等于结束时间');
                   return false;
               }
+              var url = $(this).attr('url');
+              console.log(url);
+              var query = $('.jssearch').find('input').serialize();
+              query += "&" + $('.jssearch').find('select').serialize();
+              query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+              query = query.replace(/^&/g, '');
+              if (url.indexOf('?') > 0) {
+                  url += '&' + query;
+              } else {
+                  url += '?' + query;
+              }
+              window.location.href = url;
 
           });
+
           $(".select_gallery").select2();
       });
   </script>

Application/Home/View/default/Query/register.html

@@ -24,7 +24,7 @@
 </block>
 
 <block name="body">
-  <div class="page-search normal_list query-register-search">
+  <div class="page-search normal_list query-register-search jssearch">
     <div class="trunk-title">
       <div class="location">
         <div class="location-container">当前位置：<span>数据管理></span><span>注册明细</span></div>
@@ -35,28 +35,33 @@
     </div>
     <div class="trunk-content article">
       <div class="trunk-search clearfix">
-        <form action="{:U('Query/register',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data">
-          <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(2)" id="vo">
-                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
-                </volist>
-              </select>
-            </div>
-          </if>
+<!--        <form action="{:U('Query/register',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data">-->
+        <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(2)" id="vo">
+                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+              </volist>
+            </select>
+          </div>
+        </if>
 
-          <eq name="pID|isMinPromote" value="0">
-            <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>
-                <volist name=":getAllPromoteListByType(3)" id="vo">
+        <eq name="pID|isMinPromote" value="0">
+          <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>
-              </select>
-            </div>
-          </eq>
+              </notempty>
+              <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
+                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+              </volist>
+            </select>
+          </div>
+        </eq>
 
           <div class="form-group fl">
             <input type="text" name="account" class="txt normal_txt" placeholder="请输入玩家账号"
@@ -80,7 +85,8 @@
           </div>
 
           <div class="form-group normal_space fl">
-            <input type="submit" class="submit" id='submit' value="查询">
+            <input type="submit" class="submit" id='submit' url="{:U('Query/register','model='.$model['name'],false)}"
+                   value="查询">
           </div>
 
           <div class="form-group normal_space fl" style="margin-left: 60px;">
@@ -89,7 +95,7 @@
               <input type="hidden" name="own_id" id="own_id" value="{:empty(I('own_id'))?0:I('own_id')}" />
             </label>
           </div>
-        </form>
+<!--        </form>-->
       </div>
     </div>
     <div class="page-list query-register-list">
@@ -177,6 +183,36 @@
               endDate: date
           });
 
+          $('#team_leader_id').change(function () {
+              var promoteId = parseInt($(this).val());
+              var promoteValue = $(this).find("option:selected").text();
+
+              $.ajax({
+                  url: "{:U('getChildPromoteList')}",
+                  type: "post",
+                  data: {promote_id:promoteId},
+                  dataType: 'json',
+                  success: function (data) {
+                      var html = "<option value='' selected>推广员账号</option>";
+                      html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
+
+                      if (data.status == 1) {
+                          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>";
+                              }
+                          }
+                      }
+
+                      $("#promote_id").empty();
+                      $('#promote_id').html(html);
+                      $("#promote_id").select2();
+                  }
+              });
+          });
+
           $('#own').on('click',function () {
               var ownId = $('#own_id').val();
               var checkBox = $(this).children('i');
@@ -204,14 +240,26 @@
           });
 
           $(".select_gallery").select2();
-          $('.submit').click(function () {
+          $('#submit').click(function () {
               var sdate = $('#sdate').val();
               var edate = $('#edate').val();
-
               if (Date.parse(sdate) > Date.parse(edate)) {
                   layer.msg('开始时间必须小于等于结束时间');
                   return false;
               }
+              var url = $(this).attr('url');
+              console.log(url);
+              var query = $('.jssearch').find('input').serialize();
+              query += "&" + $('.jssearch').find('select').serialize();
+              query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+              query = query.replace(/^&/g, '');
+              if (url.indexOf('?') > 0) {
+                  url += '&' + query;
+              } else {
+                  url += '?' + query;
+              }
+              window.location.href = url;
+
           });
       });
   </script>

Application/Home/View/default/Query/summary.html

@@ -79,7 +79,12 @@
           <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>
-              <volist name=":getAllPromoteListByType(3)" id="vo">
+              <notempty name="teamLeaderData">
+                <volist name="teamLeaderData" id="vo">
+                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+                </volist>
+              </notempty>
+              <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
                 <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
               </volist>
             </select>
@@ -234,6 +239,36 @@
           setValue('server_id', {$Think.request.server_id |default = '""'});
           setValue('row', '{:I("get.row",10)}');
 
+          $('#team_leader_id').change(function () {
+             var promoteId = parseInt($(this).val());
+             var promoteValue = $(this).find("option:selected").text();
+
+              $.ajax({
+                  url: "{:U('getChildPromoteList')}",
+                  type: "post",
+                  data: {promote_id:promoteId},
+                  dataType: 'json',
+                  success: function (data) {
+                      var html = "<option value='' selected>推广员账号</option>";
+                      html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
+
+                      if (data.status == 1) {
+                          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>";
+                              }
+                          }
+                      }
+
+                      $("#promote_id").empty();
+                      $('#promote_id').html(html);
+                      $("#promote_id").select2();
+                  }
+              });
+          });
+
           $('#own').on('click',function () {
               var ownId = $('#own_id').val();
               var checkBox = $(this).children('i');

Application/Home/View/default/Query/view_role.html

@@ -7,7 +7,7 @@
 </block>
 
 <block name="body">
-  <div class="page-search normal_list query-register-search" style="font-size: small;">
+  <div class="page-search normal_list query-register-search jssearch" style="font-size: small;">
     <div style="position: absolute;margin: .6% 2% 0 2%;margin-top: -30px;color: #6a7082;">
       <span class="back-btn" style="cursor: pointer;"><i class="iconfont iconreply"></i> 返回</span>
     </div>
@@ -20,7 +20,7 @@
     </div>
     <div class="trunk-content article">
       <div class="trunk-search clearfix">
-        <form action="{:U('Query/viewRole',array('row'=>I('get.row'),'id'=>I('get.id')))}" method="post" enctype="multipart/form-data">
+<!--        <form action="{:U('Query/viewRole',array('row'=>I('get.row'),'id'=>I('get.id')))}" method="post" enctype="multipart/form-data">-->
           <div class="form-group normal_space fl">
             <select id="relation_game_id" name="relation_game_id" class="reselect select_gallery">
               <option value="">请选择游戏</option>
@@ -65,9 +65,10 @@
           </div>
 
           <div class="form-group normal_space fl">
-            <input type="submit" class="submit" id='submit' value="查询">
+            <input type="submit" class="submit" id='submit' url="{:U('Query/viewRole',array('model'=>$model['name'],'id'=>I('get.id')),false)}"
+                   value="查询">
           </div>
-        </form>
+<!--        </form>-->
       </div>
     </div>
     <div class="page-list query-register-list">
@@ -95,7 +96,7 @@
                 <tr class="num2">
                   <td>{$vo.user_account}</td>
                   <td>{$vo.game_name}</td>
-                  <td>Phone</td>
+                  <td>--</td>
                   <td>{:getSDKTypeName($vo['sdk_version'])}</td>
                   <td>{$vo.play_time|date='Y-m-d H:i:s',###}</td>
                   <td>{$vo.server_name}</td>
@@ -203,18 +204,25 @@
           });
 
           $(".select_gallery").select2();
-          $('.submit').click(function () {
-
+          $('#submit').click(function () {
               var sdate = $('#sdate').val();
               var edate = $('#edate').val();
-              // if(sdate =='' || edate==''){
-              //   layer.msg('请完整时间搜索框');
-              //   return false;
-              // }
               if (Date.parse(sdate) > Date.parse(edate)) {
                   layer.msg('开始时间必须小于等于结束时间');
                   return false;
               }
+              var url = $(this).attr('url');
+              console.log(url);
+              var query = $('.jssearch').find('input').serialize();
+              query += "&" + $('.jssearch').find('select').serialize();
+              query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+              query = query.replace(/^&/g, '');
+              if (url.indexOf('?') > 0) {
+                  url += '&' + query;
+              } else {
+                  url += '?' + query;
+              }
+              window.location.href = url;
 
           });
       });