Merge branch 'feature/admin_optimize' into release

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['channel_rate'] = I('channel_rate')/100;
-            $save['invoice_rate'] = I('invoice_rate') ?: 0;
+            $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['channel_rate'] = I('channel_rate')/100;
-            $save['invoice_rate'] = I('invoice_rate') ?: 0;
+            $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');