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

Application/Admin/Controller/AjaxController.class.php

@@ -91,6 +91,8 @@ class AjaxController extends ThinkController{
         $map = [];
         if ($game) {
             $map['game_id'] = ['in', $game];
+        } else {
+            $map['game_id'] = ['in', [-1]];
         }
         $data = M('Server', 'tab_')->field('id, server_name, server_id')->where($map)->group('server_name')->select();
         $this->AjaxReturn($data);

Application/Admin/Controller/ExportController.class.php

@@ -1916,6 +1916,25 @@ class ExportController extends Controller
                         }
                         break;
                     case 23:
+                            $params = I('get.');
+                            $map['tab_game_supersign.pay_status'] = 1;
+                            if (isset($params['order_id'])) {
+                                $map['tab_game_supersign.order_id'] = $params['order_id'];
+                            }
+                            if (isset($params['account'])) {
+                                $map['tab_user.account'] = $params['account'];
+                            }
+                            if (isset($params['promote_id'])) {
+                                $promoteId = $params['promote_id'];
+                                if ($promoteId == 0) {
+                                    $map['promote_id'] = 0;
+                                } else {
+                                    $promoteMap['chain'] = ['like', "%/$promoteId/%"];
+                                    $promoteIds          = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
+                                    $promoteIds[] = $promoteId;
+                                    $map['tab_user.promote_id'] = ['in', $promoteIds];
+                                }
+                            }
                          $xlsCell = array(
                             array('order_id', '订单号'),
                             array('account', '游戏账号'),
@@ -1925,7 +1944,7 @@ class ExportController extends Controller
                             array('pay_time', '购买时间'),
                             array('super_money', '超级签金额'),
                         );
-                        $xlsData = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where(['tab_game_supersign.pay_status' => 1])->order('id DESC')->select();
+                        $xlsData = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->order('id DESC')->select();
                         foreach($xlsData as $k => $v) {
                             $xlsData[$k]['pay_time'] = date('Y-m-d H:i:s',$v['pay_time']);
                         }
@@ -3097,9 +3116,15 @@ class ExportController extends Controller
             $end_time = $end = strtotime($end) + 86400;
 
             $map = " 1=1 ";
+            $game_map = "";
             if (isset($_REQUEST['game_name'])) {
+                $game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
                 $map .= " AND game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
+                $game_map = " AND EXISTS (SELECT upi.user_id FROM  tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
+                if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
+                $game_map .= ") ";
             }
+
             if (isset($_REQUEST['server_name'])) {
                 $map .= " AND server_name = '{$_REQUEST['server_name']}' ";
             }
@@ -3114,10 +3139,11 @@ class ExportController extends Controller
                     tab_user u
                 WHERE
                     u.register_time BETWEEN {$start_time}
-                AND {$end_time}
+                AND {$end_time} {$game_map}
                 GROUP BY reg_date
                 ORDER BY reg_date asc
             ");
+            
             $result = [];
             foreach ($users as $index => $item) {
                 $ltv_start = strtotime($item['reg_date']);
@@ -3133,7 +3159,7 @@ class ExportController extends Controller
                         ROUND(SUM(if (pay_time BETWEEN {$ltv_start} and ".($ltv_start+86400 * 7).", pay_amount, 0))/{$item['total_count']}, 2) as ltv_7,
                         ROUND(SUM(if (pay_time BETWEEN {$ltv_start} and ".($ltv_start+86400 * 14).", pay_amount, 0))/{$item['total_count']}, 2) as ltv_14,
                         ROUND(SUM(if (pay_time BETWEEN {$ltv_start} and ".($ltv_start+86400 * 30).", pay_amount, 0))/{$item['total_count']}, 2) as ltv_30,
-                        SUM(pay_amount) as total_amt
+                        SUM(if (pay_time BETWEEN {$start_time} and ".($end_time).", pay_amount, 0)) as total_amt
                     FROM
                         tab_spend
                     WHERE

Application/Admin/Controller/PromoteGameRatioController.class.php

@@ -126,7 +126,9 @@ class PromoteGameRatioController extends ThinkController
             $params = I('get.');
             $id = $params['id'] ?? 0;
             $id = intval($id);
+            $metaTitle = '游戏分成比例申请';
             if ($id) {
+                $metaTitle .= '--修改';
                 $field = 'promote_id, game_id, ratio, begin_time, end_time, remark';
                 $map['id'] = $id;
                 $promoteGameRatio = D(self::MODEL_NAME)->field($field)->where($map)->find();
@@ -138,7 +140,7 @@ class PromoteGameRatioController extends ThinkController
 
             $this->assign('gameList', getAllGameList());
             $this->assign('promoteList', getPromoteByLevel(1));
-            $this->meta_title = '游戏分成比例申请';
+            $this->meta_title = $metaTitle;
             $this->display();
         }
     }

