2“

www/protected/modules/o2o/views/web/index.php

@@ -10,7 +10,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css">
     <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css">
-    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017031303">
+    <link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/o2o/dist/css/main.css?v=2017031304">
     <link href="<?php echo Yii::app()->request->baseUrl; ?>/css/common_o2o/swiper.css" rel="stylesheet">
     <script src="<?php echo Yii::app()->request->baseUrl; ?>/js/o2o/swiper.min.js"></script>
     <style>
@@ -76,7 +76,7 @@
       location.hash = '';
     }
     var debug = false;
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017031303';
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/dist/js/main.js?v=2017031304';
     if (debug) {
       main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/o2o/js/main.js?v=' + (new Date()).getTime();
       document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

www/webapp/o2o/js/page/home.js

@@ -300,12 +300,12 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				setTimeout(function () {
 					pageData.scroll = new IScroll('#homeScroll');
 					/*设置页面高度*/
-					// var homeBox = $('.home-box');
-					// var boxAlignCenter = $('.box-align-center').height();
-					// var preventScroll = $('.prevent-scroll').height();
-					// homeBox.height(boxAlignCenter * 4 + preventScroll);
+					var homeBox = $('.home-box');
+					var boxAlignCenter = $('.box-align-center').height();
+					var preventScroll = $('.prevent-scroll').height();
+					homeBox.height(boxAlignCenter * 4 + preventScroll);
 				}, 750);
-				/*setTimeout(function () {
+				setTimeout(function () {
 					var swiper = new Swiper('.swiper-container', {
 						pagination: '.pagination',
 						loop: true,
@@ -314,7 +314,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 						autoplay: 5000,
 						autoplayDisableOnInteraction: false
 					});
-				}, 700);*/
+				}, 700);
 				setInterval(function () {
 					if($('.swiper-wrapper').height()<=30){
 						$('.swiper-wrapper').height($('.swiper-slide img').height());