洪海涛 8 lat temu
rodzic
commit
f6bc5d02be

+ 2 - 2
www/protected/modules/moonclub/views/web/index.php

@@ -17,7 +17,7 @@
     <?php //echo Yii::app()->request->baseUrl; ?><!--/webapp/moonclub/dist/css/main.css?v=-->
     <?php //echo time();?><!--">-->
     <link rel="stylesheet"
-          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=2017010915">
+          href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=2017011013">
     <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>
@@ -81,7 +81,7 @@
         }
         var debug = false;
 //    var main = '<?php //echo Yii::app()->request->baseUrl;?>///webapp/moonclub/dist/js/main.js?v=20160960804';
-        var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=2017010915';
+        var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=2017011013';
         if (debug) {
             main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=' + (new Date()).getTime();
             document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';

Plik diff jest za duży
+ 0 - 0
www/webapp/moonclub/dist/js/main.js


Plik diff jest za duży
+ 0 - 0
www/webapp/moonclub/dist/js/page/home.js


+ 8 - 5
www/webapp/moonclub/js/page/home.js

@@ -135,8 +135,8 @@ define(['$', 'template', 'IScroll',  'user', 'native', 'config', 'address', 'api
 			localStorage.removeItem('cart_products');
 			dtd.resolve();
 			native.switchPopGesture(true);
-		},
-		afteropen: function (pageData, dtd) {
+
+
 			var $view = this;
 			var $doc = $(document);
 			/* 如果需要重新加载,就请求服务列表。 */
@@ -163,11 +163,11 @@ define(['$', 'template', 'IScroll',  'user', 'native', 'config', 'address', 'api
 						// autoplayDisableOnInteraction: false
 					});
 				}, 200);
-				setTimeout(function () {
-					pageData.scroll = new IScroll('#homeScroll');
+				/*setTimeout(function () {
+					// pageData.scroll = new IScroll('#homeScroll');
 					// $(".box-container").height($(window).height());
 					// $("#homeScroll").height($(window).height())
-				}, 500);
+				}, 500);*/
 
 				setInterval(function () {
 					// console.log($("#homeScroll").height($(window).height()));
@@ -185,6 +185,9 @@ define(['$', 'template', 'IScroll',  'user', 'native', 'config', 'address', 'api
 				});
 				$doc.trigger('spa:closeloader');
 			}
+		},
+		afteropen: function (pageData, dtd) {
+
 			/* 又是这个。不知道什么玩意…… */
 			dtd.resolve();
 

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików