添加活动产品

www/webapp/o2o/dist/js/page/secondary.js

@@ -1 +1 @@
-define(["$","template","IScroll","user","product","native","config","address"],function(e,t,n,r,i,s,o,u){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},s),s.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".Long-term-set",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0}})},s),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:i.allList[n-1],needReset:!0}})},s),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},s),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},s),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),r.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},s),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,i){var s=this,u=e(document);if(r.pushData&&r.pushData.needReset){var a=t("secondary/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#secondaryScroll")},500)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","product","native","config","address"],function(e,t,n,r,i,s,o,u){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},s),s.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:i.allList[n-1],needReset:!0}})},s),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},s),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},s),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),r.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},s),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,i){var s=this,u=e(document);if(r.pushData&&r.pushData.needReset){var a=t("secondary/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#secondaryScroll")},500)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -61,11 +61,14 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			$.newTouch('.close', function () {
 				event.preventDefault();
 				$('.popup-box').css('display', 'none');
+				$('.nav-li-box').css('display','none');
 			}, $view);
 			/*跳转页面*/
 			$.newTouch('.popup-img', function () {
 				event.preventDefault();
 				$('.popup-box').css('display', 'none');
+				$('.nav-li-box').css('display','none');
+
 				$doc.trigger('spa:navigate', {
 					hash: 'payAgreement',
 					pushData: {
@@ -74,10 +77,9 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				});
 			}, $view);
 			/*自动关闭活动窗口*/
-			setTimeout(function () {
-				// $('.popup-box').css('display', 'none');
-				console.log($('.popup-img:after'));
-			}, 10);
+			// setTimeout(function () {
+			// 	// $('.popup-box').css('display', 'none');
+			// }, 10);
 			/*setTimeout(function () {
 			 $doc.trigger('spa:openpanel', ['simpleAlert', {
 			 message: '您已获得双十一大礼包',

www/webapp/o2o/js/page/secondary.js

@@ -45,15 +45,15 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
                 back.call(this, event);
             });
             /*活动入口*/
-            $.newTouch('.Long-term-set', function (event) {
-                event.preventDefault();
-                $doc.trigger('spa:navigate', {
-                    hash: 'activity-day',
-                    pushData: {
-                        needReset: true
-                    }
-                });
-            }, $view)
+            // $.newTouch('.Long-term-set', function (event) {
+            //     event.preventDefault();
+            //     $doc.trigger('spa:navigate', {
+            //         hash: 'activity-day',
+            //         pushData: {
+            //             needReset: true
+            //         }
+            //     });
+            // }, $view)
 
             /* 点击产品列表的某一项 */
             $.newTouch('.btn-product', function (event) {