Application/Admin/Controller/StatisticsController.class.php

@@ -1002,12 +1002,17 @@ if ($payids) {
 		$end_time = $end_time > $end ? $end : $end_time;
 
 		$map = " 1=1 ";
+		$game_map = "";
 		if (isset($_REQUEST['game_name'])) {
-			$map .= " AND game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
+			$game_ids = implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id'));
+			$map .= " AND game_id in ({$game_ids})";
+			$game_map = " AND EXISTS (SELECT upi.user_id FROM  tab_user_play_info as upi where upi.game_id in ({$game_ids}) AND upi.user_id = u.id ";
+			if (isset($_REQUEST['server_name'])) $game_map .= " AND upi.server_name = '{$_REQUEST['server_name']}' ";
+			$game_map .= ") ";
 		}
 		if (isset($_REQUEST['server_name'])) {
             $map .= " AND server_name = '{$_REQUEST['server_name']}' ";
-        }
+		}
 		// 获取包含的用户id
 		$users = M()->query("
 			SELECT
@@ -1018,7 +1023,7 @@ if ($payids) {
 				tab_user u
 			WHERE
 				u.register_time BETWEEN {$start_time}
-			AND {$end_time}
+			AND {$end_time} {$game_map}
 			GROUP BY reg_date
 			ORDER BY reg_date asc
 		");
@@ -1037,7 +1042,7 @@ if ($payids) {
 					ROUND(SUM(if (pay_time BETWEEN {$ltv_start} and ".($ltv_start+86400 * 7).", pay_amount, 0))/{$item['total_count']}, 2) as ltv_7,
 					ROUND(SUM(if (pay_time BETWEEN {$ltv_start} and ".($ltv_start+86400 * 14).", pay_amount, 0))/{$item['total_count']}, 2) as ltv_14,
 					ROUND(SUM(if (pay_time BETWEEN {$ltv_start} and ".($ltv_start+86400 * 30).", pay_amount, 0))/{$item['total_count']}, 2) as ltv_30,
-					SUM(pay_amount) as total_amt
+					SUM(if (pay_time BETWEEN {$ltv_start} and ".($ltv_start+86400 * 30).", pay_amount, 0)) as total_amt
 				FROM
 					tab_spend
 				WHERE

Application/Admin/Controller/SuperStatisticalController.class.php

@@ -102,8 +102,27 @@ class SuperStatisticalController extends ThinkController
     public function superDetail($p = 1,$row = 10) {
         $page = $p ? $p : 1; 
         $row = $row ? $row : 10;
-        $data = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where(['tab_game_supersign.pay_status' => 1])->page($page,$row)->order('id DESC')->select();
-        $count = M('game_supersign', 'tab_')->field('tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where(['tab_game_supersign.pay_status' => 1])->count();
+        $params = I('get.');
+        $map['tab_game_supersign.pay_status'] = 1;
+        if (isset($params['order_id'])) {
+            $map['tab_game_supersign.order_id'] = $params['order_id'];
+        }
+        if (isset($params['account'])) {
+            $map['tab_user.account'] = $params['account'];
+        }
+        if (isset($params['promote_id'])) {
+            $promoteId = $params['promote_id'];
+            if ($promoteId == 0) {
+                $map['promote_id'] = 0;
+            } else {
+                $promoteMap['chain'] = ['like', "%/$promoteId/%"];
+                $promoteIds          = M('Promote', 'tab_')->where($promoteMap)->getField('id', true);
+                $promoteIds[] = $promoteId;
+                $map['tab_user.promote_id'] = ['in', $promoteIds];
+            }
+        }
+        $data = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->page($page,$row)->order('id DESC')->select();
+        $count = M('game_supersign', 'tab_')->field('tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->count();
         $super_money_all = $count * $this->super_money;
 
         $page = set_pagination($count, $row);

Application/Admin/Controller/access_data_foldline.txt

@@ -1 +1 @@
-{"news":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":1},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":1},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"sum":{"news":2,"active":13,"player":5,"money":1330.05},"active":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":3},{"time":"10:00","count":2},{"time":"11:00","count":2},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":1},{"time":"15:00","count":1},{"time":"16:00","count":0},{"time":"17:00","count":1},{"time":"18:00","count":0},{"time":"19:00","count":2},{"time":"20:00","count":0},{"time":"21:00","count":1},{"time":"22:00","count":0},{"time":"23:00","count":0}],"player":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":1},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":1},{"time":"15:00","count":1},{"time":"16:00","count":2},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"money":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":"962.00"},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":"356.00"},{"time":"15:00","count":"0.03"},{"time":"16:00","count":"12.02"},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}]}
+{"news":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":2},{"time":"16:00","count":2},{"time":"17:00","count":1},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"sum":{"news":5,"active":17,"player":1,"money":6},"active":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":3},{"time":"10:00","count":1},{"time":"11:00","count":3},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":1},{"time":"15:00","count":3},{"time":"16:00","count":4},{"time":"17:00","count":2},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"player":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":1},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"money":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":"6.00"},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}]}

