解决冲突

master
ELF 5 years ago
commit cc9aa1a640

@ -1732,7 +1732,8 @@ class ApplyController extends BaseController
$this->ajaxReturn(['status' => 1, 'data' => $enableStatus]); $this->ajaxReturn(['status' => 1, 'data' => $enableStatus]);
} }
public function backDetailData() { //返回详情数据 public function backDetailData()
{ //返回详情数据
$result = ['code' => 10001, 'msg' => "该游戏信息不存在,请确认!", 'error' => 1, 'info' => '']; $result = ['code' => 10001, 'msg' => "该游戏信息不存在,请确认!", 'error' => 1, 'info' => ''];
$id = $_POST['id']; $id = $_POST['id'];
if (empty($id)) { if (empty($id)) {

@ -117,15 +117,19 @@ class HomeController extends Controller
{ {
$gameData = M('Game', 'tab_') $gameData = M('Game', 'tab_')
->field('relation_game_id,sdk_version') ->field('relation_game_id,sdk_version')
->where(array('id' => $_GET['gid'])) ->where(array('id' => intval($_GET['gid'])))
->find(); ->find();
$RelationGameId = $gameData['relation_game_id']; $RelationGameId = $gameData['relation_game_id'];
$gameSdkType = $gameData['sdk_version']; $gameSdkType = $gameData['sdk_version'];
$map['tab_game.relation_game_id'] = $RelationGameId; $map['tab_game.relation_game_id'] = $RelationGameId;
$map['ta.promote_id'] = $_GET['pid']; $data = M('game', 'tab_')
$data = M('game', 'tab_')->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs')->where($map)->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . $_GET['pid'])->select(); ->field('tab_game.id,tab_game.sdk_version,tab_game.icon,tab_game.screenshot,tab_game.relation_game_id,tab_game.relation_game_name,ta.enable_status,tab_game.dow_status,tab_game.features,tab_game.flooring_page_imgs,ta.promote_id')
->join('tab_apply ta ON ta.game_id = tab_game.id and ta.offline_status = 0 and ta.promote_id=' . intval($_GET['pid']))
->where($map)
->group('tab_game.id')
->select();
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
if (!empty($value['flooring_page_imgs'])) { if (!empty($value['flooring_page_imgs'])) {

@ -129,7 +129,6 @@
</div> </div>
</div> </div>
</div>
<div class="head"> <div class="head">
<div class="m1200"> <div class="m1200">
<a href="{:U('Index/index')}" class="logo"> <a href="{:U('Index/index')}" class="logo">
@ -170,10 +169,11 @@
<li> <li>
<a class="khd" target="_blank" href="{:U('Index/download')}" ><span>{:C('PC_NAVIGATION_CLIENT')?C('PC_NAVIGATION_CLIENT'):'客户端'}</span><i></i></a> <a class="khd" target="_blank" href="{:U('Index/download')}" ><span>{:C('PC_NAVIGATION_CLIENT')?C('PC_NAVIGATION_CLIENT'):'客户端'}</span><i></i></a>
</li> </li>
</if> <!-- </if>-->
</ul> </ul>
</div> </div>
</div> </div>
<!-- 主体内容 --> <!-- 主体内容 -->
<block name="body"></block> <block name="body"></block>
@ -254,8 +254,6 @@
</div> </div>
</div>--> </div>-->
</div>
</div>
<block name="giftextend"></block> <block name="giftextend"></block>
<script> <script>

@ -87,10 +87,10 @@
} }
</style> </style>
<div class="foot-nav-list"> <div class="foot-nav-list">
<!-- <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index' >on</if>"> <a href="{:U('Index/index')}" class="<if condition='CONTROLLER_NAME eq Index' >on</if>">
<i class="iconfont icon-home"></i> <i class="iconfont icon-home"></i>
<p>首页</p> <p>首页</p>
</a> --> </a>
<if condition="C('IS_OPEN_SMALL_ACCOUNT') neq 0"> <if condition="C('IS_OPEN_SMALL_ACCOUNT') neq 0">
<a href="{:U('Trade/index')}" class="<if condition='CONTROLLER_NAME eq Trade'>on</if>"> <a href="{:U('Trade/index')}" class="<if condition='CONTROLLER_NAME eq Trade'>on</if>">
<i class="iconfont icon-trade"></i> <i class="iconfont icon-trade"></i>
@ -113,20 +113,20 @@
<i class="iconfont icon-shop"></i> <i class="iconfont icon-shop"></i>
<p>商城</p> <p>商城</p>
</a>--> </a>-->
<!-- <a href="{:U('Index/product')}" class="<if condition='CONTROLLER_NAME eq Gift'>on</if>"> <a href="{:U('Index/product')}" class="<if condition='CONTROLLER_NAME eq Gift'>on</if>">
<i class="iconfont icon-gift"></i> <i class="iconfont icon-gift"></i>
<p>产品服务</p> <p>产品服务</p>
</a> </a>
<a href="{:U('Index/business')}" class="<if condition='CONTROLLER_NAME eq Shop'>on</if>"> <a href="{:U('Index/business')}" class="<if condition='CONTROLLER_NAME eq Shop'>on</if>">
<i class="iconfont icon-shop"></i> <i class="iconfont icon-shop"></i>
<p>商务合作</p> <p>商务合作</p>
</a> --> </a>
<!--<a href="{:U('News/index')}" class="<if condition='CONTROLLER_NAME eq News'>on</if>"> <!--<a href="{:U('News/index')}" class="<if condition='CONTROLLER_NAME eq News'>on</if>">
<i class="iconfont icon-news"></i> <i class="iconfont icon-news"></i>
<p>资讯</p> <p>资讯</p>
</a>--> </a>-->
</if> </if>
<a style="width: 100%; margin-left: 0px;" href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>on</if>"> <a href="{:U('User/index')}" class="<if condition='CONTROLLER_NAME eq User'>on</if>">
<i class="iconfont icon-user"></i> <i class="iconfont icon-user"></i>
<p>我的</p> <p>我的</p>
</a> </a>

Loading…
Cancel
Save