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

更新合作公司列表显示

Application/Admin/Controller/PartnerController.class.php

@@ -62,7 +62,7 @@ class PartnerController extends ThinkController
         //获取分页数据
         $query = $model->alias('p')
             ->field("p.partner,p.matche_platform,p.invoice_rate,p.settlement_type,p.bank_account,
-            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type")
+            p.opening_bank,p.id,p.contract_start_time,p.contract_end_time,p.remark,p.company_type,p.has_game_evidence,p.is_sign_contract")
             ->where($map)
             ->order("id desc");
         if($is_export){
@@ -143,8 +143,8 @@ class PartnerController extends ThinkController
         $parseData = array();
         foreach ($partners as $key =>$value) {
             $value['game'] = $parseGames[$value['id']];
-            $value['has_game_evidence'] = $parseGames['has_game_evidence'] ? '有' : '没有';
-            $value['is_sign_contract'] = $parseGames['is_sign_contract'] ? '是' : '否';
+            $value['has_game_evidence'] = $value['has_game_evidence'] ? '是' : '否';
+            $value['is_sign_contract'] = $value['is_sign_contract'] ? '是' : '否';
             $value['channel_rate'] *= 100;
             $value['invoice_rate'] *= 100;
             if ($value['settlement_type'] == 0) {