diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index c886ee80c..fa34b014a 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -1325,8 +1325,8 @@ class PromoteController extends ThinkController */ public function belong($p = 1) { - if (strlen(I('company_belong'))) { - $map['pb.company_belong'] = I('company_belong'); + if (strlen(I('company_relation'))) { + $map['pb.company_relation'] = I('company_relation'); } if (strlen(I('verify_status'))) { diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php index ea83a0f00..4f20fa453 100644 --- a/Application/Admin/Controller/PromoteGameRatioController.class.php +++ b/Application/Admin/Controller/PromoteGameRatioController.class.php @@ -290,7 +290,7 @@ class PromoteGameRatioController extends ThinkController $promoteGameRatio['end_time'] = $promoteGameRatio['end_time'] ? date('Y-m', $promoteGameRatio['end_time']) : ''; $promoteGameRatio['turnover_ratio'] = $promoteGameRatio['turnover_ratio'] ? json_decode($promoteGameRatio['turnover_ratio'], true) : $promoteGameRatio['turnover_ratio']; if ($promoteGameRatio['last_ratio_status'] == 1) { - $lastRatio = $promoteGameRatio['last_ratio']; + $lastRatio = $promoteGameRatio['last_ratio'] . '%'; } else { $gameRatio = M('game', 'tab_')->where(array(['id' => $promoteGameRatio['game_id']]))->getField('ratio'); $lastRatio = ($gameRatio ?? '0.00') . '%'; diff --git a/Application/Admin/View/Promote/belong.html b/Application/Admin/View/Promote/belong.html index 462d97a6a..a9a61708a 100644 --- a/Application/Admin/View/Promote/belong.html +++ b/Application/Admin/View/Promote/belong.html @@ -59,7 +59,7 @@
- diff --git a/Application/Admin/View/Promote/belong_edit.html b/Application/Admin/View/Promote/belong_edit.html index 3c0c7ec73..64cae2757 100644 --- a/Application/Admin/View/Promote/belong_edit.html +++ b/Application/Admin/View/Promote/belong_edit.html @@ -50,7 +50,7 @@ 会长账号: - @@ -58,7 +58,7 @@ - + 工会归属: