Merge branch 'release-1.0.0' into dev

# Conflicts:
#	Application/Admin/Common/function.php
#	Application/Home/Controller/DownloadController.class.php

Application/Admin/Common/function.php

@@ -609,6 +609,12 @@ function encryptStr($str) {
     return substr_replace($str, $stars_str, 3, $length-6);
 }
 
+/**
+ * 身份证加密
+ *
+ * @param $str
+ * @return mixed
+ */
 function encryptIdCard($str) {
     $length = strlen($str);
     $stars_str = "";
@@ -618,6 +624,21 @@ function encryptIdCard($str) {
     return substr_replace($str, $stars_str, $length-4, 4);
 }
 
+/**
+ * 真实名字加密
+ *
+ * @param $str
+ * @return mixed
+ */
+function encryptRealName($str) {
+    $length = strlen($str);
+    $stars_str = "";
+    if($length>=4){
+        $stars_str = "****";
+    }
+    return substr_replace($str,  "**", 3, $length);
+}
+
 //获取推广员资质审核状态 $type 1-获取数组 2-获取文本
 function getPromoteVerStatus($status, $type = 1)
 {

Application/Admin/Controller/BehaviorLogController.class.php

@@ -43,7 +43,7 @@ class BehaviorLogController extends ThinkController
         $map['create_time'] = array('BETWEEN', [$startTime, $endTime]);
 
         setPowerPromoteIds($map,'promote_id');
-
+        
         if (isset($params['promote_id'])) {
             $promoteId = $params['promote_id'];
             if ($promoteId == 0) {

Application/Admin/Controller/ExportController.class.php

@@ -2703,7 +2703,8 @@ class ExportController extends Controller
         unset($map['tp1.chain']);
         $map['promote_id'] = 0;
         //如果有官方渠道权限
-        if (in_array('0', explode(",", session('user_auth_promote_ids')))) {
+        $user_auth_promote_ids = session('user_auth_promote_ids');
+        if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) {
             //官方渠道数据添加
             $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, 
             count(id) as count,		

Application/Admin/Controller/PlatformController.class.php

@@ -414,8 +414,10 @@ class PlatformController extends ThinkController
         unset($map['tp1.chain']);
         $map['promote_id'] = 0;
         $authorityData['count'] = 0;
+
         //如果有官方渠道权限
-        if (in_array('0', explode(",", session('user_auth_promote_ids')))) {
+        $user_auth_promote_ids = session('user_auth_promote_ids');
+        if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) {
             //官方渠道数据添加
             $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, 
             count(id) as count,		

Application/Admin/Controller/PromoteController.class.php

@@ -349,6 +349,7 @@ class PromoteController extends ThinkController
             $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find());
 
             $companys = M('promote_company', 'tab_')->where(['status' => 1])->select();
+            $this->assign("is_admin",is_administrator());
             $this->assign('companys', $companys);
             $this->display();
         }

Application/Admin/View/Promote/edit.html

@@ -84,13 +84,21 @@
                     <tr>
                         <td class="l">真实姓名：</td>
                         <td class="r">
-                           <input type="text" class="txt" name="real_name" value="{$data['real_name']}" disabled="disabled" style="background:#CCCCCC">
+                            <if condition="$is_admin eq true ">
+                                <input type="text" class="txt" name="real_name" value="{$data['real_name']}" disabled="disabled" style="background:#CCCCCC">
+                                <else />
+                                <input type="text" class="txt" name="real_name" value="{$data['real_name']|encryptRealName}" disabled="disabled" style="background:#CCCCCC">
+                            </if>
                         </td>
                     </tr>
                     <tr>
                         <td class="l">手机号码：</td>
                         <td class="r">
-                           <input type="text" class="txt" name="mobile_phone" value="{$data['mobile_phone']}" disabled="disabled" style="background:#CCCCCC">
+                            <if condition="$is_admin eq true ">
+                                <input type="text" class="txt" name="mobile_phone" value="{$data['mobile_phone']}" disabled="disabled" style="background:#CCCCCC">
+                                <else />
+                                <input type="text" class="txt" name="mobile_phone" value="{$data['mobile_phone']|encryptStr}" disabled="disabled" style="background:#CCCCCC">
+                            </if>
                         </td>
                     </tr>
                      <tr>

Application/Admin/View/Public/base.html

@@ -19,6 +19,11 @@
     <script type="text/javascript" src="__JS__/jquery.mousewheel.js"></script>
     <!--<![endif]-->
     <block name="style"></block>
+    <style>
+        .select2-dropdown {
+            z-index: 1;
+        }
+    </style>
 </head>
 <body>
     <!-- 头部 -->

Application/Admin/View/Query/settlement.html

@@ -336,7 +336,7 @@
                                 <if condition="$is_admin eq true ">
                                     {:get_promote_name($data['promote_id'])}
                                     <else />
-                                    {:get_promote_name($data['promote_id'])|encryptStr}
+                                    {:encryptStr(get_promote_name($data['promote_id']))}
                                 </if>
                             </td>
                             <td>{$data.starttime|date='Y-m-d',###}至{$data.endtime|date='Y-m-d',###}</td>

Application/Admin/View/Query/withdraw.html

@@ -139,7 +139,7 @@
                                 <if condition="$is_admin eq true ">
                                     {:get_promote_name($data['promote_id'])}
                                     <else />
-                                    {:get_promote_name($data['promote_id'])|encryptStr}
+                                    {:encryptStr(get_promote_name($data['promote_id']))}
                                 </if>
                             </td>
                             <td><notempty name="data.create_time">{$data.create_time|date='Y-m-d H:i:s',###}<else />---</notempty></td>

Application/Base/Service/PromoteService.class.php

@@ -865,12 +865,7 @@ class PromoteService {
                 'message' => '账号只能为数字，字母和下划线',
             ];
         }
-        if ($mobile == '') {
-            return [
-                'status' => false,
-                'message' => '请输入手机号',
-            ];
-        } else {
+        if ($mobile != '') {
             if (!preg_match("/^1[3456789]{1}\d{9}$/", $mobile)) {
                 return [
                     'status' => false,
@@ -878,12 +873,7 @@ class PromoteService {
                 ];
             }
         }
-        if ($idcard == '') {
-            return [
-                'status' => false,
-                'message' => '请输入身份证号',
-            ];
-        } else {
+        if ($idcard != '') {
             if (!IdCard::isIdcard($idcard)) {
                 return [
                     'status' => false,
@@ -891,12 +881,7 @@ class PromoteService {
                 ];
             }
         }
-        if ($realName == '') {
-            return [
-                'status' => false,
-                'message' => '请输入姓名',
-            ];
-        } else {
+        if ($realName != '') {
             if (mb_strlen($realName) < 2 || mb_strlen($realName) > 4) {
                 return [
                     'status' => false,

Application/Home/Controller/PlayersController.class.php

@@ -74,26 +74,26 @@ class PlayersController extends BaseController {
         $rs = M('pay_info','tab_')->where($map)->order('tab_pay_info.create_time desc')
             ->page($page, $row)->select();
         foreach($rs as $key => $v) {
-            if(empty($v['extend'])) {
-                $v['extend'] = $v['order_id'];
+                if($v['server_id'] != 0 && !empty($v['extend'])) {
+                    $serverId1 = $v['server_id'];
+                    $gameId = $v['game_id'];
+                    $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find();
+                    $rs[$key]['server_name'] = $serverInfo['server_name'];
+                }else {
+                    $rs[$key]['server_name'] = "";
+                    $rs[$key]['game_player_id'] = "";
+                    $rs[$key]['game_player_name'] = "";
+                }
+                if(empty($v['extend'])) {
+                    $v['extend'] = $v['order_id'];
+                }
+                $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();
+                
+                $rs[$key]['promote_id']= $promoteInfo['account']; 
+                
             }
-            $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();
-            if($v['server_id'] != 0) {
-                $serverId1 = $v['server_id'];
-                $gameId = $v['game_id'];
-                $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find();
-                $rs[$key]['server_name'] = $serverInfo['server_name'];
-            }else {
-                $rs[$key]['server_name'] = "";
-                $rs[$key]['game_player_id'] = "";
-                $rs[$key]['game_player_name'] = "";
-            }
-            
-            $rs[$key]['promote_id']= $promoteInfo['account']; 
-            
-        }
         $count = M('pay_info', 'tab_')
             ->field('tab_pay_info.id')
             ->where($map)

Application/Home/View/default/Home/landingPage.html

@@ -45,47 +45,53 @@
 
 <div class="home">
 
+
+  <!--有落地页视频-->
+  <?php if (!empty($game['flooring_page_video'])):?>
   <!--落地页视频置顶-->
   <?php if ($game['ios_video_top'] == 1):?>
-  <div class="home-fiexd" <?php if (empty($game['flooring_page_video'])):?> style="height: 0" <?php endif;?> >
-  <div class="home-fiexdBox">
+  <div class="home-fiexd">
+    <div class="home-fiexdBox">
 
-    <?php if (!empty($game['flooring_page_video'])):?>
+      <div class="home-video">
+        <video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
+      </div>
+      <div class="fiexd-heard" style="z-index: 10001">
+        <div class="fiexd-heardBox" style="display: none;">
+          <!--          <div>完成</div>-->
+          <img src="{$game['icon']}" alt="" style="">
+          <div class="download">下载</div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!--落地页视频不置顶-->
+  <?php else :?>
+  <div class="home-fiexd-two" style="background: #fff;width: 100%;height: 4.22rem;">
     <div class="home-video">
       <video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
     </div>
-    <?php endif;?>
-
-    <div class="fiexd-heard" style="z-index: 10001">
-      <div class="fiexd-heardBox" style="display: none;">
-        <!--          <div>完成</div>-->
+    <div class="fiexd-heard" style="width: 100%;position: fixed;top: 0; left: 0;background: rgba(255, 255, 255,0);display: none;z-index: 10001;">
+      <div class="fiexd-heardBox">
         <img src="{$game['icon']}" alt="" style="">
         <div class="download">下载</div>
       </div>
     </div>
   </div>
-</div>
-
-<!--落地页视频不置顶-->
-<?php else:?>
-
-<div class="home-fiexd-two" style="background: #fff;width: 100%;
-<?php if (empty($game['flooring_page_video'])):?>height: 0;  <?php else :?> height: 4.22rem; <?php endif;?>
-">
-  <?php if (!empty($game['flooring_page_video'])):?>
-  <div class="home-video">
-    <video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
-  </div>
   <?php endif;?>
-  <div class="fiexd-heard" style="width: 100%;position: fixed;top: 0; left: 0;background: rgba(255, 255, 255,0);display: none;z-index: 10001;">
-    <div class="fiexd-heardBox">
-      <img src="{$game['icon']}" alt="" style="">
-      <div class="download">下载</div>
+
+  <?php else :?>
+  <!--没有落地页视频-->
+  <div class="home-fiexd-two" style="background: #fff;width: 100%;height: 0">
+    <div class="fiexd-heard" style="width: 100%;position: fixed;top: 0; left: 0;background: rgba(255, 255, 255,0);display: none;z-index: 10001;">
+      <div class="fiexd-heardBox">
+        <img src="{$game['icon']}" alt="" style="">
+        <div class="download">下载</div>
+      </div>
     </div>
   </div>
-</div>
+  <?php endif;?>
 
-<?php endif;?>
 
 <div class="home-box">
   <div class="heard">
@@ -129,10 +135,8 @@
       <div class="grade">年龄</div>
     </div>
   </div>
-
   <div class="slide_list">
     <ul class="slide-box">
-
       <volist name="game['screenshot']" id="item">
         <li class="slide-item">
           <img src="{$item}" alt="">
@@ -140,7 +144,6 @@
       </volist>
     </ul>
   </div>
-
   <div class="synopsis">
     <div>简介</div>
     <div id="brief_introduction">{$game['introduction']}</div>
@@ -356,7 +359,8 @@
 <script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
 <script>
   $(window).scroll(function () {
-  <?php if ($game['ios_video_top'] == 1):?>
+  <?php if (!empty($game['flooring_page_video']) && $game['ios_video_top'] == 1):?>
+   console.log(111);
     var v=($(this).scrollTop())/100;
     $(".fiexd-heardBox").show();
     $('.home-fiexd .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
@@ -365,10 +369,17 @@
     if(t<10){
       $(".home-fiexd .fiexd-heardBox").hide();
     }
+
   <?php else:?>
-  <?php if (!empty($game['flooring_page_video'])):?>
+
+    console.log(222);
     var t = $(window).scrollTop();
+  <?php if (!empty($game['flooring_page_video'])):?>
     var h=$('.home-video').height();
+  <?php else:?>
+    var h=10;
+  <?php endif;?>
+
     if(t>h){
       var v=($(this).scrollTop())/100;
       $(".home-fiexd-two .fiexd-heard").show();
@@ -378,8 +389,9 @@
         $(".home-fiexd-two .fiexd-heard").hide();
       }
     }
+
   <?php endif;?>
-  <?php endif;?>
+
 
   })
 

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

@@ -36,19 +36,19 @@
                 </td>
               </tr>
               <tr>
-                <td class="l"><span class="req">*</span>姓名：</td>
+                <td class="l">姓名：</td>
                 <td class="r">
                   <input type="text" class="name input-txt txt" name="real_name" id="real_name" maxlength="4" minlength="2" placeholder="请输入姓名">
                 </td>
               </tr>
               <tr>
-                <td class="l"><span class="req">*</span>身份证：</td>
+                <td class="l">身份证：</td>
                 <td class="r">
                   <input type="text" class="name input-txt txt" name="idcard" id="idcard" placeholder="请输入身份证">
                 </td>
               </tr>
               <tr>
-                <td class="l"><span class="req">*</span>手机号：</td>
+                <td class="l">手机号：</td>
                 <td class="r">
                   <input type="text" class="name input-txt txt" name="mobile_phone" id="mobile_phone" placeholder="请输入手机号">
                 </td>
@@ -147,8 +147,10 @@
       if($.trim($('#account').val()).length < 6 || $.trim($('#account').val()).length > 15){
         return json_data = {'status':0,'msg':'子渠道账号长度为6-15位字符'}
       }
-      if($.trim($('#real_name').val()).length < 2 || $.trim($('#real_name').val()).length > 4){
-        return json_data = {'status':0,'msg':'子渠道姓名长度为2-4位字符'}
+      if ($.trim($('#real_name').val()) != '') {
+        if($.trim($('#real_name').val()).length < 2 || $.trim($('#real_name').val()).length > 4){
+          return json_data = {'status':0,'msg':'子渠道姓名长度为2-4位字符'}
+        }
       }
       if($('#password').val()==""){
         return json_data = {'status':0,'msg':'子渠道密码不能为空'}

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

@@ -224,7 +224,7 @@
                 </tr>
               </volist>
               <tr>
-                <td>合计</td>
+                <td>合计(此数据根据充值状态进行统计)</td>
                 <td>--</td>
                 <td>--</td>
                 <td>--</td>

robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /