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

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{

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>

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>
@@ -125,7 +125,7 @@
 													'<div class="upload-pre-item"><span class="placeholder-graphic"><img style="width:50px" src="' + src + '"/></span></div>'
 											);
 												// console.log(data);
-												$("#icon").val(data.path);
+												$("#icon").val(data.id);
 											} else {
 												updateAlert(data.info);
 												setTimeout(function(){

Application/Home/Controller/PromoteController.class.php

@@ -101,27 +101,14 @@ class PromoteController extends BaseController
         $this->assign("_page", $page);
 
 
-        $promote = M("promote","tab_")->field("parent_id,grand_id")->where("id=".get_pid())->find();
         $promoteId = array(get_pid());
-//        $map = "promote_id = {$promote_id} ";
-//        if ($promote['parent_id'] == 1) {
-//            $promoteId = M("promote", "tab_")->field('id')->where("parent_id=" . get_pid()." or grand_id=". get_pid())->select();
-//            $promoteId = array_column($promoteId,'id');
-//            array_push($promoteId,get_pid());
+
         //计算当日用户充值数据
         $map['_string'] = "promote_id = {$promote_id} or tab_promote.parent_id = {$promote_id} or tab_promote.grand_id = {$promote_id} ";
 
         $pay_time = " between 0 and ".time();
         $spendData = $this->caculateSpend($pay_time,$map['_string']);
 
-//        } elseif ($promote['parent_id'] > 0 && $promote['grand_id'] == 0) {
-//            $promoteId = M("promote", "tab_")->field('id')->where("parent_id=" . get_pid())->select();
-//            $promoteId = array_column($promoteId,'id');
-//            array_push($promoteId,get_pid());
-//
-//            $map = "promote_id = {$promote_id} or tab_promote.parent_id = {$promote_id} ";
-//        }
-//        var_dump($map);
         $promoteId = implode(',',$promoteId);
         if ($promoteId) {
             $user_count = M("user", "tab_")->where("promote_id IN({$promoteId})")->count();
@@ -137,6 +124,7 @@ class PromoteController extends BaseController
         $data=M('User','tab_')
             ->field('promote_account,promote_id,date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(tab_user.id) as count,
 			     IF(tab_promote.grand_id>0,tab_promote.grand_id,IF(tab_promote.grand_id=0 and tab_promote.parent_id >0,tab_promote.parent_id,promote_id)) as promote_id1 ,		
+			    count(IF(register_time '.$yesterdays.',1,null)) as yesterday,
 			    count(IF(register_time '.$today.',1,null)) as today,
 			    count(IF(register_time '.$week.',1,null)) as week,
 			    count(IF(register_time '.$mounth.',1,null)) as mounth')
@@ -146,6 +134,7 @@ class PromoteController extends BaseController
             ->having('promote_id != 0')
             ->order('count desc,register_time')
             ->find();
+//        echo M('User','tab_')->_sql();die();
 
         $total_money = $this->pay_total(0, 0,$promoteId);
         $today_add_user_money = $this->pay_total(1,1,$promoteId);
@@ -162,25 +151,6 @@ class PromoteController extends BaseController
 
         $mounthAddSpendData = $this->caculateSpend($pay_time,$map['_string'],[],2);
 
-//        var_dump($mounthAddSpendData);die();
-
-//        $map['register_time'] = ['between',array($yesterday_start,$yesterday_end-1)];
-
-        $yesterdayData = M('User','tab_')
-            ->field('promote_account,promote_id,date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(tab_user.id) as count,
-			     IF(tab_promote.grand_id>0,tab_promote.grand_id,IF(tab_promote.grand_id=0 and tab_promote.parent_id >0,tab_promote.parent_id,promote_id)) as promote_id1 ,		
-			    count(IF(register_time '.$yesterdays.',1,null)) as today,
-			    count(IF(register_time '.$week.',1,null)) as week,
-			    count(IF(register_time '.$mounth.',1,null)) as mounth')
-            ->join('tab_promote on promote_id = tab_promote.id','left')
-            ->where($map)
-            ->group('promote_id1')
-            ->having('promote_id != 0')
-            ->order('count desc,register_time')
-            ->find();
-//        echo M('User','tab_')->_sql();die();
-//        var_dump($yesterdayData);die();
-
         $yesterday_user_regist_count = M("user", "tab_")->where(
             array("promote_id" => array('in',$promoteId),
                 "register_time" => array("BETWEEN", array($yesterday_start, $yesterday_end))))
@@ -197,7 +167,7 @@ class PromoteController extends BaseController
         $today_total_money = $this->pay_total(1, 0,$promoteId);
 
         $this->assign('data',$data);
-        $this->assign('yesterdayData',$yesterdayData);
+//        $this->assign('yesterdayData',$yesterdayData);
         $this->assign('spendData',$spendData);
         $this->assign('yesterdaySpendData',$yesterdaySpendData);
         $this->assign('todayAddSpendData',$todayAddSpendData);
@@ -524,7 +494,7 @@ class PromoteController extends BaseController
         } elseif ($type == 50) {
             $data_list = null;
             $count = 0;
-        } else if($type == 0) {
+        } /*else if($type == 0) {
             $field = 'id,game_name,server_name,user_account,nickname,promote_account,detail,create_time as update_time';
             $data_list = M("protect_log","tab_")->field($field)->limit('0,5')->order("create_time desc")->select();
 
@@ -533,7 +503,7 @@ class PromoteController extends BaseController
             }
 
             $count = M("protect_log","tab_")->field($field)->count();
-        } else {
+        }*/ else {
             $data_list = M("document", "sys_")->limit('0,50')->where("category_id=56 and status=1")->order("update_time desc")->page($page, $row)->select(); //游戏公告
             $count = M("document", "sys_")->where("category_id=56 and status=1")->count();
         }

Application/Home/Controller/QueryController.class.php

@@ -1655,12 +1655,12 @@ class QueryController extends BaseController
         $result['status'] = 0;
         $result['data'] = [];
 
-        if (empty($relationGameId) && empty($sdkVersion)) {
+        if (empty($relationGameId)) {
             return $result;
         }
 
-        empty($relationGameId) || $map['relation_game_id'] = $relationGameId;
-        empty($sdkVersion) || $map['sdk_version'] = $sdkVersion;
+        $map['relation_game_id'] = intval($relationGameId);
+        empty($sdkVersion) || $map['sdk_version'] = intval($sdkVersion);
 
         $gameIds = M('Game', 'tab_')
             ->where($map)

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']);
@@ -197,6 +196,7 @@ class TestResourceController extends BaseController
 
         M('protect_log_read', 'tab_')->startTrans();  //事物
         try {
+
             $arrUserId = array_column($data,'id');
             $logId = implode(',',$arrUserId);
 
@@ -214,7 +214,7 @@ class TestResourceController extends BaseController
             $addData = [];
             $k = 0;
             foreach($arrUserId as $key => $value) {
-                if (in_array($value['id'],$upsetData)) {
+                if (in_array($value,$upsetData)) {
                     continue;
                 } else {
                     $addData[$k]['log_id'] = $value;
@@ -605,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);
+    }
 
 }

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

@@ -11,7 +11,7 @@
             <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi5.png"/></span></div> <div class="text text5"><p>当月新增用户充值</p><span>￥{$mounthAddSpendData.mounth}</span></div> </li>
         </ul>
         <ul style="margin-top: 10px">
-            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi1.png"/></span></div> <div class="text text2"><p>昨日注册用户</p><span>{$yesterdayData.today}</span></div> </li>
+            <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi1.png"/></span></div> <div class="text text2"><p>昨日注册用户</p><span>{$data.yesterday}</span></div> </li>
             <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi2.png"/></span></div> <div class="text text1"><p>昨日充值金额</p><span>￥{$yesterdaySpendData.count}</span></div> </li>
             <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi3.png"/></span></div> <div class="text text3"><p>今日注册用户</p><span>{$data.today}</span></div> </li>
             <li><div class="icon"><span class="placeholder-graphic"><img src="__IMG__/20180207/icon_chongzhi5.png"/></span></div> <div class="text text5"><p>今日充值金额</p><span>￥{$spendData.today}</span></div> </li>

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

@@ -21,11 +21,11 @@
                         </if>
                     </span>
                     <span class="fxui-tab-tit <if condition="$type==50">curr</if>"><a href="{:U('msg_list')}&type=50">消息</a>
-<!--                        <if condition="$gg_count neq 0">-->
-<!--                        <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">-->
-<!--                            <a style="line-height: 25px;padding: 0px;color: #fff">0</a>-->
-<!--                        </span>-->
-<!--                        </if>-->
+                        <!--                        <if condition="$gg_count neq 0">-->
+                        <!--                        <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">-->
+                        <!--                            <a style="line-height: 25px;padding: 0px;color: #fff">0</a>-->
+                        <!--                        </span>-->
+                        <!--                        </if>-->
                     </span>
                     <span class="fxui-tab-tit <if condition="$type==51">curr</if>"><a href="{:U('msg_list')}&type=51">游戏活动</a>
                         <if condition="$zx_count neq 0">
@@ -34,12 +34,12 @@
                             </span>
                         </if>
                     </span>
-                    <span class="fxui-tab-tit <if condition="$type==0">curr</if>"><a href="{:U('msg_list')}&type=0">资源号异常日志</a>
-                        <if condition="$rz_count neq 0">
+                    <span class="fxui-tab-tit <if condition="$type==0">curr</if>"><a href="index.php/Home/TestResource/protectLogList.html">资源号异常日志</a>
+                        <!--<if condition="$rz_count neq 0">
                             <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:125px;text-align: center;background: rgba(255, 0, 0, 1)">
                                 <a style="line-height: 25px;padding: 0px;color: #fff">{$rz_count}</a>
                             </span>
-                        </if>
+                        </if>-->
                     </span>
                 </div>
                 <div class="fxui-tab-nav">
@@ -49,7 +49,7 @@
                         <volist name="data_list" id="data">
                             <p>
                                 <if condition="$type neq 0">
-                                <span class="title"><a href="index.php?s=/Home/Article/detail/id/{$data.id}.html">{$data.title}</a></span>
+                                    <span class="title"><a href="index.php?s=/Home/Article/detail/id/{$data.id}.html">{$data.title}</a></span>
                                     <else/>
                                     <span class="title"><a href="index.php?s=/Home/TestResource/protectLogList/id/{$zx.id}.html">{$data.title}</a></span>
                                 </if>
@@ -58,11 +58,14 @@
                         </volist>
                     </empty>
                 </div>
+                <notempty name="data_list">
+                    <div class="pagenation clearfix" >
+                        {$_page}
+                    </div>
+               </notempty>
             </div>
         </div>
-        <div class="pagenation clearfix">
-            {$_page}
-        </div>
+
     </div>
 </block>
 <block name="script">

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

@@ -176,7 +176,7 @@
 
     <div id="chart_box" class="trunk-content" style="width: calc(100% - 40px);height: 400px;"></div>
 
-    <div class="page-list apply-app_apply-list query-recharge-list">
+    <div class="page-list apply-app_apply-list query-recharge-list" style="margin-top: 20px;">
       <div class="trunk-content article">
         <div class="tabcon trunk-list">
           <table class="table normal_table">
@@ -184,13 +184,13 @@
               <th>日期</th>
               <th class="pointer-hand" title="创角数：统计时间范围内，成功创建角色数量（唯一）">创角数</th>
               <th class="pointer-hand" title="创角用户：统计时间范围内，成功创角的用户数（去重）">创角用户</th>
-              <th class="pointer-hand" title="新创角用户：当日（24小时），首次创建角色的用户数; 新创角设备：当日（24小时），首次创建角色设备总数（去重）;">新创角用户|新创角设备
+              <th class="pointer-hand" title="新创角用户：当日（24小时），首次创建角色的用户数；新创角设备：当日（24小时），首次创建角色设备总数（去重）">新创角用户|新创角设备
               </th>
               <th class="pointer-hand" title="新增创角IP：统计时间范围内，首次创建角色IP总数（去重）">新增创角IP</th>
               <th class="pointer-hand" title="登录用户数：统计时间范围内，登录的用户数（去重）">登录用户数</th>
-              <th class="pointer-hand" title="充值人数：统计时间范围内，支付成功且处理成功的游戏充值订单用户数（去重）">充值人数</th>
-              <th class="pointer-hand" title="充值次数：统计时间范围内，游戏充值成功订单数">充值次数</th>
-              <th class="pointer-hand spend-btn" title="充值总额：统计时间范围内，在游戏内充值成功的订单金额总和" style="width: 200px;">充值总额<i
+              <th class="pointer-hand" title="充值人数：当日（24小时），在游戏内充值成功的订单的用户数（去重）">充值人数</th>
+              <th class="pointer-hand" title="充值次数：当日（24小时），在游戏内充值成功的订单数量">充值次数</th>
+              <th class="pointer-hand spend-btn" title="充值总额：当日（24小时），在游戏内充值成功的订单金额总和" style="width: 200px;">充值总额<i
                       class="iconfont iconplus-square icon-spend"></i></th>
               <th class="pointer-hand spend-element th-hide" title="现金充值：统计时间范围内，在游戏内充值成功的订单，使用现金支付金额总和">现金充值</th>
               <th class="pointer-hand spend-element th-hide" title="通用币充值：统计时间范围内，在游戏内充值成功的订单，使用通用币支付金额总和">通用币充值</th>
@@ -198,7 +198,7 @@
               <th class="pointer-hand spend-element th-hide" title="折扣币充值：统计时间范围内，在游戏内充值成功的订单，使用折扣币支付金额总和，该部分不参与结算">
                 折扣币充值
               </th>
-              <th class="pointer-hand spend-element th-hide" title="代金劵使用：统计时间范围内，在游戏内充值成功的订单，使用代金券金额总和，该部分不参与结算">
+              <th class="pointer-hand spend-element th-hide" title="代金券使用：统计时间范围内，在游戏内充值成功的订单，使用代金券总和，该部分不参与结算">
                 代金劵使用
               </th>
             </tr>
@@ -609,7 +609,9 @@
               var sdkVersion = $(this).val();
               var relationGameId = $('#relation_game_id').val();
 
-              getServerList(relationGameId, sdkVersion);
+              if (relationGameId > 0) {
+                  getServerList(relationGameId, sdkVersion);
+              }
           });
 
           function getServerList(relationGameId, sdkVersion) {

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

@@ -343,7 +343,9 @@
               var sdkVersion = $(this).val();
               var relationGameId = $('#relation_game_id').val();
 
-              getServerList(relationGameId, sdkVersion);
+              if (relationGameId > 0) {
+                  getServerList(relationGameId, sdkVersion);
+              }
           });
 
           function getServerList(relationGameId, sdkVersion)

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

@@ -155,17 +155,23 @@
               <th>平台</th>
               <th class="pointer-hand" title="创角数：统计时间范围内，成功创建角色数量（唯一）">创角数</th>
               <th class="pointer-hand" title="创角用户：统计时间范围内，成功创角的用户数（去重）">创角用户</th>
-              <th class="pointer-hand" title="新创角用户：当日（24小时），首次创建角色的用户数; 新创角设备：当日（24小时），首次创建角色设备总数（去重）;">新创角用户|新创角设备</th>
+              <th class="pointer-hand" title="新创角用户：当日（24小时），首次创建角色的用户数；新创角设备：当日（24小时），首次创建角色设备总数（去重）">新创角用户|新创角设备
+              </th>
               <th class="pointer-hand" title="新增创角IP：统计时间范围内，首次创建角色IP总数（去重）">新增创角IP</th>
               <th class="pointer-hand" title="登录用户数：统计时间范围内，登录的用户数（去重）">登录用户数</th>
-              <th class="pointer-hand" title="充值人数：统计时间范围内，支付成功且处理成功的游戏充值订单用户数（去重）">充值人数</th>
-              <th class="pointer-hand" title="充值次数：统计时间范围内，游戏充值成功订单数">充值次数</th>
-              <th class="pointer-hand spend-btn" title="充值总额：统计时间范围内，在游戏内充值成功的订单金额总和" style="width: 200px;">充值总额<i class="iconfont iconplus-square icon-spend"></i></th>
+              <th class="pointer-hand" title="充值人数：当日（24小时），在游戏内充值成功的订单的用户数（去重）">充值人数</th>
+              <th class="pointer-hand" title="充值次数：当日（24小时），在游戏内充值成功的订单数量">充值次数</th>
+              <th class="pointer-hand spend-btn" title="充值总额：当日（24小时），在游戏内充值成功的订单金额总和" style="width: 200px;">充值总额<i
+                      class="iconfont iconplus-square icon-spend"></i></th>
               <th class="pointer-hand spend-element th-hide" title="现金充值：统计时间范围内，在游戏内充值成功的订单，使用现金支付金额总和">现金充值</th>
               <th class="pointer-hand spend-element th-hide" title="通用币充值：统计时间范围内，在游戏内充值成功的订单，使用通用币支付金额总和">通用币充值</th>
               <th class="pointer-hand spend-element th-hide" title="绑定币充值：统计时间范围内，在游戏内充值成功的订单，使用绑定币支付金额总和">绑定币充值</th>
-              <th class="pointer-hand spend-element th-hide" title="折扣币充值：统计时间范围内，在游戏内充值成功的订单，使用折扣币支付金额总和，该部分不参与结算">折扣币充值</th>
-              <th class="pointer-hand spend-element th-hide" title="代金劵使用：统计时间范围内，在游戏内充值成功的订单，使用代金券金额总和，该部分不参与结算">代金劵使用</th>
+              <th class="pointer-hand spend-element th-hide" title="折扣币充值：统计时间范围内，在游戏内充值成功的订单，使用折扣币支付金额总和，该部分不参与结算">
+                折扣币充值
+              </th>
+              <th class="pointer-hand spend-element th-hide" title="代金券使用：统计时间范围内，在游戏内充值成功的订单，使用代金券总和，该部分不参与结算">
+                代金劵使用
+              </th>
             </tr>
             <empty name="listData">
               <tr class="num2">
@@ -376,7 +382,9 @@
               var sdkVersion = $(this).val();
               var relationGameId = $('#relation_game_id').val();
 
-              getServerList(relationGameId, sdkVersion);
+              if (relationGameId > 0) {
+                  getServerList(relationGameId, sdkVersion);
+              }
           });
 
           function getServerList(relationGameId, sdkVersion)

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

@@ -166,7 +166,9 @@
               var sdkVersion = $(this).val();
               var relationGameId = $('#relation_game_id').val();
 
-              getServerList(relationGameId, sdkVersion);
+              if (relationGameId > 0) {
+                  getServerList(relationGameId, sdkVersion);
+              }
           });
 
           function getServerList(relationGameId, sdkVersion)

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>

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 == promoteId) {
+          html += "selected='selected'";
+        }
+        html +=" >"+ promoteValue + "</option>";
+        $('#promote_id').children().first().after(html);
+        console.log(promote_id);
+      }
+    }
   </script>
 </block>

