Merge branch 'release' of wmtx/platform into master

内外团归属BUG修复
master
廖金灵 5 years ago committed by Gogs
commit d25ab9048b

@ -415,7 +415,7 @@ class PromoteModel extends Model{
foreach ($result as $key => $value) {
$parseData[$key] = $value;
$parseData[$key]['company_belong_str'] = $value['company_belong'] ? '外团' : '内团';
$parseData[$key]['company_relation_str'] = $value['company_belong'] ? '只维护' : '自主开发及维护';
$parseData[$key]['company_relation_str'] = $value['company_relation'] ? '只维护' : '自主开发及维护';
}
return $parseData;
}

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

Loading…
Cancel
Save