民宿开发

www/protected/modules/common/views/activity/SinglesDay.php

@@ -88,7 +88,7 @@
   var myapp = angular.module('myapp', []);
   myapp.controller('myctrl', ['$scope', function ($scope) {
 
-    $('.model').on('click', function () {
+    $('.model-content').on('click', function () {
       $('.model').css('height', '0');
       $('.model-box').css('display', 'none');
     });

www/webapp/o2o/dist/js/page/homestay.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(".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-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("homestay/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#homestayScroll")},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(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=common/activity/ScanCoupon"},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-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("homestay/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#homestayScroll")},500)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -49,22 +49,24 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			}, $view);
 			//加载弹框
 			setTimeout(function () {
+				$('.swiper-container').height($('.swiper-container img').height());
 				$doc.trigger('spa:openpanel', ['simpleAlert', {
 					message: '您已获得双十一大礼包',
 					// title: '系统通知',
 					// html: '您已获得双十一大礼包',
-					buttons: [{text: '我知道了', class: 'btn-primary'}]
+					buttons: [{text: '我知道了', class: 'btn-o2o-home'}]
 				}]);
+				$.newTouch('.alert-body', function (event) {
+					event.preventDefault();
+					$doc.trigger('spa:navigate', {
+						hash: 'myCoupon',
+						pushData: {
+							needReload: true
+						}
+					});
+				}, $view);
 			}, 100);
-			$.newTouch('.alert-btn-box', function (event) {
-				event.preventDefault();
-				$doc.trigger('spa:navigate', {
-					hash: 'myCoupon',
-					pushData: {
-						needReload: true
-					}
-				});
-			}, $view);
+			
 			//点击banner-1进入充值卡页
 			$.newTouch('.btn-banner-recharge', function (event) {
 				event.preventDefault();
@@ -278,10 +280,10 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 						loop: true,
 						paginationClickable: true,
 						centeredSlides: true,
-						autoplay: 1500,
+						autoplay: 2000,
 						autoplayDisableOnInteraction: false
 					});
-					$('.swiper-container').height($('.swiper-container img').height());
+
 				}, 200);
 
 				// 目前的作用只是供后端判断，该用户是否为新用户，所以没有回调。

www/webapp/o2o/js/page/homestay.js

@@ -44,7 +44,12 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 			$view.on('tapBackButton', function (event) {
 				back.call(this, event);
 			});
-
+			$.newTouch('.o2o-btn-homestay',function (event) {
+				event.preventDefault();
+				window.location.href='/index.php?r=common/activity/ScanCoupon';
+				// console.log('测试')
+			},$view);
+			
 
 			/* 点击产品列表的某一项 */
 			$.newTouch('.btn-product', function (event) {

www/webapp/o2o/tpl/homestay/index.html

@@ -15,10 +15,12 @@
 					<div class="home-stay-content">
 						<img src="http://odulvej8l.bkt.clouddn.com/%E6%B0%91%E5%AE%BF%E4%BF%9D%E6%B4%81%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"
 						     style="width: 100%;">
+
 						<div style="padding-bottom:10%;"></div>
 					</div>
 				</div>
 				<div class="prevent-scroll">
+					<div class="o2o-btn-homestay" style="text-align: center;color:#fff;position: absolute;right: 0;background: #d1be31;width: 25%;height: 25px;top: -1.3rem;border: 1px solid rgba(0,0,0,0.14);border-radius: 14px;">点击咨询</div>
 					<div class="box my-action">
 						<!--首页-->
 						<div class="width-percent-33">

www/webapp/o2o/tpl/product/option.html

@@ -9,4 +9,4 @@
 			<a class="btn btn-cancle btn-block btn-next">取消</a>
 		</div>
 	</div>
-</div>
+</div>