Application/Mobile/View/Index/product.html

@@ -12,105 +12,6 @@
   </style>
   <!--头部-->
   <div class="zmarg_btm59">
-
-    <!--搜索框-->
-    <style>
-      .searchbox {
-        background: #E5E9EC;
-        padding: 1rem 0;
-        border-bottom: 1px solid #DCDDE0;
-      }
-      .searchbox .search {
-        margin: 0 6rem;
-        display: block;
-        position: relative;
-        text-align: center;
-      }
-      .searchbox .search .text {
-        box-sizing: border-box;
-        -webkit-sizing: border-box;
-        width: 100%;
-        font-size: 1.8rem;
-        border: none;
-        background: #FFF;
-        border-radius: 4rem;
-        padding: .5rem 1.5rem .5rem 4rem;
-        height: 3.2rem;
-      }
-      .searchbox .search .btn {
-        position: absolute;
-        top: 0.6rem;
-        left: 1.1rem;
-      }
-      .searchbox .search .btn .iconfont {
-        font-size: 2.4rem;
-        color: #bbb;
-      }
-
-    </style>
-
-    <div class="searchbox">
-      <form action="" method="post" class="search">
-          <span onclick="game_category()">
-            <input type="text" name="name" class="text" placeholder="请输入游戏名称" disabled>
-          </span>
-        <span class="btn searchbtn"><i class="iconfont icon-search"></i></span>
-      </form>
-    </div>
-    <script>
-        function game_category() {
-            window.location.href = "{:U('Category/index')}";
-        }
-    </script>
-    <!--end 搜索框-->
-    <!-- start推荐产品 -->
-    <div class="hot-game-box">
-      <div class="box-title" style="margin-top:0;">
-        <span>推荐产品</span>
-        <a href="{:U('Rank/index',array('rank'=>'hot'))}">&plus;更多</a>
-      </div>
-      <div class="swiper-container swiper-container-hotGame">
-        <div class="swiper-wrapper">
-          <style>
-            .g-list li {
-              list-style: none;
-              width: 47.8%;
-              margin-bottom: .4rem;
-              position: relative;
-              float: left;
-              margin-right: 2.2%;
-            }
-            .g-list li span{
-              color: #333;
-              font-size: 15px;
-              margin: .2rem 0 .06667rem;
-              overflow: hidden;
-              display: -webkit-box;
-            }
-            .g-list li p{
-              font-size: 15px;
-              color: #9c9c9c;
-              line-height: 1.4;
-              overflow: hidden;
-              display: -webkit-box;
-            }
-          </style>
-          <ul class="g-list">
-            <volist name="recommend" id="rec">
-              <li>
-                <a href="{:U('Game/detail?id='.$rec['id'])}" data-param=""><img src="{:get_cover($rec['cover'],'path')}">
-                  <div class="rec-name">
-                    <span>{:msubstr2($rec['relation_game_name'],0,10)}</span>
-                    <p class="rec-p">{:msubstr2($rec['features'],0,10)}</p></div>
-                </a>
-              </li>
-            </volist>
-          </ul>
-        </div>
-      </div>
-    </div>
-    <!-- end推荐产品 -->
-
     <!-- start轮播banner -->
     <div class="banner" style="width:100%;">
       <div class="swiper-container swiper-container-banner" style="width:100%;">