Application/Admin/View/PromoteGameRatio/applyRatio.html

@@ -5,6 +5,15 @@
 <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
 <script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script>
 
+  <style>
+    .tabcon1711 input.time {
+      width: 150px;
+    }
+    #form .txt_area {
+      width: 300px;
+      height: 150px;
+    }
+  </style>
   <div class="cf main-place top_nav_list navtab_list">
     <h3 class="page_title">{$meta_title}</h3>
 <!--    <p class="description_text">说明：此功是创建推广员时所需填写信息</p>-->
@@ -24,15 +33,17 @@
               <td class="r">
                 <select name="promote_id" id="promote_id">
                   <option value="">会长账号</option>
-                  <volist name="promoteList" id="vo">
-                    <empty name="record">
+                  <empty name="record">
+                    <volist name="promoteList" id="vo">
                       <option  value="{$vo.id}">{$vo.account}({$vo.real_name})</option>
-                      <else/>
-                      <option value="{$vo.id}" <if condition="$vo.id eq $record.promote_id">selected</if> >{$vo.account}({$vo.real_name})</option>
-                    </empty>
-                  </volist>
+                    </volist>
+                    <else/>
+                    <volist name="promoteList" id="vo">
+                      <option value="{$vo.id}" <if condition="$vo['id'] eq $record['promote_id']">selected</if> >{$vo.account}({$vo.real_name})</option>
+                    </volist>
+                  </empty>
                 </select>
-                <span class="notice-text">通过推广员后台注册申请或者管理后台创建的账号</span>
+                <span class="notice-text">一级渠道推广员账号</span>
               </td>
             </tr>
             <tr>
@@ -40,60 +51,50 @@
               <td class="r">
                 <select id="game_id" name="game_id" class="select_gallery" >
                   <option value="">游戏名称</option>
-                  <volist name="gameList" id="vo">
-                    <empty name="record">
+                  <empty name="record">
+                    <volist name="gameList" id="vo">
                       <option value="{$vo.id}">{$vo.game_name}</option>
