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

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 f(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:a,pushData:{dontNeedReload:!0}})}var a;return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){f.call(this,e)}),e.newTouch(".back-button",function(e){f.call(this,e)},s),s.on("tapBackButton",function(e){f.call(this,e)}),e.newTouch(".Long-term-set",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0,backHash:"secondary"}})},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,backHash:"secondary"}})},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){var n=e.pushData;a=n.backHash?n.backHash:"",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),setTimeout(function(){e("#list0").height(e(".btn-product").height()*4+e(".prevent-scroll").height())},200)}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 f(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:a,pushData:{dontNeedReload:!0}})}var a;return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){f.call(this,e)}),e.newTouch(".back-button",function(e){f.call(this,e)},s),s.on("tapBackButton",function(e){f.call(this,e)}),e.newTouch(".secondary-img",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"longOrder",pushData:{needReset:!0,backHash:"secondary"}})},s),e.newTouch(".Long-term-set",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0,backHash:"secondary"}})},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,backHash:"secondary"}})},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){var n=e.pushData;a=n.backHash?n.backHash:"",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),setTimeout(function(){e("#list0").height(e(".btn-product").height()*4+e(".prevent-scroll").height())},200)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -1195,8 +1195,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                         height: 644
                     }
                 ]
-            }
-            /*,
+            },
 	          {
 		        id: "5835418aa84ea0a7748b4587",
 		        name: "小时工单次",
@@ -1301,7 +1300,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 		        status: 1,
 		        is_extra: 0,
 		        order: 0,
-		        type: "11",
+		        type: "12",
 		        type_str: "长期订",
 		        extra: [
 			        {
@@ -1388,7 +1387,7 @@ define(['base', '$', 'api'], function (base, $, api) {
 				        height: 850
 			        }
 		        ]
-	        }*/
+	        }
         ];
         //列出所有的产品
         Product.prototype.getListAll = function (userID, callback) {

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

@@ -778,22 +778,18 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 					}]);
 					return;
 				}
-
-				if (!order.address) {
+				if ($('.order-mobile').html()=="添加服务地址") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择地址'
 					}]);
 					return;
 				}
-
 				if (!order.bookingTimeStr && product.name !== "双11虹口区日常保洁特价体验") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择上门时间'
 					}]);
 					return;
 				}
-
-
 				var payChannel = 'wx_pub';
 
 				/* 使备注输入框失去焦点，获取值 */
@@ -927,6 +923,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 			dtd.resolve();
 		},
 		afteropen: function (pageData, dtd) {
+			console.log(order.address);
 			/*当用户没有地址时*/
 			var defaultAddress = address.defaultAddress;
 			if (typeof(defaultAddress) == "undefined") {
@@ -936,7 +933,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 			if (typeof(defaultAddress) !== "undefined") {
 				$('.order-username').html(defaultAddress.name);
 				$('.order-mobile').html(defaultAddress.mobile);
-				$('.order-address').html(defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.detail);
+				$('.order-address').html(defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.detail+ defaultAddress.address.poi.name+ defaultAddress.address.poi.uid);
 				$('.order-address').css('text-align', 'right');
 			}
 			var type = pageData.pushData.productType;

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

@@ -47,7 +47,7 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 				back.call(this, event);
 			});
 			/*长期订入口-。.secondary-img/*/
-			/*$.newTouch('.secondary-img', function (event) {
+			$.newTouch('.secondary-img', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
 					hash: 'longOrder',
@@ -56,7 +56,7 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 						backHash: 'secondary'
 					}
 				});
-			}, $view);*/
+			}, $view);
 			/*活动入口*/
 			$.newTouch('.Long-term-set', function (event) {
 				event.preventDefault();