Merge branch 'release' of 47.111.118.107:wmtx/platform into release

Application/Admin/Controller/DepositController.class.php

@@ -249,8 +249,8 @@ class DepositController extends ThinkController {
 
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
-
-        $this->assign("is_admin",is_administrator());
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->assign('list_data', $data);
         $this->meta_title = '平台币充值列表';
         $this->display();die();

Application/Admin/Controller/GameController.class.php

@@ -379,6 +379,7 @@ class GameController extends ThinkController
             $_POST['pay_config'] = json_encode($_POST['pay_config']);
             $gameService = new GameService();
             $_POST['download_ways'] = $gameService->getDownLoadWaysValue($downloadWays);
+            unset($_POST['apply_auth']);
             $res = $game->update();
 
             $id = $res["id"];
@@ -387,6 +388,7 @@ class GameController extends ThinkController
             $sid = $sibling['id'];
             $map['id'] = array('neq', $sid);
             $another = D("Game")->where($map)->find();  //获取另一个所有
+            $phone['apply_auth'] = $sibling['apply_auth'];
             $phone['game_type_id'] = $sibling['game_type_id'];
             $phone['dow_num'] = $sibling['dow_num'];
             $phone['game_type_name'] = $sibling['game_type_name'];

Application/Admin/Controller/MemberController.class.php

@@ -1190,7 +1190,8 @@ class MemberController extends ThinkController
         $this->assign('user_count',$count[0]['count']);
         $this->assign("is_admin",is_administrator());
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find());
-
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         parent::lists("UserLoginRecord", $p, $extend['map']);
     }
 

Application/Admin/Controller/MendController.class.php

@@ -97,7 +97,8 @@ class MendController extends ThinkController {
 
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
-
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->display();
         // parent::lists("Mend",$p,$map);
     }

Application/Admin/Controller/PartnerController.class.php

@@ -137,6 +137,8 @@ class PartnerController extends ThinkController
             $value['game'] = $parseGames[$value['id']];
             $value['has_game_evidence'] = $parseGames['has_game_evidence'] ? '有' : '没有';
             $value['is_sign_contract'] = $parseGames['is_sign_contract'] ? '是' : '否';
+            $value['channel_rate'] *= 100;
+            $value['invoice_rate'] *= 100;
             if ($value['settlement_type'] == 0) {
                 $value['settlement_type'] = '未配置';
             } elseif ($value['settlement_type'] == 1) {
@@ -238,8 +240,8 @@ class PartnerController extends ThinkController
             $save['matche_platform'] = I('matche_platform');
             $save['contract_start_time'] = strtotime(I('contract_start_time'));
             $save['contract_end_time'] = strtotime(I('contract_end_time'));
-            $save['channel_rate'] = I('channel_rate');
-            $save['invoice_rate'] = I('invoice_rate') ?: 0;
+            $save['channel_rate'] = I('channel_rate')/100;
+            $save['invoice_rate'] = (I('invoice_rate') ?: 0)/100;
             $save['is_sign_contract'] = I('is_sign_contract');
             $save['settlement_type'] = I('settlement_type');
             $save['has_game_evidence'] = I('has_game_evidence');
@@ -338,8 +340,9 @@ class PartnerController extends ThinkController
             $save['matche_platform'] = I('matche_platform');
             $save['contract_start_time'] = strtotime(I('contract_start_time'));
             $save['contract_end_time'] = strtotime(I('contract_end_time'));
-            $save['channel_rate'] = I('channel_rate');
-            $save['invoice_rate'] = I('invoice_rate') ?: 0;
+            $save['channel_rate'] = I('channel_rate')/100;
+            $save['invoice_rate'] = (I('invoice_rate') ?: 0)/100;
+
             $save['is_sign_contract'] = I('is_sign_contract');
             $save['settlement_type'] = I('settlement_type');
             $save['has_game_evidence'] = I('has_game_evidence');
@@ -366,6 +369,8 @@ class PartnerController extends ThinkController
             }
             $data['contract_start_time'] = date('Y-m-d', $data['contract_start_time']);
             $data['contract_end_time'] = date('Y-m-d', $data['contract_end_time']);
+            $data['channel_rate'] *= 100;//存的是小数，显示百分比
+            $data['invoice_rate'] *= 100;//存的是小数，显示百分比
 //            dd($data);
             $this->assign('data', $data);
             $action = I('action');

