Browse Source

处理订单详情页面重新排版

wangcz 7 years ago
parent
commit
95c0df796f

+ 3 - 0
src/main/webapp/resources/js/usercenter/controllers/forstore/order_detail_ctrl.js

@@ -13,6 +13,9 @@ define(['app/app'], function(app) {
 
 
     // 获取当前收货单所对应的物品信息
     // 获取当前收货单所对应的物品信息
     function getReceiveInfo() {
     function getReceiveInfo() {
+			if(!$scope.ChooseItem) {
+				return;
+			}
       Order.getSendOrderInfo(
       Order.getSendOrderInfo(
           {id: $scope.order.id, invoiceid: $scope.ChooseItem}, {},
           {id: $scope.order.id, invoiceid: $scope.ChooseItem}, {},
           function (data) {
           function (data) {

+ 14 - 14
src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -483,20 +483,6 @@
 			<div class="log_menu" ng-if="acceptGoods">
 			<div class="log_menu" ng-if="acceptGoods">
 				<span>订单明细</span>
 				<span>订单明细</span>
 			</div>
 			</div>
-			<div class="oder_xq clearfix" ng-if="address && !acceptGoods" style="background: #f8f8f8">
-				<p>
-					<b>收货人:</b>
-					<span ng-bind="address.name">王子鑫</span>
-				</p>
-				<p>
-					<b>收货地址:</b>
-					<span>{{address.area}}&nbsp;{{address.detailAddress}}</span>
-				</p>
-				<p>
-					<b>联系电话:</b>
-					<span ng-bind="address.tel">13526395698</span>
-				</p>
-			</div>
 			<div class="oder_xq_list" style="padding-top: 0;">
 			<div class="oder_xq_list" style="padding-top: 0;">
 				<dl class="clearfix">
 				<dl class="clearfix">
 					<dt>
 					<dt>
@@ -664,6 +650,20 @@
 					</dd>
 					</dd>
 				</dl>
 				</dl>
 			</div>
 			</div>
+			<div class="oder_xq clearfix" ng-if="address && !acceptGoods" style="background: #f8f8f8">
+				<p>
+					<b>收货人:</b>
+					<span ng-bind="address.name">王子鑫</span>
+				</p>
+				<p>
+					<b>收货地址:</b>
+					<span>{{address.area}}&nbsp;{{address.detailAddress}}</span>
+				</p>
+				<p>
+					<b>联系电话:</b>
+					<span ng-bind="address.tel">13526395698</span>
+				</p>
+			</div>
 			<div class="order_btn" ng-if="acceptGoods && orderStatus">
 			<div class="order_btn" ng-if="acceptGoods && orderStatus">
 				<div ng-click="goBack()" style="background:#aaaaaa">取消</div>
 				<div ng-click="goBack()" style="background:#aaaaaa">取消</div>
 				<div ng-click="ensureAccept()" style="background:#5078cb">确认收货</div>
 				<div ng-click="ensureAccept()" style="background:#5078cb">确认收货</div>