wangcz 7 éve
szülő
commit
2b26a3a9cf

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

@@ -352,6 +352,12 @@ define(['app/app'], function(app) {
 		return function (status) {
 			var result = "";
 			switch(status) {
+                case 503:
+                case 504:
+                case 524:
+                case 525:
+                    result = "该订单还未发货,没有对应的物流信息";
+                    break;
 				case 404:
 				case 520:
 				case 405:

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -917,7 +917,7 @@
 									型号:<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a>
 									<br/>
 									<!--<a  class="unstand" ng-if="!detail.uuid"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a><br/>-->
-									规格:<a><em ng-bind="::detail.spec || '-'" title="{{::detail.spec}}"></em></a><br/>
+									规格:<a class="unstand"><em ng-bind="::detail.spec || '-'" title="{{::detail.spec}}"></em></a><br/>
 								</p>
 							</div>
 						</span>

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

@@ -191,7 +191,6 @@
 	.logistics_list01 .oder_xq{
 		width: 98%;
 		padding: 0;
-		margin-top:-20px;
 	}
 	.logistics ul li p:last-child{
 		font-size: 12px;
@@ -563,8 +562,8 @@
 							<p class="style01">型号:
 								<a ng-bind="detail.cmpCode || '-'" href="store/productDetail/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
-													<p class="style01">规格:
-								<a ng-bind="detail.spec || '-'" title="{{detail.spec}}" target="_blank"></a>
+							<p class="style01">规格:
+								<a ng-bind="detail.spec || '-'" title="{{detail.spec}}" class="unstand"></a>
 							</p>
 												</span>
 							<span class="wd01">交期:
@@ -691,9 +690,6 @@
 				<dl>
 					<dd ng-repeat="info in logisticsInfo"><em></em><span ng-bind="info.AcceptTime"></span><span ng-bind="info.AcceptStation"></span></dd>
 				</dl>
-				<div style="width:100%;text-align: center;" ng-if="logisticsInfo.length == 0">
-					<em style="font-size: 14px; color:#999;line-height: 70px;">系统无法提供此物流信息,请根据物流单号到相应的官网查询。</em>
-				</div>
 			</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>
@@ -701,9 +697,6 @@
 				<!--<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>-->
 			</div>
-			<div style="width:100%;text-align: center;" ng-hide="hasInfo">
-				<em style="font-size: 14px; color:#999;line-height: 70px;">暂无物流信息</em>
-			</div>
 		</div>
 		</div>
 		<!--<div class="logistics_list01">-->

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -590,7 +590,7 @@
 								<a ng-bind="detail.cmpCode || '-'" href="store/productDetail/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01">规格:
-								<a ng-bind="detail.spec || '-'" title="{{detail.spec}}" target="_blank"></a>
+								<a ng-bind="detail.spec || '-'" title="{{detail.spec}}" target="_blank" class="unstand"></a>
 							</p>
 						</span>
 						<span class="wd01">交期:

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1396,7 +1396,7 @@
                                     物料名称:<a href="product/kind/{{::detail.kindUuid}}" target="_blank" ng-if="detail.uuid"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="detail.uuid"/>
                                     <a ng-if="!detail.uuid" class="unstand"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="!detail.uuid"/>
 																	  型号:<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><em ng-bind="detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a><br />
-																		规格:<a><em ng-bind="detail.spec || '-'" title="{{::detail.spec}}"></em></a>
+																		规格:<a class="unstand"><em ng-bind="detail.spec || '-'" title="{{::detail.spec}}"></em></a>
                                 </p>
                             </div>
                         </span>