From af28ff91551a0da416a83f4c07a220d371439a91 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 10 Jan 2020 14:43:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E5=BD=92=E5=B1=9E?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PromoteController.class.php | 4 ++--
 Application/Admin/View/Promote/belong.html               | 2 +-
 Application/Admin/View/Promote/belong_edit.html          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

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/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 @@
                 <input type="text" name="account" placeholder="请输入会长账号" value="{:I('account')}">
             </div>
                 <div class="input-list input-list-channelstatus">
-                    <select name="company_belong">
+                    <select name="company_relation">
                         <option value="">归属状态</option>
                         <option value="0">自主开发及维护</option>
                         <option value="1">只维护</option>
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 @@
                         <tr>
                             <td class="l">会长账号：</td>
                             <td class="r">
-                                <select id="promote_id" name="promote_id" class="select_gallery"  style="width:120px;">
+                                <select id="promote_id" name="" class="select_gallery"  style="width:120px;" disabled>
                                     <option value="">请选择会长账号</option>
                                     <volist name=":promote_listsOther(1)" id="vo">
                                         <option promote_id-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $data['promote_id']">selected=selected</if>>{$vo.account}</option>
@@ -58,7 +58,7 @@
                                 </select>
                             </td>
                         </tr>
-
+                        <input type="hidden" name="promote_id" value="{$data['promote_id']}">
 
                         <tr>
                             <td class="l">工会归属：</td>

From d615a1402f702f82c5175e3d13c4686e0fd457ed Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Fri, 10 Jan 2020 17:58:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=88=86=E6=88=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/PromoteGameRatioController.class.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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') . '%';