-                      <else/>
-                      <option value="{$vo.id}" <if condition="$vo.id eq $record.game_id">selected</if> >{$vo.game_name}</option>
-                    </empty>
-                  </volist>
+                    </volist>
+                    <else/>
+                    <volist name="gameList" id="vo">
+                      <option value="{$vo.id}" <if condition="$vo['id'] eq $record['game_id']">selected</if> >{$vo.game_name}</option>
+                    </volist>
+                  </empty>
                 </select>
-                <span class="notice-text">密码长度必须大于6位</span>
+                <span class="notice-text">会长推广平台已申请的游戏</span>
               </td>
             </tr>
             <tr>
-              <td class="l">账号状态：</td>
+              <td class="l">原分成比例：</td>
               <td class="r table_radio">
-                        <span class="form_radio table_btn">
-                            <label >
-                                <input type="radio"  value="1" name="status" checked="checked"> 开启
-                            </label >
-                            <label >
-                                <input type="radio" value="2" name="status" > 锁定
-                            </label>
-                            </span>
-                <span class="notice-text">锁定状态下，推广员账号则无法登录</span>
+                <span class="form_radio table_btn"></span>
+                <span class="notice-text"></span>
               </td>
             </tr>
             <tr>
-              <td class="l">真实姓名：</td>
-              <td class="r">
-                <input type="text" class="txt" name="real_name" value="" placeholder=" 输入推广员负责人姓名">
+              <td class="l">现分成比例：</td>
+              <td class="r table_radio">
+                <input type="text" class="txt" name="ratio" value="{$record.ratio|default='0.00'}" placeholder="" onKeyUp="value=value.replace(/[^\w\.\/]/ig,'')">
+                <span class="notice-text">当前需要修改成的分成比例</span>
               </td>
             </tr>
             <tr>
-              <td class="l">手机号：</td>
-              <td class="r">
-                <input type="text" class="txt" name="mobile_phone" value=""  placeholder="输入推广员负责人手机号">
+              <td class="l">开始时间：</td>
+              <td class="r table_radio">
+                <div style="float: left;">
+                  <input type="text" class="txt time" name="start_time" placeholder="开始时间" value="">
+                  -
+                  <input type="text" class="txt time" name="start_time" placeholder="结束时间" value="">
+                </div>
+                <span class="notice-text">结束时间不填则默认永久。</span>
               </td>
             </tr>
-            <td class="l">邮箱：</td>
-            <td class="r">
-              <input type="text" class="txt" name="email" value=""  placeholder="输入推广员邮箱">
-            </td>
-            </tr>
             <tr>
-              <td class="l">商务专员</td>
-              <td class="r">
-                <select name="ba_id" id="admin">
-                  <option value="0">请选择商务专员</option>
-                  <volist name=":get_business_affairs_list()" id="vo">
-                    <option  value="{$vo.id}">{$vo.account}</option>
-                  </volist>
-                </select>
-                <span class="notice-text">设置该推广员所属的商务专员组</span>
+              <td class="l">备注：</td>
+              <td class="r table_radio">
+                <textarea type="text" name="introduction" class="txt_area"></textarea>
+                <span class="notice-text"></span>
               </td>
-
             </tr>
             </tbody>
           </table>
@@ -124,7 +125,11 @@
 </block>
 
 <block name="script">
-<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script><script type="text/javascript" src="__STATIC__/provincecityarea/area1.js"></script>
+  <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+  <php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
+  <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
 <script type="text/javascript">
 //导航高亮
 highlight_subnav('{:U('PromoteGameRatio/lists')}');
