1

www/protected/modules/o2o/controllers/OrderController.php

@@ -31,7 +31,7 @@ class  OrderController extends O2oBaseController{
             //}
         }
         //双十一活动暂用  start 判断用户是否购买过  58227d2ba84ea0c17e8b45b2
-        $doubleEleventId = '581fe5a6a84ea0e36c8b45bb';
+        $doubleEleventId = '582487169f5160d0048b4fe7';
         $flag_book = 0;
         if($products[0]['product_id'] == $doubleEleventId) {
             $criteria_user = new EMongoCriteria();

www/webapp/o2o/js/model/product.js

@@ -1135,8 +1135,8 @@ define(['base', '$', 'api'], function (base, $, api) {
                 ]
             },
             {
-                id: "581fe5a6a84ea0e36c8b45bb",
-                name: "活动产品",
+                id: "582487169f5160d0048b4fe7",
+                name: "双11虹口区日常保洁特价体验",
                 imgSrc: 'http://odulvej8l.bkt.clouddn.com/1%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
                 status: 1,

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

@@ -48,7 +48,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				native.call('4000328170');
 			}, $view);
 			//加载弹框
-			setTimeout(function () {
+			setInterval(function () {
 				$('.swiper-container').height($('.swiper-container img').height());
 				// $('.pagination').css('bottom', '0.15rem');
 			}, 200);

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

@@ -8,7 +8,7 @@
 {{if !WX}}
 <div class="content content-padding">
 	<div class="box-center">
-		<p>订单支付成功，稍后会有壹管家工作人员联系你de ~</p>
+		<p>订单支付成功，稍后会有壹管家工作人员联系你~</p>
 	</div>
 	<a class="btn btn-positive btn-block my-order">查看我的预约</a>
 </div>