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

Application/Admin/Controller/TestResourceController.class.php

@@ -32,14 +32,14 @@ class TestResourceController extends ThinkController
           $map['tab_test_resource.role_name']=['like','%'.I('role_name').'%'];
       }
       if(!empty(I('user_account'))){
-          $map['tab_test_resource.user_account']=I('user_account');
+          $map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
       }
       if(!empty(I('promote_name'))){
-          $map['tab_test_resource.promote_account']=I('promote_name');
+          $map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
       }
 
       $data = M('test_resource','tab_')
-          ->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,check_status')
+          ->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,lock_status as check_status')
           ->join('left join tab_user as user on tab_test_resource.user_id = user.id')
           ->where($map)
           ->page($page,$row)
@@ -73,7 +73,7 @@ class TestResourceController extends ThinkController
       }
 
       $data = [
-          'check_status' => 0
+          'lock_status' => 0
       ];
 
       $isFreeze = M('user','tab_')->where("id=".$supportId)->save($data);
@@ -92,7 +92,7 @@ class TestResourceController extends ThinkController
         }
 
         $data = [
-            'check_status' => 1
+            'lock_status' => 1
         ];
 
         $isFreeze = M('user','tab_')->where("id=".$supportId)->save($data);
@@ -198,10 +198,13 @@ class TestResourceController extends ThinkController
         try {
             $arrUserId = array_column($data,'id');
             $logId = implode(',',$arrUserId);
-
-            $logRead = M('protect_log_read','tab_')
-                ->where("log_id IN({$logId}) and promote_id = {$promote_id}")
-                ->select();
+            if ($logId) {
+                $logRead = M('protect_log_read','tab_')
+                    ->where("log_id IN({$logId})")
+                    ->select();
+            } else {
+                $logRead = [];
+            }
 
             $upsetData = array_column($logRead,'log_id');
 
@@ -348,9 +351,9 @@ class TestResourceController extends ThinkController
             for ($i=0; $i < $count ; $i++) {
                 $i_account=I('user_account')[$i];
                 if (!empty($i_account)) {
-                    $user=M('user', 'tab_')->field('promote_id,password,phone')->where(['account'=>$i_account])->find();
-                    $promote = $this->get_all_promote();
-                    if (!in_array($user['promote_id'], $promote)) {
+                    $user=M('user', 'tab_')->field('promote_id,promote_account,password,phone')->where(['account'=>$i_account])->find();
+//                    $promote = $this->get_all_promote();
+                    if (!$user) {
                         M('test_resource', 'tab_')->rollback();//回滚
                         $this->error($i_account.'账号不存在');
                     }
@@ -409,14 +412,14 @@ class TestResourceController extends ThinkController
                     $data['apply_resource']=I('apply_resource')[$i];
                     $data['apply_remark']=I('apply_remark')[$i];
 
-                    $data['apply_name']=$_SESSION['onethink_home']['promote_auth']['account'];
-                    $data['apply_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
+                    $data['apply_name']=$user['promote_account'];
+                    $data['apply_id']=$user['promote_id'];
 
 //                    $data['promote_id']=session("promote_auth.pid");
 //                    $data['promote_account']=session("promote_auth.account");
 
-                    $data['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
-                    $data['promote_account']=$_SESSION['onethink_home']['promote_auth']['account'];
+                    $data['promote_id']=$user['promote_id'];
+                    $data['promote_account']=$user['promote_account'];
 
                     $data['create_time']=time();
                     $data['apply_type']=0;
@@ -528,10 +531,10 @@ class TestResourceController extends ThinkController
                 //     $this->ajaxReturn(['status'=>0,'msg'=>'扶持申请额度不足，最大额度：'.$max_quota]);
                 // }
 
-                if($support['promote_id'] !=$_SESSION['onethink_home']['promote_auth']['pid'] || empty($support) ){
-                    M('test_resource','tab_')->rollback();//回滚
-                    $this->error('申请失败');
-                }
+//                if($support['promote_id'] !=$_SESSION['onethink_home']['promote_auth']['pid'] || empty($support) ){
+//                    M('test_resource','tab_')->rollback();//回滚
+//                    $this->error('申请失败');
+//                }
                 
                 $data['game_id']=$support['game_id'];
                 $data['game_name']=$support['game_name'];
@@ -547,13 +550,13 @@ class TestResourceController extends ThinkController
                 $data['apply_resource']=I('apply_resource');
                 $data['apply_remark']=I('apply_remark');
 
-                $data['apply_name']=$_SESSION['onethink_home']['promote_auth']['account'];
-                $data['apply_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
+                $data['apply_name']=$support['promote_account'];
+                $data['apply_id']=$support['promote_id'];
 
 //                $data['promote_id']=session("promote_auth.pid");
 //                $data['promote_account']=session("promote_auth.account");
-            $data['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
-            $data['promote_account']=$_SESSION['onethink_home']['promote_auth']['account'];
+            $data['promote_id']=$support['promote_id'];
+            $data['promote_account']=$support['promote_account'];
 
                 $data['create_time']=time();
                 $data['apply_type']=1;
@@ -604,7 +607,7 @@ class TestResourceController extends ThinkController
             unset($_REQUEST['start']);unset($_REQUEST['end']);
         }
 
-        $map['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
+//        $map['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
         $data=M('test_resource','tab_')->where($map)->order('id desc')->page($page,$row)->select();
         $count=M('test_resource','tab_')->field('id')->where($map)->select();
         $count = count($count);

Application/Admin/Controller/access_data_foldline.txt

@@ -1 +0,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":0},{"time":"16:00","count":0},{"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}],"sum":{"news":0,"active":0,"player":0,"money":0},"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":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":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":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":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":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}]}

Application/Admin/Model/UserModel.class.php

@@ -1071,7 +1071,6 @@ class UserModel extends Model{
                         return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID
                     }
                 }else{
-                    Log::write('进入SDK_1' , 'INFO');
                     $token = $this->sdklogin_update($user,$account,$password,$user['fgame_id'],$game_id,$game_name,$unique_code); //更新用户登录信息
                     $this->user_login_record2($user,$type,$game_id,$game_name,$sdk_version);
                     return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID

Application/Admin/View/TestResource/add.html

@@ -31,10 +31,9 @@
 
     <div class="cf main-place top_nav_list navtab_list">
         <ul class="tabnav1711 fr jstabnav">
-            <li data-tab="tab1" class="current"><a href="javascript:void(0);">基本信息</a></li></li>
-            <li data-tab="tab2" ><a href="javascript:void(0);">结算信息</a></li>
+            <li data-tab="tab1" class="current"><a href="javascript:void(0);">新增测试账号</a></li></li>
         </ul>
-        <h3 class="page_title">编辑推广员</h3>
+        <h3 class="page_title">新增测试账号</h3>
         <p class="description_text">说明：此功是查看推广员的基础信息</p>
     </div>
 
@@ -152,7 +151,7 @@
     <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
     <script type="text/javascript">
         //导航高亮
-        highlight_subnav('{:U('Promote/lists')}');
+        highlight_subnav('{:U('testResource/index')}');
         Think.setValue("game_type_id", {$data.game_type_id|default = 0});
         Think.setValue("category", {$data.category|default = 0});
         Think.setValue("ba_id", {$data.ba_id|default = 0});

Application/Admin/View/TestResource/apply.html

@@ -107,7 +107,7 @@
   <script type="text/javascript" src="__JS__/select2.min.js"></script>
   <script type="text/javascript">
     //导航高亮
-    highlight_subnav('{:U('Giftbag/lists')}');
+    highlight_subnav('{:U('testResource/index')}');
     if ("{$Think.get.game_id}" =="") {
       Think.setValue("game_id", {$data.game_id|default = 0});
     }else{

Application/Admin/View/TestResource/edit.html

@@ -141,7 +141,7 @@
 <script type="text/javascript">
 //导航高亮
 $('.side-sub-menu').eq(0).show();
-highlight_subnav('{:U('TestResource/index')}');
+highlight_subnav('{:U('testResource/index')}');
 $('#submit').click(function(){
     $('#form').submit();
 });

Application/Admin/View/TestResource/index.html

@@ -440,7 +440,7 @@
                 });
                 param = str.join(',');
             } else {
-                layer.msg('请选择要操作的数据');
+                layer.msg('请选择要操作的数据',{skin:'textColor'});
                 return false;
             }
             var url = "{:U('apply','','')}" + '/id/' + param;
@@ -448,4 +448,7 @@
 
         });
     </script>
