合并分支 'lihong' 到 'master'

修改



查看合并请求 !116

@@ -77,7 +77,7 @@
 <include file="public@footer"/>
 <include file="public@footer"/>
 <script src="__TMPL__/public/mobile/js/common.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/common.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript">
 <script type="text/javascript">
-    alert($(document).height())
+    // alert($(document).height())
 
 
     var swiper = new Swiper('.swiper-container', {
     var swiper = new Swiper('.swiper-container', {
         pagination: {
         pagination: {