elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
推广公会导流公司
master
廖金灵 4 years ago committed by Gogs
parent eee30c2e8b 092683425d
commit e24e8d6189
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
Application/Home/Controller/BaseController.class.php
Unescape Escape View File

@ -404,7 +404,7 @@ class BaseController extends HomeController
} }
} }
$closePromoteLowest = [334]; $closePromoteLowest = [334, 370];
if (in_array($topPromote['company_id'], $closePromoteLowest)) { if (in_array($topPromote['company_id'], $closePromoteLowest)) {
if ($topPromote['can_view_recharge'] == 1 && !in_array($promote['level'], [3, 4])) { if ($topPromote['can_view_recharge'] == 1 && !in_array($promote['level'], [3, 4])) {
return true; return true;

2
Application/Home/Controller/PromoteGradeController.class.php
Unescape Escape View File

@ -14,7 +14,7 @@ class PromoteGradeController extends BaseController
parent::_initialize(); parent::_initialize();
$loginPromote = $this->getLoginPromote(); $loginPromote = $this->getLoginPromote();
if(C('APP_ENV') == 'dev' || $loginPromote['company_id'] == 334) { if(C('APP_ENV') == 'dev' || in_array($loginPromote['company_id'], [334, 370])) {
} else { } else {
return $this->error('您没有权限'); return $this->error('您没有权限');

6
Application/Home/View/default/Home/landingPage.html
Unescape Escape View File

@ -112,7 +112,7 @@
<div> <div>
<div class="download" data-downloadable="<?= ($game['dow_status'] != 1 || $game['download_ways'] == 0) ? 0 : 1 ?>">免费安装</div> <div class="download" data-downloadable="<?= ($game['dow_status'] != 1 || $game['download_ways'] == 0) ? 0 : 1 ?>">免费安装</div>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<img src="__IMG__/libao.png" style="width: 0.6rem;height: 0.6rem;margin-right:0.15rem;" class="giftBag" alt=""> <!-- <img src="__IMG__/libao.png" style="width: 0.6rem;height: 0.6rem;margin-right:0.15rem;" class="giftBag" alt=""> -->
<img src="__IMG__/wenhao.png" style="width: 0.6rem; height: 0.6rem;" class="doubt" alt=""> <img src="__IMG__/wenhao.png" style="width: 0.6rem; height: 0.6rem;" class="doubt" alt="">
</div> </div>
</div> </div>
@ -352,12 +352,12 @@
</div> </div>
<!-- 礼包 --> <!-- 礼包 -->
<div class="giftBag_mode"> <!-- <div class="giftBag_mode">
<div class=""> <div class="">
<img src="__IMG__/libao2.png" class="img1" alt=""> <img src="__IMG__/libao2.png" class="img1" alt="">
<img src="__IMG__/lingqu.png" class="img2" alt=""> <img src="__IMG__/lingqu.png" class="img2" alt="">
</div> </div>
</div> </div> -->
<div class="getGift giftStep" style="display: none;"> <div class="getGift giftStep" style="display: none;">
<div class="getGift-heard"> <div class="getGift-heard">
领取礼包 领取礼包

2
Application/Home/View/default/Public/promote_base.html
Unescape Escape View File

@ -119,7 +119,7 @@
<a href="{:U('TestingResource/batches')}" class="<if condition='CONTROLLER_NAME eq TestingResource and ACTION_NAME eq batches '>active</if> ">测试资源申请记录</a> <a href="{:U('TestingResource/batches')}" class="<if condition='CONTROLLER_NAME eq TestingResource and ACTION_NAME eq batches '>active</if> ">测试资源申请记录</a>
</div> </div>
<?php endif;?> <?php endif;?>
<?php if(C('APP_ENV') == 'dev' || $loginer['company_id'] == 334):?> <?php if(C('APP_ENV') == 'dev' || in_array($loginer['company_id'], [334, 370])):?>
<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>评级管理</span><i class="arrow_icon"></i></div> <div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>评级管理</span><i class="arrow_icon"></i></div>
<div class="navContent jsnavContent"> <div class="navContent jsnavContent">
<?php if($loginer['level'] <= 2):?> <?php if($loginer['level'] <= 2):?>

Write Preview
Loading…
Cancel
Save