Merge remote-tracking branch 'origin/release-201830-wangcz' into release-201830-wangcz

src/main/webapp/resources/js/usercenter/controllers/forstore/order_detail_ctrl.js

@@ -27,7 +27,7 @@ define(['app/app'], function(app) {
 	          } else {
               $scope.orderStatus = false
 	          }
-              $scope.order.status = data.data.status;
+              $scope.order.statuNum = data.data.status;
             var _data = data.data.invoiceDetails
             var _details = $scope.order.orderDetails
 			  $scope.order.logistics = data.data.logistics

src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -682,7 +682,7 @@
 		<div>
 		<div class="logistics_list01" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
 			<div class="log_menu">
-				<span>物流信息<em style="color: #666;" ng-if="!logistics.companyName&& noLogisticInfoArray[order.status]">（暂无物流信息）</em>
+				<span>物流信息<em style="color: #666;" ng-if="!logistics.companyName&& noLogisticInfoArray[order.statuNum]">（暂无物流信息）</em>
 					<b ng-if="logistics.companyName">物流公司：{{logistics.companyName.companyName || logistics.companyName || '空'}}&nbsp;&nbsp;&nbsp;物流单号：{{logistics.number || '空'}}</b>
 				</span>
 			</div>
@@ -691,8 +691,8 @@
 					<dd ng-repeat="info in logisticsInfo"><em></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
 				</dl>
 			</div>
-			<div class="logistics_list_xq" ng-if="!hasInfo&&!noLogisticInfoArray[order.status]">
-				<div ng-if="canShowInfo" style="text-align:center;padding-top:20px;font-size: 14px;">{{order.status | noLogisticFilter}}</div>
+			<div class="logistics_list_xq" ng-if="!hasInfo&&!noLogisticInfoArray[order.statuNum]">
+				<div ng-if="canShowInfo" style="text-align:center;padding-top:20px;font-size: 14px;">{{order.statuNum | noLogisticFilter}}</div>
 				<div ng-if="!canShowInfo" style="text-align:center;padding-top:20px;font-size: 14px; color: #b0b0b0;">系统无法提供此物流信息，请根据物流单号到相应的官网查询。</div>
 				<!--<div ng-if="canShowInfo" style="text-align:center;padding-top:20px;font-size: 14px;">{{order.status | noLogisticFilter}}</div>-->
 				<!--<div ng-if="!canShowInfo" style="text-align:center;padding-top:20px;font-size: 14px;">系统无法提供此物流信息</div>-->