@@ -132,6 +137,11 @@ Think.setValue("game_type_id", {$data.game_type_id|default = 0});
 Think.setValue("category", {$data.category|default = 0});
 
 $(function(){
+    $('.time').datetimepicker({
+        language:"zh-CN",
+        hour: 13,
+        minute: 15
+    });
     showTab();
     prov="{:substr($data['bank_area'],0,2)}";
     city="{:substr($data['bank_area'],2,2)}";

Application/Admin/View/PromoteGameRatio/lists.html

@@ -133,7 +133,7 @@
                             <td>{$record.applicant}</td>
                             <td>{$record.reviewer}</td>
                             <td>
-                                <a href="{:U('edit', array('id'=>$record['id']))}" class="">修改</a>
+                                <a href="{:U('applyRatio', array('id'=>$record['id']))}" class="">修改</a>
                             </td>
                         </tr>
                     </volist>

Application/Admin/View/Statistics/ltv.html

@@ -2,6 +2,31 @@
 <block name="css">
 </block>
 <block name="body">
+    <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
+    <script type="text/javascript" src="__JS__/select2.min.js"></script>
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <style>
+        .select2-container--default .select2-selection--single {
+                color: #000;
+            resize: none;
+            border-width: 1px;
+            border-style: solid;
+            border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+            box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
+            height:28px;border-radius:3px;font-size:12px;
+        }
+        .select2-container--default .select2-selection--single .select2-selection__rendered {
+            line-height:35px;
+            line-height:28px;
+        }
+        .select2-container--default .select2-selection--single .select2-selection__arrow {
+            height:26px;
+        }
+        .select2-container--default .select2-search--dropdown .select2-search__field {
+          height:26px;line-height:26px;font-size:12px;
+        }
+        .select2-results__option[aria-selected] {font-size:12px;}
+    </style>
 <script type="text/javascript" src="__JS__/bootstrap.min.js"></script>     
         
 	<div class="cf main-place top_nav_list navtab_list">
@@ -18,7 +43,10 @@
             <div class="input-list">
                 <input type="text" id="time-start" name="start" class="" value="{:I('start',date('Y-m-d',strtotime('-30 day')))}" placeholder="选择开始时间" />
                 &nbsp;-&nbsp;
-                <input type="text" id="time-end" name="end" class="" value="{:I('end',date('Y-m-d',strtotime('-1 day')))}" placeholder="选择结束时间" />
+                <div class="input-append date" id="datetimepicker"  style="display:inline-block">
+                <input type="text" readonly id="time-end" name="end" class="" value="{:I('end',date('Y-m-d',strtotime('-1 day')))}" placeholder="选择结束时间" />
+                <span class="add-on"><i class="icon-th"></i></span>
+                </div>
             </div>
 			<div class="input-list input-list-game search_label_rehab">
                 <select id="game_name" name="game_name" class="select_gallery" >
@@ -36,7 +64,7 @@
                 </select>   
             </div>
             <div class="input-list input-list-server search_label_rehab">
-                <select id="server_name" name="server_name" class="select_gallery"  style="width:120px;">
+                <select id="server_name" name="server_name" class="select_gallery" >
                     <option value="">区服名称</option>
                 </select>
             </div>
@@ -98,7 +126,10 @@
 			<a class="sch-btn" href="{:U('Export/ltv',array(
                     'start'=>I('start',date('Y-m-d',strtotime('-30 day'))),
                     'end'=>I('end',date('Y-m-d',strtotime('-1 day'))),
-										'xlsname'=>'统计_ltv统计'
+                    'game_name'=>I('game_name'),
+                    'game_type'=>I('game_type'),
+                    'server_name'=>I('server_name'),
+					'xlsname'=>'统计_ltv统计'
                 ),false)}">导出</a>
 			{$_page|default=''}
 	</div>
@@ -113,7 +144,6 @@ Think.setValue('start',"{$Think.get.start|default=''}");
 Think.setValue('end',"{$Think.get.end|default=''}");
 Think.setValue('row',"{$Think.get.row|default='10'}");
 </script>
-<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
 <php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
 <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
 <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
@@ -123,7 +153,7 @@ Think.setValue('row',"{$Think.get.row|default='10'}");
 //导航高亮
 highlight_subnav('{:U('Statistics/ltv')}');
 $(function(){
-    
+    $(".select_gallery").select2();
     //计算天数差的函数，通用
     function GetDateDiff(startDate,endDate)
     {

Application/Admin/View/SuperStatistical/index.html

@@ -102,7 +102,6 @@
         </div>
     </div>
     <div class="page">
-				<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>21,'xlsname'=>'游戏充值预下单'),I('get.')))}">导出</a>
         {$_page|default=''}
     </div>
 

