Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/webapp/o2o/js/model/user.js

@@ -8,7 +8,7 @@ define(['base', '$', 'native', 'api', 'order', 'config', 'address'], function (b
 		}
 		User.instance = this;
 		this.storagePrefix = 'user_';
-		this.id = '57e38f1b9f5160ac048b457d'; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
+		this.id = ''; //57e22bb59f5160c2048b456c//57e38f1b9f5160ac048b457d
 		this.lastID = this.getCache('lastID', null, '');
 		this.name = '';
 		this.avatar='';

www/webapp/o2o/js/page/placeOrder.js

@@ -239,7 +239,14 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 			$view.on('swipeRight', function (event) {
 				back.call(this, event);
 			});
-
+			/*setTimeOut*/
+			setInterval(function () {
+				if (product.name == "活动产品") {
+					$('.show-time-picker').css('display', 'none');
+					$('.show-coupon-picker').css('display', 'none');
+					$('.o2o-singles-day').css('display', 'inline');
+				}
+			}, 50);
 			/* 点击查看详情。跳转到product页面 */
 			$.newTouch('.product-pic-o2o', function (event) {
 				$doc.trigger('spa:navigate', {
@@ -770,7 +777,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 					return;
 				}
 
-				if (!order.bookingTimeStr) {
+				if (!order.bookingTimeStr&& product.name !== "活动产品") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择上门时间'
 					}]);