合并分支 'lihong' 到 'master'

修改



查看合并请求 !151

@@ -78,7 +78,7 @@
 <include file="public@footer"/>
 <script src="__TMPL__/public/mobile/js/common.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript">
-    // alert($(document).height())
+     alert($(document).height())
     if($(document).height()==455){
         // $(".index_swiper").css("height","95%");
         // $(".swiper-container").css("height","95%");