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

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

@@ -21,11 +21,11 @@
                         </if>
                     </span>
                     <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">-->
-<!--                        <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>-->
-<!--                        </span>-->
-<!--                        </if>-->
+                        <!--                        <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)">-->
+                        <!--                            <a style="line-height: 25px;padding: 0px;color: #fff">0</a>-->
+                        <!--                        </span>-->
+                        <!--                        </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">
@@ -58,14 +58,15 @@
                         </volist>
                     </empty>
                 </div>
-            </div>
-        </div>
                 <notempty name="data_list">
-        <div class="pagenation clearfix">
+                    <div class="pagenation clearfix" >
                         {$_page}
                     </div>
                </notempty>
             </div>
+        </div>
+
+    </div>
 </block>
 <block name="script">
     <script>