默认地址选择问题

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

@@ -896,16 +896,31 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 				$('.product-pic-o2o').css('display', 'none');
 				/*当用户没有地址时*/
 				var defaultAddress = address.defaultAddress;
-				if (typeof(defaultAddress) == "undefined" || typeof(address.defaultAddress.length) == "undefined") {//登陆与未登录  默认地址判断
+				/*未登录*/
+				if (user.id.length == 0) {
 					$('.order-mobile').html('添加服务地址');
-					return;
-				} else if (typeof(address.defaultAddress) !== "undefined" && typeof(defaultAddress.address) !== "undefined") {
+				} else if (user.id.length != 0 && typeof(defaultAddress) !== "undefined") {
+					console.log("已登录（有地址）");
 					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);
-					$('.order-address').css('text-align', 'right');
+					$('.order-address').html(defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.detail).css('text-align', 'right');
+				} else if (user.id.length != 0 && typeof(defaultAddress) == "undefined") {
+					$('.order-mobile').html('添加服务地址');
 				}
+				/*已登录（有地址）*/
+				/*已登录（无地址）*/
+				// if (typeof(defaultAddress) == "undefined" || typeof(address.defaultAddress.length) == "undefined") {//登陆与未登录  默认地址判断
+				// 	$('.order-mobile').html('添加服务地址');
+				// }
+				// if (typeof(defaultAddress) !== "undefined") {
+				// 	console.log();
+				// 	console.log('测试');
+				// 	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).css('text-align', 'right');
+				// }
 			}, 500);
 			var $view = this;
 			var pushData = pageData.pushData;