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

新增公会归属编辑规则修改

Application/Admin/Controller/PromoteController.class.php

@@ -1428,7 +1428,7 @@ class PromoteController extends ThinkController
             }
             $data = array(
                 'promote_id' => $promote_id,
-                'company_belong' => $company_belong,
+                // 'company_belong' => $company_belong,
                 'company_relation' => $company_relation,
                 'can_view_recharge' => $can_view_recharge,
                 'company_type' => $company_type,
@@ -1471,7 +1471,6 @@ class PromoteController extends ThinkController
             }
             $data = array(
                 'promote_id' => $promote_id,
-                // 'company_belong' => $company_belong,
                 'company_relation' => $company_relation,
                 'can_view_recharge' => $can_view_recharge,
                 'company_type' => $company_type,
@@ -1521,7 +1520,6 @@ class PromoteController extends ThinkController
                 $promote_belongs = M('promote_belong', 'tab_')->where(['id' => ['in', I('ids')]])->select();
                 foreach ($promote_belongs as $promote_belong) {
                     $update = [
-                        'company_belong' => $promote_belong['company_belong'],
                         'company_relation' => $promote_belong['company_relation'],
                         'can_view_recharge' => $promote_belong['can_view_recharge'],
                         'account_type' => $promote_belong['company_type']

Application/Admin/View/Promote/belong_add.html

@@ -58,30 +58,6 @@
                                 </select>
                             </td>
                         </tr>
-
-
-                        <tr id="company_belong_box" style="display: none;">
-                            <td class="l">工会归属：</td>
-                            <td class="r table_radio">
-                                <input  id="company_belong" name="company_belong" value="" type="hidden">
-                        <span class="form_radio"  id="company_belong_str">
-                            <!-- <label >
-                                <input type="radio" value="3" name="company_belong" class="company_belong"  checked="checked"> 无
-                            </label >
-                            <label >
-                                <input type="radio" value="0" name="company_belong" class="company_belong"> 内团
-                            </label >
-                            <label >
-                                <input type="radio" value="1" name="company_belong" class="company_belong"> 外团
-                            </label>
-                            <label >
-                                <input type="radio" value="2" name="company_belong" class="company_belong"> 外团-分发联盟
-                            </label > -->
-                            </span>
-                                <!--                            <span class="notice-text"></span>-->
-                            </td>
-                        </tr>
-
                         <tr  id="company_relation">
                                 <td class="l">工会关系：</td>
                                 <td class="r table_radio">

Application/Admin/View/Promote/belong_edit.html

@@ -64,16 +64,6 @@
                         <input type="hidden" name="promote_id" value="{$data['promote_id']}">
 
 
-                        <!-- <tr>
-                            <td class="l">工会归属：</td>
-                            <td class="r table_radio">
-                            <input  id="company_belong" name="company_belong" value="{$data['company_belong']}" type="hidden">
-                        <span class="form_radio">
-                            {:getCompanyBlong($data['company_belong'])}
-                            </span>
-                            </td>
-                        </tr> -->
-
                         <tr  id="company_relation">
                             <td class="l">工会关系：</td>
                             <td class="r table_radio">