Application/Mobile/View/User/index.html

@@ -139,6 +139,12 @@
                 <img src="__IMG__/icon_xiaofei@3x.png" class="icon"><p class="name">消费记录</p>
               </a>
             </li> -->
+            <li>
+              <?php $exchangerecord = $user['id'] ? U('exchangerecord') : U('login');?>
+              <a class="item" href="/mobile.php/ssg/home.html">
+                <img src="__IMG__/super_sign.png" class="icon"><p class="name">超级签</p>
+              </a>
+            </li>
 			<!-- 最后一个空矩形框，无内容 begin! -->
 			<li>
               <a class="item" >

Data/update.sql

@@ -168,17 +168,11 @@ 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;
 
 -- 2019-10-23 zcl
-ALTER TABLE `tab_coin_pay_order` CHANGE COLUMN `currency_num` `coin_num`  int(11) NULL DEFAULT 0 COMMENT '代币数量' AFTER `auditor_time`;
+ALTER TABLE `tab_coin_pay_order` CHANGE COLUMN `currency_num` `coin_num`  int(11) NULL DEFAULT 0 COMMENT '代币数量' AFTER `auditor_time`;
+
+-- 2019-10-23 zcl
+update tab_quick_menu set name='订单查询' where name='充值明细'

Public/Home/css/index/index.new.css

