Merge branch 'hotfix/cpcompany_gameinfo' of wmtx/platform into master

优化游戏资质展示

Application/Admin/Controller/PartnerController.class.php

@@ -165,6 +165,8 @@ class PartnerController extends ThinkController
             $value['cooperation_status'] = $value['cooperation_status'] ? '合作中' : '暂停合作';
             $value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司';
 
+            $value['has_game_evidence'] = $value['has_game_evidence'] ? '是' : '否';
+
             $contract_start_time = $value['contract_start_time'] ? time_format($value['contract_start_time'], 'Y/m/d') : '-';
             if($value['contract_start_time']){
                 $contract_end_time = $value['contract_end_time'] ? date('Y/m/d', $value['contract_end_time']) : '永久';

Application/Admin/View/Partner/export.html

@@ -77,7 +77,6 @@
 
                     <th>发票类型</th>
                     <th>税费费率</th>
-                    
                     <th>渠道费率</th>
                     <th>注册地址</th>
                     <th>注册电话</th>
@@ -129,17 +128,17 @@
                             <td rowspan="{$data.row}">{$data.is_collection|default="--"}</td>
 
                             <td rowspan="{$data.row}">{$data.advance_amount|default="--"}</td>
-                            <td rowspan="{$data.row}">{$data.has_advance_charge|default="--"}</td>
+
+                            <td rowspan="{$data.row}">{$data.has_game_evidence|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.is_sign_contract|default="--"}</td>
+
                             <td rowspan="{$data.row}">{$data.contract_time}</td>
                             <td rowspan="{$data.row}">{$data.validity_time}</td>
-
                             <td rowspan="{$data.row}">{$data.company_tax_no|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.invoice_rate|showPercent}</td>
 
                             <td rowspan="{$data.row}">{$data.invoice_type|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.taxation_rate|showPercent}</td>
-
                             <td rowspan="{$data.row}">{$data.channel_rate|showPercent}</td>
                             <td rowspan="{$data.row}">{$data.reg_address|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.reg_phone|default="--"}</td>
@@ -147,7 +146,6 @@
 
                             <td rowspan="{$data.row}">{$data.link_phone|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.address|default="--"}</td>
-
                             <td rowspan="{$data.row}">{$data.has_server_fee|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.server_fee|default="--"}</td>
                             <td rowspan="{$data.row}">{$data.cooperation_status|default="--"}</td>