Просмотр исходного кода

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

yujia 7 лет назад
Родитель
Сommit
8a1e192dff

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

@@ -57,7 +57,9 @@ define(['app/app'], function(app) {
                 $scope.logisticsInfo = eval ("(" + response.traces + ")");
                 if($scope.logisticsInfo.length > 0) {
                   $scope.hasInfo = true;
-                }
+                } else {
+                    $scope.hasInfo = false;
+				}
               }
             }, function(err){
               toaster.pop('info', err.data);

+ 5 - 1
src/main/webapp/resources/js/vendor/controllers/forstore/purchase_detail.js

@@ -66,7 +66,9 @@ define(['app/app'], function(app) {
                             $scope.logisticsInfo = eval ("(" + response.traces + ")");
                             if($scope.logisticsInfo.length != 0) {
                                 $scope.hasInfo = true;
-                            }
+                            } else {
+                                $scope.hasInfo = false;
+							}
                         }
                     }, function(err){
                         toaster.pop('info', err.data);
@@ -479,6 +481,8 @@ define(['app/app'], function(app) {
 							$scope.logisticsInfo = eval ("(" + response.traces + ")");
 							if($scope.logisticsInfo.length !=0){
 								$scope.hasInfo = true;
+							} else {
+                                $scope.hasInfo = false;
 							}
 						}
 					}, function(){