@@ -40,8 +40,8 @@
 
 .more{display: block;float: right;padding-top: 10px;font-size: 14px;color: #4A90F0}
 .more:hover{color:#26C7DB}
-.fxui-tab {font-size: 14px;}
-.fxui-tab-hand{height: 45px;line-height: 35px;margin: 10px;border-bottom: 1px solid #ddd}
+.fxui-tab {font-size: 14px;margin-left: 20px;margin-right: 20px;}
+.fxui-tab-hand{height: 45px;line-height: 35px;margin: 10px;border-bottom: 1px solid #ddd;}
 .fxui-tab-tit{display: block;float: left;font-size: 14px;height: 35px;line-height: 35px;cursor: pointer;border: 1px solid #ddd;}
 .fxui-tab-tit a{display: block;height: 35px;line-height: 35px;padding: 0 20px ;}
 .fxui-tab-tit:first-child{border-bottom-left-radius:3px;border-top-left-radius: 3px}

Public/Mobile/js/new/index.js

@@ -1,7 +1,7 @@
 $(function(){
     /*轮播banner*/
     var mySwiper_banner = new Swiper('.swiper-container-banner', {
-        autoplay: true,
+        autoplay: img.length > 1,
         loop: true,
         pagination: {
             el: '.swiper-container-banner .swiper-pagination',