Application/Admin/Controller/PromoteController.class.php

@@ -425,6 +425,8 @@ class PromoteController extends ThinkController
 
             $companys = M('promote_company', 'tab_')->where(['status' => 1])->select();
             $this->assign("is_admin",is_administrator());
+            $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+            $this->assign('show_data_power', $show_data_power);
             $this->assign('companys', $companys);
             $this->display();
         }

Application/Admin/Controller/UserController.class.php

@@ -675,7 +675,8 @@ class UserController extends AdminController
         $this->m_title = '角色查询';
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'User/rolelist', 'status' => 1])->find());
         $this->assign("is_admin",is_administrator());
-
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
+        $this->assign('show_data_power', $show_data_power);
         $this->display();
 
     }

Application/Admin/View/Deposit/lists_secord.html

@@ -138,7 +138,7 @@
                                 <if condition="$data['promote_account'] eq '自然注册'">
                                     官方渠道
                                     <else/>
-                                    <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {$data.promote_account}
                                         <else />
                                         {$data.promote_account|encryptStr}

Application/Admin/View/Member/edit.html

@@ -24,12 +24,12 @@
                         <tr>
                             <td class="l">玩家账号</td>
                             <td class="r">
-                              <!--  <if condition="$is_admin eq true ">
+                               <if condition="$show_data_power eq true ">
                                     <input type="text" class="txt" name="account" value="{$data['account']}"disabled="disabled">
                                     <else />
                                     <input type="text" class="txt" name="account" value="{$data['account']|encryptStr}"disabled="disabled">
-                                </if>-->
-                                <input type="text" class="txt" name="account" value="{$data['account']}"disabled="disabled">
+                                </if>
+                                <!--<input type="text" class="txt" name="account" value="{$data['account']}"disabled="disabled">-->
 
                                 <span class="notice-text">玩家登录账号，一经注册，全平台通用</span>
                             </td>

Application/Admin/View/Member/login_record.html

@@ -144,12 +144,11 @@
                         <tr>
                             <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids"></td>
                             <td>
-                               <!-- <if condition="$is_admin eq true ">
+                                <if condition="$show_data_power eq true ">
                                     {$data.user_account}
                                     <else />
                                     {$data.user_account|encryptStr}
-                                </if>-->
-                                {$data.user_account}
+                                </if>
                             </td>
                             <?php $gamename=trim(get_game_name($data['game_id'],'id'));?>
                             <td><notempty name="gamename">{$gamename}<else /><eq name="data.type" value="2">APP登录<else/>官网登录</eq></notempty></td>

Application/Admin/View/Mend/lists.html

@@ -68,12 +68,11 @@
                         <volist name="list_data" id="data">
                             <tr>
                                 <td>
-                                 <!--   <if condition="$is_admin eq true ">
+                                    <if condition="$show_data_power eq true ">
                                         {$data.account}
                                         <else />
                                         {$data.account|encryptStr}
