合并

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'))) {

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

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>

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>