修复 跳转问题

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -99,13 +99,13 @@ define([ 'app/app' ], function(app) {
 			$scope.switchto = function(enUU) {
 				AuthenticationService.reSignin(enUU).success(function(){
 					//$window.location.reload();
-					if (!enUU || enUU == '0'){
+					/*if (!enUU || enUU == '0'){
 						var now = window.location.href.toString();
 						if (now.indexOf('vendor') > -1){
                             location.href = './register-saler';
                             return;
 						}
-					}
+					}*/
                     location.href = './';
 				});
 			};

src/main/webapp/resources/js/vendor/app.js

@@ -910,8 +910,8 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
 	/**
 	 * 卖家中心菜单控制器
 	 */
-	app.controller('VendorMenuCtrl', ['$scope', 'StoreInfo','$rootScope', function ($scope, StoreInfo,$rootScope) {
-        //是寄售店铺
+	app.controller('VendorMenuCtrl', ['$scope', 'StoreInfo','$rootScope', function ($scope, StoreInfo, $rootScope) {
+       /* //是寄售店铺
         $scope.isCONSIGNMENT = false;
 
         StoreInfo.findShopOwnerApplyByNormalStatus({}, {}, function (result) {
@@ -921,7 +921,7 @@ define([ 'angularAMD', 'ngLocal', 'common/services', 'common/directives', 'commo
             $scope.isCONSIGNMENT = true;
        		 }}, function (error) {
 
-        });
+        });*/
 	}]);
 
 

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_logistics_ctrl.js

@@ -11,7 +11,12 @@ define(['app/app', 'calendar'], function (app) {
 		$scope.tab = 'logistic';
 		$scope.canAddTotal = 20;
         //是寄售店铺
-        $scope.isCONSIGNMENT = false;
+		if ($rootScope.store && (!$rootScope.store.status || $rootScope.store.status === 'OPENED')){
+            $scope.isCONSIGNMENT = false;
+		}else {
+            $scope.isCONSIGNMENT = true;
+		}
+       /* $scope.isCONSIGNMENT = false;
         StoreInfo.findShopOwnerApplyByNormalStatus({}, {}, function (result) {
             if (!result.data) {
                 $scope.isCONSIGNMENT = true;
@@ -20,7 +25,7 @@ define(['app/app', 'calendar'], function (app) {
                 $scope.isCONSIGNMENT = true;
             }}, function (error) {
 
-        });
+        });*/
 		$scope.addressEx = {};
 
 		//地址的条数是否超过5条