Merge branch 'dev'

Application/Admin/Controller/StatController.class.php

@@ -123,6 +123,8 @@ class StatController extends ThinkController
      */
     public function userretention($p = 0)
     {
+        echo "暂不开放";
+        die();
         $request=$_REQUEST;
         $page = intval($p);
         $page = $page ? $page : 1; //默认显示第一页数据

Application/Home/View/default/Promote/msg_list.html

@@ -14,7 +14,7 @@
             <div class="fxui-tab">
                 <div class="fxui-tab-hand" style="border-bottom: none">
                     <span class="fxui-tab-tit <if condition="$type==56">curr</if>"><a href="{:U('msg_list')}&type=56">公告</a>
-                        <if condition="$gg_count neq 0">
+                        <if condition="$gg_count gt 0">
                             <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">{$gg_count}</a>
                             </span>
@@ -28,18 +28,18 @@
                         <!--                        </if>-->
                     </span>
                     <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 gt 0">
                             <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:83px;text-align: center;background: rgba(255, 0, 0, 1)">
                                 <a style="line-height: 25px;padding: 0px;color: #fff">{$zx_count}</a>
                             </span>
                         </if>
                     </span>
                     <span class="fxui-tab-tit <if condition="$type==0">curr</if>"><a href="index.php/Home/TestResource/protectLogList.html">资源号异常日志</a>
-                        <!--<if condition="$rz_count neq 0">
+                        <if condition="$rz_count gt 0">
                             <span style="width: 25px;height: 25px;float: left;position: relative;bottom:50px;left:125px;text-align: center;background: rgba(255, 0, 0, 1)">
                                 <a style="line-height: 25px;padding: 0px;color: #fff">{$rz_count}</a>
                             </span>
-                        </if>-->
+                        </if>
                     </span>
                 </div>
                 <div class="fxui-tab-nav">