Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

master
zyx 5 years ago
commit 5637b496e9

@ -21,11 +21,11 @@
</if> </if>
</span> </span>
<span class="fxui-tab-tit <if condition="$type==50">curr</if>"><a href="{:U('msg_list')}&type=50">消息</a> <span class="fxui-tab-tit <if condition="$type==50">curr</if>"><a href="{:U('msg_list')}&type=50">消息</a>
<!-- <if condition="$gg_count neq 0">--> <!-- <if condition="$gg_count neq 0">-->
<!-- <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">--> <!-- <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:55px;text-align: center;background: rgba(255, 0, 0, 1)">-->
<!-- <a style="line-height: 25px;padding: 0px;color: #fff">0</a>--> <!-- <a style="line-height: 25px;padding: 0px;color: #fff">0</a>-->
<!-- </span>--> <!-- </span>-->
<!-- </if>--> <!-- </if>-->
</span> </span>
<span class="fxui-tab-tit <if condition="$type==51">curr</if>"><a href="{:U('msg_list')}&type=51">游戏活动</a> <span class="fxui-tab-tit <if condition="$type==51">curr</if>"><a href="{:U('msg_list')}&type=51">游戏活动</a>
<if condition="$zx_count neq 0"> <if condition="$zx_count neq 0">
@ -49,7 +49,7 @@
<volist name="data_list" id="data"> <volist name="data_list" id="data">
<p> <p>
<if condition="$type neq 0"> <if condition="$type neq 0">
<span class="title"><a href="index.php?s=/Home/Article/detail/id/{$data.id}.html">{$data.title}</a></span> <span class="title"><a href="index.php?s=/Home/Article/detail/id/{$data.id}.html">{$data.title}</a></span>
<else/> <else/>
<span class="title"><a href="index.php?s=/Home/TestResource/protectLogList/id/{$zx.id}.html">{$data.title}</a></span> <span class="title"><a href="index.php?s=/Home/TestResource/protectLogList/id/{$zx.id}.html">{$data.title}</a></span>
</if> </if>
@ -58,13 +58,14 @@
</volist> </volist>
</empty> </empty>
</div> </div>
<notempty name="data_list">
<div class="pagenation clearfix" >
{$_page}
</div>
</notempty>
</div> </div>
</div> </div>
<notempty name="data_list">
<div class="pagenation clearfix">
{$_page}
</div>
</notempty>
</div> </div>
</block> </block>
<block name="script"> <block name="script">

Loading…
Cancel
Save