-                                    </if>-->
-                                    {$data.account}
+                                    </if>
                                 </td>
                                 <td>{$data.register_time|date='Y-m-d H:i:s',###}</td>
                                 <td>{$data.login_time|date='Y-m-d H:i:s',###}</td>
@@ -82,20 +81,18 @@
                                 <td>{$data.login_time|date='Y-m-d H:i:s',###}</td>
                                 <td>
                                     <if condition="get_parent_promoteto($data['promote_id']) neq '' ">
-                                       <!-- <if condition="$is_admin eq true ">
+                                        <if condition="$show_data_power eq true ">
                                             {$data['promote_account']|encryptStr}{:encryptStr(get_parent_promoteto($data['promote_id']))}
                                             <else />
                                             {$data['promote_account']|encryptStr}{:encryptStr(get_parent_promoteto($data['promote_id']))}
-                                        </if>-->
-                                        {$data['promote_account']|encryptStr}{:encryptStr(get_parent_promoteto($data['promote_id']))}
+                                        </if>
                                         <else/>
 
-                                        {:get_promote_name($data['promote_id'])}
-                                      <!--  <if condition="$is_admin eq true ">
+                                        <if condition="$show_data_power eq true ">
                                             {:get_promote_name($data['promote_id'])}
                                             <else />
                                             {:encryptStr(get_promote_name($data['promote_id']))}
-                                        </if>-->
+                                        </if>
 
                                     </if></td>
                                 <td>

Application/Admin/View/Mend/recordList.html

@@ -87,10 +87,29 @@
                     <volist name="list_data" id="data">
                         <tr>
                             <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
-                            <td>{$data['user_account']}</td>
-                            <td>{$data['promote_account']}</td>
+                            <td>
+                                <if condition="$show_data_power eq true ">
+                                    {$data['user_account']}
+                                    <else />
+                                    {$data['user_account']|encryptStr}
+                                </if>
+                            </td>
+                            <td>
+                                <if condition="$show_data_power eq true ">
+                                    {$data['promote_account']}
+                                    <else />
+                                    {$data['promote_account']|encryptStr}
+                                </if>
+                                </td>
                             <td>{$data['pay_amount']}</td>
-                            <td>{$data['promote_account_to']}</td>
+                            <td>
+                                <if condition="$show_data_power eq true ">
+                                    {$data['promote_account_to']}
+                                    <else />
+                                    {$data['promote_account_to']|encryptStr}
+                                </if>
+
+                            </td>
                             <td class="js-pop" style="max-width: 400px;padding: 0 20px;">
                                 <a href="javascript:" title="点击查看" class="remarkView" info="{$data['remark']}">{$data['remark']}</a>
                             </td>
@@ -129,7 +148,13 @@
     {@each list_data as item,index}
     <tr>
         <td><input class="ids" type="checkbox" value="${item['id']}" name="ids[]"></td>
-        <td>${item['user_account']}</td>
+        <td>
+            <if condition="$show_data_power eq true ">
+                {$data['user_account']}
+                <else />
+                {$data['user_account']|encryptStr}
+            </if>
+        </td>
         <td>${item['promote_account']}</td>
         <td>${item['pay_amount']}</td>
         <td>${item['promote_account_to']}</td>

Application/Admin/View/Partner/lists.html

@@ -28,6 +28,8 @@
         .select2-results__option[aria-selected] {font-size:12px;}
         .data_list table td{
             text-indent:0;
+            height: 30px;
+            line-height: 30px;
         }
     </style>
 
@@ -86,7 +88,7 @@
                 <!-- 表头 -->
                 <thead>
                 <tr>
-                    <th style="width:5%;min-width:10px;">操作</th>
+                    <th style="width:8%;min-width:10px;">操作</th>
                     <th>合同合作方名称</th>
                     <th>对应平台</th>
                     <th>合同期限</th>

Application/Admin/View/Promote/edit.html

@@ -84,7 +84,7 @@
                     <tr>
                         <td class="l">真实姓名：</td>
                         <td class="r">
-                            <if condition="$is_admin eq true ">
+                            <if condition="$show_data_power 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">
@@ -94,7 +94,7 @@
                     <tr>
                         <td class="l">手机号码：</td>
                         <td class="r">
-                            <if condition="$is_admin eq true ">
+                            <if condition="$show_data_power 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">

Application/Admin/View/PromoteCompany/lists.html

@@ -32,15 +32,15 @@
         .data_game_list table td{
             line-height:1;
             padding: 3px;
+            height: 30px;
         }
+        
     </style>
 
     <div class="cf main-place top_nav_list navtab_list">
         <h3 class="page_title">{$meta_title}</h3>
         <p class="description_text">说明：该功能是用于录入工会所属的推广公司名称</p>
     </div>        
-    <div class="jssearch search_list fl cf">
-        
     <div class="cf top_nav_list">
         <div class="fl button_list">
             <div class="tools">

Application/Admin/View/Support/lists.html

@@ -128,14 +128,20 @@
                     <volist name="list_data" id="data">
                         <tr>
 
-                            <td>{$data['promote_account']}</td>
                             <td>
-                              <!--  <if condition="$is_admin eq true ">
+                                <if condition="$show_data_power eq true ">
+                                    {$data['promote_account']}
+                                <else />
+                                    {$data['promote_account']|encryptStr}
+                            </if>
+
+                            </td>
+                            <td>
+                                <if condition="$show_data_power eq true ">
                                     {$data['user_account']}
                                     <else />
                                     {$data['user_account']|encryptStr}
-                                </if>-->
-                                {$data['user_account']}
+                                </if>
                             </td>
                             <td>{$data['game_name']}</td>
                             <td>{$data['server_name']}</td>

Application/Admin/View/User/rolelist.html

@@ -135,12 +135,11 @@
                     <tr>
                         <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
                         <td>
-                           <!-- <if condition="$is_admin eq true ">
+                            <if condition="$show_data_power eq true ">
                                 {$data.user_account}
                                 <else />
                                 {$data.user_account|encryptStr}
-                            </if>-->
-                            {$data.user_account}
+                            </if>
 
                         </td>
                         <?php $gamename = trim($data['game_name']);
@@ -153,12 +152,11 @@
                         <td><notempty name="rolename">{$rolename}<else />空</notempty></td>
                         <td>{$data.role_level}</td>
                         <td>
-                           <!-- <if condition="$is_admin eq true ">
+                            <if condition="$show_data_power eq true ">
                                 {$data.promote_account}
                                 <else />
                                 {$data.promote_account|encryptStr}
-                            </if>-->
-                            {$data.promote_account}
+                            </if>
                         </td>
                         <td><?= date('Y-m-d H:i:s', $data['play_time']) ?></td>
                         <td>{$data.play_ip}</td>

Application/Home/Controller/HomeController.class.php

@@ -196,7 +196,7 @@ class HomeController extends Controller
 
         $promote = M('promote', 'tab_')->field(['id', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find();
         if (!$applyService->checkSociatyPerm($promote, $game)) {
-            $this->error('该链接已经停止使用');
+            $this->error('该链接已经失效');
         }
 
         if ($game['sdk_version'] == 1 && $isIOS) {

Application/Home/Controller/PackageController.class.php

@@ -67,7 +67,7 @@ class PackageController extends Controller
         $promote = M('promote', 'tab_')->field(['id', 'parent_id', 'chain', 'level'])->where(['id' => $promoteId])->find();
         $game = M('game','tab_')->field(['id', 'game_name', 'sdk_version', 'apply_auth'])->where(['id' => $apply['game_id']])->find();
         if (!$applyService->checkSociatyPerm($promote, $game)) {
-            $this->redirect("package/downloadError", ['message' => '该链接已经停止使用']);
+            $this->redirect("package/downloadError", ['message' => '该链接已经失效']);
         }
 
         

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

@@ -258,7 +258,7 @@
       <div class="text-wrapper">
          <div style="padding: 0 0.39rem 0.15rem 0.36rem;">
             <?php if (($game['download_ways'] & 2) == 2):?>
-          <div class="text">极速下载：免费下载，解决您频繁掉签的烦恼！</div>
+          <div class="text">极速下载：畅享稳定游戏，拒绝频繁掉签，极速下载，不丢游戏，不丢数据，高端定制，仅针对IOS用户免费开放！</div>
           <?php endif;?>
           <?php if (($game['download_ways'] & 4) == 4):?>
           <div class="text">至尊下载：10元购买，永不闪退、不丢数据稳定与保障。同意设备安装一次可在一年内无限次下载重装，并赠送限量至尊超级礼包！</div>
@@ -269,7 +269,7 @@
           <?php if ($game['dow_status'] ==1):?>
 
           <?php if (($game['download_ways'] & 2) == 2):?>
-          <div class="blue-btn stabilization" data-url="{$game['beta_url']}">极速下载</div>
+          <div class="blue-btn stabilization quick-btn" data-url="{$game['beta_url']}">极速下载<i></i></div>
           <?php endif;?>
     
           <?php if (($game['download_ways'] & 4) == 4):?>
@@ -282,7 +282,7 @@
     
           <?php else:?>
           <div class="blue-btn" onclick="layer.msg('该游戏已关闭下载');">￥10至尊下载</div>
-          <div class="blue-btn" onclick="layer.msg('该游戏已关闭下载');">极速下载</div>
+          <div class="blue-btn quick-btn" onclick="layer.msg('该游戏已关闭下载');">极速下载<i></i></div>
           <div class="blue-btn down-link"  onclick="layer.msg('该游戏已关闭下载');return false;" down-link="{$downloadUrl}">普通下载</div>
           <?php endif;?>
          </div>

Public/Home/css/index2.css

@@ -449,6 +449,18 @@
     font-size: 0.28rem;
     color: #FFf;
 }
+.quick-btn {
+    position: relative;
+}
+.quick-btn i {
+    position: absolute;
+    background-image: url(../images/tuijian.png);
+    width: 17px;
+    height: 21px;
+    display: inline-block;
+    left: 3.40rem;
+    top: 0rem;
+}
 .gray-btn{
     width: 4.40rem;
     height:0.7rem;