Merge branch 'hotfix/hide_promote_phone' of wmtx/platform into release

隐藏市场总监电话
master
廖金灵 5 years ago committed by Gogs
commit b62eb3be7c

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

@ -58,30 +58,6 @@
</select> </select>
</td> </td>
</tr> </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"> <tr id="company_relation">
<td class="l">工会关系:</td> <td class="l">工会关系:</td>
<td class="r table_radio"> <td class="r table_radio">

@ -64,16 +64,6 @@
<input type="hidden" name="promote_id" value="{$data['promote_id']}"> <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"> <tr id="company_relation">
<td class="l">工会关系:</td> <td class="l">工会关系:</td>
<td class="r table_radio"> <td class="r table_radio">

@ -148,9 +148,9 @@
<!--头部个人信息--> <!--头部个人信息-->
<div class="header"> <div class="header">
<if condition="$loginer['level'] eq 1 and $loginer['company_belong'] eq 1"> <if condition="$loginer['level'] eq 1 and $loginer['company_belong'] eq 1">
<div style="position: absolute;padding-left: 1.5%;"> <!-- <div style="position: absolute;padding-left: 1.5%;">
<span class="pinfo" style="color: #1239f2">市场总监联系方式:<span>13637338237(李总监)</span></span> <span class="pinfo" style="color: #1239f2">市场总监联系方式:<span>13637338237(李总监)</span></span>
</div> </div> -->
</if> </if>
<div class="header-right"> <div class="header-right">
<span class="pinfo jstime">今天是:<span></span></span> <span class="pinfo jstime">今天是:<span></span></span>

Loading…
Cancel
Save