Merge pull request '优化子站列表' (#212) from feature/finance_payment_20210115 into release

优化子站列表

Application/Admin/Controller/SubSpendController.class.php

@@ -123,7 +123,7 @@ class SubSpendController extends ThinkController
         //     $map = '1 = 2';
         //     $map1 = $map;
         // }
-        $this->checkListOrCountAuthRestMap($map,["extend", "pay_order_number", "user_account"]);
+        // $this->checkListOrCountAuthRestMap($map,["extend", "pay_order_number", "user_account"]);
         D("Spend")->addSubsiteWhere($map);
 
         $map1 = $map;

Application/Admin/View/SubSpend/lists.html

@@ -142,7 +142,6 @@
             </div>
             <br>
 
-            <?php if($showPromote == 1):?>
             <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>
@@ -158,19 +157,14 @@
                     <option value="">请选择推广员</option>
                 </select>
             </div>
-            <?php endif;?>
 
-            <?php if(!$isMarketAdmin && $showMarketAdmin == 1):?>
             <div class="input-list search_item input-list-gamenoticestatus">
                 <select name="market_admin_id" style="color:#444" class="select_gallery" id="market_admin_id">
                     <option value="0">所属市场专员</option>
-                    <?php foreach($marketAdmins as $marketAdmin):?>
                     <option value="<?=$marketAdmin['id']?>" <?php if ($_POST['market_admin_id'] == $marketAdmin['id']):?>selected<?php endif;?>><?=$marketAdmin['username']?></option>
-                    <?php endforeach;?>
                 </select>
             </div>
 
-            <?php endif;?>
             <div class="input-list search_item input-list-gamenoticestatus">
                 <select name="platform_type" style="color:#444" class="select_gallery" id="platform_type">
                     <option value="0">游戏平台</option>
@@ -235,12 +229,8 @@
                     <th>玩家账号</th>
                     <th>游戏名称</th>
                     <th>设备类型</th>
-                    <?php if($showPromote == 1):?>
                     <th>所属推广员</th>
-                    <?php endif;?>
-                    <?php if($showMarketAdmin == 1):?>
                     <th>所属市场专员</th>
-                    <?php endif;?>
                     <th>所属商户</th>
                     <th>充值ip</th>
                     <th>区服ID</th>
@@ -268,18 +258,11 @@
                         <tr>
                             <td ><input class="ids" type="checkbox" data-ischeck="{$data.is_check}" value="{$data['id']}" name="ids[]"></td>
                             <td>
-                                <if condition="$show_data_power eq true ">
                                     {$data.pay_order_number}
-                                    <else />
+                                   
-                                    {$data.pay_order_number|encryptStr}
-                                </if>
                               </td>
                             <td>
-                                <if condition="$show_data_power eq true ">
                                     {$data.extend}
-                                    <else />
-                                    {$data.extend|encryptStr}
-                                </if>
                                 </td>
                             <td>{:set_show_time($data['pay_time'])}</td>
                             <td>
@@ -290,15 +273,10 @@
                                 </if>
                               </td>
                             <td>
-                              <if condition="$show_data_power eq true ">
+                                {$data.user_account}
-                                    {$data.user_account}
-                                    <else />
-                                    {$data.user_account|encryptStr}
-                                </if>
                                 <gt name="data.small_id" value="0"><neq name="data.small_id" value="$data.user_id">（{$data.small_account}）</neq></gt></td>
                             <td>{$data.game_name}</td>
                             <td>{$data.sdk_version_name}</td>
-                            <?php if($showPromote == 1):?>
                             <td>
                                 <eq name="data.promote_id" value="-1">C('OFFICIEL_CHANNEL')<else/>
                                    <!-- <if condition="$is_admin eq true ">
@@ -310,10 +288,7 @@
 <!--                                    {:get_promote_account($data['promote_id'])}-->
                                 </eq>
                             </td>
-                            <?php endif;?>
-                            <?php if($showMarketAdmin == 1):?>
                             <td >{$data.market_admin_username}</td>
-                            <?php endif;?>
                             <td >{:getMerchantName($data['merchant_id'])}</td>
                             <td>{$data.spend_ip}</td>
                             <empty name='data.server_name'>
@@ -377,7 +352,6 @@
                     </volist>
                 </empty>
 
-                    <if condition="$rule_count_check">
                     <tr class="data_summary">
                         <td colspan="2">汇总</td>
                         <td colspan="21">
@@ -387,16 +361,13 @@
                         </td>
 
                     </tr>
-                    </if>
 
                 </tbody>
             </table>
         </div>
     </div>
     <div class="page">
-        <if condition="$role_export_check eq true ">
+        <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>7,'xlsname'=>'游戏订单_游戏充值','timestart'=>$startDate,'timeend'=>$endDate,'issubdata'=>$isSubData),I('get.')))}">导出</a>
-            <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>7,'xlsname'=>'游戏订单_游戏充值','timestart'=>$startDate,'timeend'=>$endDate,'issubdata'=>$isSubData),I('get.')))}">导出</a>
-        </if>
         {$_page|default=''}
     </div>