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

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

@@ -16,6 +16,8 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 	var product;
 	var backHash;
 
+	var orderID = order.id;
+
 	/* 软键盘弹出与消失时布局变动。 */
 	function checkScroll(pageData, callback) {
 		if (pageData.scroll) {
@@ -821,7 +823,8 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 						});
 						user.orderCoupons = newCouponList;
 
-						var orderID = order.id;
+
+
 						order.reset();
 						$('.booking-time', $view).html('请选择');
 						if (res.data.status == 1) {
@@ -931,9 +934,10 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 			}
 			/*当用户有地址时*/
 			if (typeof(defaultAddress) !== "undefined") {
+				orderID=order.address.address_id;
 				$('.order-username').html(defaultAddress.name);
 				$('.order-mobile').html(defaultAddress.mobile);
-				$('.order-address').html(defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.detail+ defaultAddress.address.poi.name+ defaultAddress.address.poi.uid);
+				$('.order-address').html(defaultAddress.address.city + defaultAddress.address.area + defaultAddress.address.detail+ defaultAddress.address.poi.name+ defaultAddress.address.detail);
 				$('.order-address').css('text-align', 'right');
 			}
 			var type = pageData.pushData.productType;