+    <style>
+        .textColor .layui-layer-content{color: #ffffff;background:#000; opacity: 0.8;text-align: center}
+    </style>
 </block>

Application/Admin/View/TestResource/supportNumberList.html

@@ -183,14 +183,14 @@
       $('.froze-btn').on({
         click: function() {
           var id = $(this).parents('tr').eq(0).attr('data-id')
-          layer.confirm('是否确认冻结帐号?', {icon: 3, title:'提示'}, function(index){
+          layer.confirm('是否确认冻结帐号?', {icon: 3, title:'提示',skin:'textColor'}, function(index){
             $.ajax({
               url: "{:U('TestResource/freezeSupport')}",
               data: {support_id: id},
               type: 'post',
               dataType: 'json',
               success: function(response) {
-                layer.msg(response.msg, {time: 1000}, function() {
+                layer.msg(response.msg, {time: 1000,skin:'msgClolor'}, function() {
                   window.location.href = window.location.href
                 })
               }
@@ -202,14 +202,14 @@
       $('.unfroze-btn').on({
         click: function() {
           var id = $(this).parents('tr').eq(0).attr('data-id')
-          layer.confirm('是否确认启用帐号?', {icon: 3, title:'提示'}, function(index){
+          layer.confirm('是否确认启用帐号?', {icon: 3, title:'提示',skin:'textColor'}, function(index){
             $.ajax({
               url: "{:U('TestResource/unfreezeSupport')}",
               data: {support_id: id},
               type: 'post',
               dataType: 'json',
               success: function(response) {
-                layer.msg(response.msg, {time: 1000}, function() {
+                layer.msg(response.msg, {time: 1000,skin:'msgClolor'}, function() {
                   window.location.href = window.location.href
                 })
               }
@@ -222,7 +222,7 @@
         click: function() {
           var id = $(this).attr('data-id')
           console.log(id);
-          layer.confirm('是否确认重置账号密码?', {icon: 3, title:'提示'}, function(index){
+          layer.confirm('是否确认重置账号密码?', {icon: 3, title:'提示',skin:'textColor'}, function(index){
             $.ajax({
               url: "{:U('TestResource/rechangePassward')}",
               data: {support_id: id},
@@ -230,7 +230,7 @@
               dataType: 'json',
               success: function(response) {
                 console.log(response)
-                layer.confirm(response.msg, {icon: 3, title:'提示'}, function() {
+                layer.confirm(response.msg, {icon: 3, title:'提示',skin:'textColor'}, function() {
                   window.location.href = window.location.href
                 })
               }
@@ -333,6 +333,7 @@
 
 
   </script>
+
   <script type="text/javascript">
 
     //点击字母按照条件按钮筛选
@@ -472,7 +473,7 @@
         });
         param = str.join(',');
       } else {
-        layer.msg('请选择要操作的数据');
+        layer.msg('请选择要操作的数据',{skin:'textColor'});
         return false;
       }
       var url = "{:U('apply','','')}" + '/id/' + param;
@@ -480,4 +481,8 @@
 
     });
   </script>
+  <style>
+    .textColor .layui-layer-content{color: #000000;}
+    .msgClolor .layui-layer-content{color: #ffffff;background:#000; opacity: 0.8;text-align: center}
+  </style>
 </block>

Application/Home/Controller/PromoteController.class.php

@@ -860,6 +860,15 @@ class PromoteController extends BaseController
                     $this->ajaxReturn(array('status' => -1, 'msg' => '身份证格式错误'));
                 }
             }
+            if (mb_strlen($_POST['account']) < 6 || mb_strlen($_POST['account']) > 15) {
+                $this->error('账号长度为6-15个字符', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
+                return false;
+            }
+
+            if (mb_strlen($_POST['real_name']) < 2 || mb_strlen($_POST['real_name']) > 4) {
+                $this->error('姓名长度为2-4个字符', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
+                return false;
+            }
 
             $res = $user->promote_add($_POST);
             if (is_numeric($res)) {

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

@@ -37,13 +37,13 @@
                   <tr>
                     <td class="l"><span class="req">*</span>帐号：</td>
                     <td class="r">
-                      <input type="text" class="name input-txt txt" name="account" id="account" placeholder="请输入帐号">
+                      <input type="text" class="name input-txt txt" name="account" id="account" maxlength="15" minlength="6" placeholder="请输入帐号">
                     </td>
                   </tr>
                   <tr>
                     <td class="l"><span class="req">*</span>姓名：</td>
                     <td class="r">
-                      <input type="text" class="name input-txt txt" name="real_name" id="real_name" placeholder="请输入姓名">
+                      <input type="text" class="name input-txt txt" name="real_name" id="real_name" maxlength="4" minlength="2" placeholder="请输入姓名">
                     </td>
                   </tr>
                   <tr>
@@ -141,8 +141,14 @@
        if($('#account').val()==""){
         return json_data = {'status':0,'msg':'子渠道账号不能为空'}
        }
-      if($.trim($('#account').val()).length < 6){
-        return json_data = {'status':0,'msg':'子渠道账号不能小于6位字符'}
+      //  if($.trim($('#account').val()).length < 6){
+      //   return json_data = {'status':0,'msg':'子渠道账号不能小于6位字符'}
+      // }
+      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($('#password').val()==""){
         return json_data = {'status':0,'msg':'子渠道密码不能为空'}

Application/Media/View/default/Index/business.html

@@ -40,7 +40,7 @@
                         </div>
                         <div style="float: left;margin-left: 20px">
                             <h3 style="color: #0C0C0C">平台币充值</h3>
-                            <p style="font-size: 14px;color: #666;margin-bottom: 30px">平台币简介平台币简介平台币简介平台币简介平台币简介平台币简介</p>
+                            <p style="font-size: 14px;color: #666;margin-bottom: 30px;width: 300px;">平台币是可以在游戏内直接消费使用的，1平台币=1人民币，在游戏内您可直接用平台币选择购买相应的道具（钻石、宝石、金币等）。</p>
                             <style>
                                 .btn{
                                     background-color: #03B4F5;

Application/Mobile/View/Index/product.html

@@ -141,7 +141,7 @@
           <div class="swiper-slide">
             <span class="join">
                 平台币简介：
-              这是平台币简介内容
+              平台币是可以在游戏内直接消费使用的，1平台币=1人民币，在游戏内您可直接用平台币选择购买相应的道具（钻石、宝石、金币等）。
             </span>
             <style>
               .btn{

Application/Sdk/Controller/UserController.class.php

@@ -1196,7 +1196,13 @@ class UserController extends BaseController
             $data['create_ip'] = get_client_ip();
             // $data['create_device_number'] = time();
 
-            $user_play->add($data);
+            // 修改重复插入问题  增加唯一索引  记录重复插入异常
+            try {
+                $user_play->add($data);
+            } catch (\Exception $e) {
+                Log::write('Duplicate Exception:' .json_encode($e->getMessage()), Log::ERR);
+            }
+
             $this->updateLoginRecord($data);
         }
 

Data/update.sql

@@ -180,3 +180,5 @@ MODIFY COLUMN `promote_account`  varchar(30) BINARY CHARACTER SET utf8 COLLATE u
 -- 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`;