Application/Admin/View/SuperStatistical/superDetail.html

@@ -11,13 +11,35 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/module.css">
     <link rel="stylesheet" type="text/css" href="__CSS__/style.css" media="all">
     <link rel="stylesheet" type="text/css" href="__CSS__/default_color.css" media="all">
+    <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css"/>
     <script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
     <script type="text/javascript" src="__JS__/jquery.mousewheel.js"></script>
+    <script type="text/javascript" src="__JS__/select2.min.js"></script>
 </head>
 <style>
     body {
         padding: 0px;
     }
+      .select2-container--default .select2-selection--single {
+            color: #000;
+        resize: none;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+        box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
+        height:28px;border-radius:3px;font-size:12px;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__rendered {
+        line-height:35px;
+        line-height:28px;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__arrow {
+        height:26px;
+    }
+    .select2-container--default .select2-search--dropdown .select2-search__field {
+      height:26px;line-height:26px;font-size:12px;
+    }
+    .select2-results__option[aria-selected] {font-size:12px;}
 </style>
 <body>
 <div id="main" class="main" style="min-height: 342px;width: 92.5%;">
@@ -26,6 +48,41 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all">
     <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
 
+     <div class="jssearch fl cf search_list">
+            <div class="input-list search-title-box">
+              <label>搜索：</label>
+            </div>
+
+            <div class="input-list">
+                <input type="text"  name="order_id" class="" placeholder="请输入支付订单" value="{:I('order_id')}"/>&nbsp;
+            </div>
+            <div class="input-list">
+                <input type="text"  name="account" class="" placeholder="请输入玩家账号" value="{:I('account')}"/>&nbsp;
+            </div>
+            <div class="input-list search_item input-list-gamenoticestatus">
+                <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
+                    <option value="">请选择推广员等级</option>
+                    <option value="1" <?php if ($_GET['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
+                    <option value="2" <?php if ($_GET['promote_level'] == 2):?>selected<?php endif;?>>部门长</option>
+                    <option value="3" <?php if ($_GET['promote_level'] == 3):?>selected<?php endif;?>>组长</option>
+                    <option value="4" <?php if ($_GET['promote_level'] == 4):?>selected<?php endif;?>>组员</option>
+                </select>
+                -
+            </div>
+            <div class="input-list search_item input-list-gamenoticestatus">
+                <select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
+                    <option value="">请选择推广员</option>
+                    <option value="0" <?php if ($_POST['promote_id'] == 0):?>selected<?php endif;?>>官方渠道</option>
+                    <option value="UC" <?php if ($_POST['promote_id'] == 'UC'):?>selected<?php endif;?>>UC用户</option>
+                </select>
+            </div>
+            <input type="hidden" name="" value="" class="sortBy">
+
+            <div class="input-list search_item">
+                <a class="sch-btn" href="javascript:;" id="search"
+                   url="{:U('SuperStatistical/superDetail','model='.$model['name'] . '&row='.I('row'),false)}">搜索</a>
+            </div>
+      </div>
     <!-- 数据列表 -->
     <div class="data_list box_mt">
         <div class="">
@@ -74,4 +131,54 @@
     </div>
 </div>
 </body>
+<script type="text/javascript">
+	$(function(){
+		$(".select_gallery").select2();
+		$("#search").click(function(){
+		var url = $(this).attr('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;
+        }
+        var start = $("#time_start").val();
+        var end =   $("#time_end").val();
+        if(start !='' && end != ''){
+            if (Date.parse(start) > Date.parse(end)){
+                layer.msg('开始时间必须小于等于结束时间');
+                return false;
+            }
+        }
+		window.location.href = url;
+	});
+		var promote_id = "{:I('promote_id')}";
+	     $("#promote_level").change(function(){
+	        $.ajax({
+	             url:"{:U('Ajax/getPromotersByLevel')}",
+	             type:"get",
+	             data:{level:$("#promote_level option:selected").val()},
+	             dataType:'json',
+	             success:function(response){
+	                str = '<option value="">请选择推广员</option><option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option><option value="UC"'+(promote_id && 'UC' == promote_id?'selected':'')+'>UC渠道</option>';
+	                //  $.each(response.data, function(index, item){
+	                //      console.log(item.id);
+	                //     str += '<option value="'+item.id+' '+(promote_id && item.id == promote_id?'selected':'')+'">'+item.nickname+'</option>';
+	                //  });
+	                data = response.data;
+	                 for (var i in data){
+	                     str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"
+	                 }
+	                 $("#promote_id").empty();
+	                 $("#promote_id").append(str);
+	                 $("#promote_id").select2();
+	             }
+	         })
+	     });
+	     $("#promote_level").change();
+	})
+</script>
 </html>

Application/Home/Controller/PlayersController.class.php

@@ -77,9 +77,9 @@ class PlayersController extends BaseController {
             $rs[$key]['extend'] = encryption($v['extend']);
             $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
             $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find();
-            $serverId = $v['server_id'];
+            $serverId1 = $v['server_id'];
             $gameId = $v['game_id'];
-            $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find();
+            $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find();
             $rs[$key]['server_name'] = $serverInfo['server_name'];
             $rs[$key]['promote_id']= $promoteInfo['account']; 
         }

Application/Home/Controller/QueryController.class.php

@@ -1888,7 +1888,7 @@ class QueryController extends BaseController
                 if (empty($list['user_account']) ) {
                     $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account');
                 }
-                $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
+                $list['user_account'] = empty($list['user_account']) ? '--' : $list['user_account'];
                 $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
                 $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);
                 $list['server_name'] = empty($list['server_name']) ? '--' : $list['server_name'];

Application/Home/View/default/Home/landingPage2.html

@@ -52,18 +52,16 @@
 <?php endif;?>
 
 <div class="h_wrap">
-  <div id="data-2">
+  <div id="data-2" style="position: relative;">
+    <?php if (!empty($game['flooring_page_video'])):?>
+    <div class="home-video">
+      <video id="example_video_1" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="none" width="640" height="264" poster="{$game['flooring_page_video_cover']}" data-setup='{}'>
+        <source src="{$game['flooring_page_video']}" type='video/mp4' />
+      </video>
+    </div>
+    <?php endif;?>
     <volist name="game['flooring_page_imgs']" id="item" key="k">
-      <div style="position: relative;">
-        <?php if ($k == 1) :?>
-        <?php if (!empty($game['flooring_page_video'])):?>
-        <div class="home-video">
-          <video id="example_video_1" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="none" width="640" height="264" poster="{$game['flooring_page_video_cover']}" data-setup='{}'>
-            <source src="{$game['flooring_page_video']}" type='video/mp4' />
-          </video>
-        </div>
-        <?php endif;?>
-        <?php endif ;?>
+      <div>
         <?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
         <a href="#" class="no-package"><img src="{$item}" style="width: 100%;"/></a>
         <?php else :?>

Application/Mobile/View/Index/business.html

@@ -9,7 +9,7 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
     <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
     <script type="text/javascript" src="__JS__/getRem.js"></script>
-    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IlhuMR32KKlrV3pR6BuvSLVLQKQeEjwP"></script>
+    <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=IlhuMR32KKlrV3pR6BuvSLVLQKQeEjwP"></script>
     <script type="text/javascript" src="__JS__/business.js"></script>
     <div class="business">
         <div class="business_box">

Public/Media/js/recharge.js

@@ -43,7 +43,7 @@ $(function() {
         var apitype = $("#apitype").val();
         if (apitype == 'weixin') {
             var loading = new Cute.ui.dialog().loading('加载中...',{mask:true});
-            Cute.api.post("/media.php/Recharge/beginPay",that.serialize(), function(json){
+            Cute.api.post("/media.php?s=/Recharge/beginPay",that.serialize(), function(json){
                 loading.close();
                 if(json.status > 0){