address

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

@@ -768,30 +768,20 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 					}]);
 					return;
 				}
-				order.address.address_id= order.address.address_id;
-				// console.log(order.address);
-				// return false;
+				console.log(order.address);
 				if (!order.address) {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择地址'
 					}]);
 					return;
-				}else {
-					console.log("失败");
-					return;
 				}
-
-
 				if (!order.bookingTimeStr && product.name !== "双11虹口区日常保洁特价体验") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择上门时间'
 					}]);
 					return;
 				}
-
-
 				var payChannel = 'wx_pub';
-
 				/* 使备注输入框失去焦点，获取值 */
 				$('.order-memo', $view).blur();
 				order.set('memo', $('.order-memo', $view).val());
@@ -928,8 +918,9 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 			if (typeof(defaultAddress) == "undefined") {
 				$('.order-mobile').html('添加服务地址');
 			}
-			/*当用户有地址时*/
+			/*当用户有默认地址时*/
 			if (typeof(defaultAddress) !== "undefined") {
+				order.address=address.defaultAddress;
 				$('.order-username').html(defaultAddress.name);
 				$('.order-mobile').html(defaultAddress.mobile);
 				$('.order-address').html(defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.detail);