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

src/main/webapp/resources/js/common/services.js

@@ -160,7 +160,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
                     } else if (this.getRootPath().indexOf('b2c.usoftchina.com') > -1 || this.getRootPath().indexOf('mall.usoftchina.com') > -1) {
                         $rootScope.b2bUrl = 'https://b2b.usoftchina.com/UBTOB'
 					} else {
-                        $rootScope.b2bUrl = 'http://10.1.51.125:8090/platform-b2b/UBTOB'
+                        $rootScope.b2bUrl = 'http://10.1.51.101:8090/platform-b2b/UBTOB'
 					}
 				}
 				return $rootScope.b2bUrl;

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

@@ -42,7 +42,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'commo
 			controller: 'securitySetCtrl',
 			controllerUrl: 'app/controllers/securitySetCtrl'
 		})).state('ssoManagement', angularAMD.route({
-			url: '/management',
+			url: '/management?tab',
 			templateUrl: 'static/view/sso/staffManagement.html',
             title: '员工管理',
 			controller: 'staffManagementCtrl',

src/main/webapp/resources/js/sso/controllers/forstore/ssoCenterCtrl.js

@@ -53,6 +53,10 @@ define(['app/app', 'calendar'], function(app) {
 
         }
 
+        $scope.findMore = function () {
+            window.location.href = '/sso#/management?tab=bind';
+        }
+
         $scope.updateUserEmail = function(){
             AuthenticationService.redirectEmail();
         };

src/main/webapp/resources/js/sso/controllers/staffManagementCtrl.js

@@ -7,7 +7,7 @@ define(['app/app'], function (app) {
     app.register.controller('staffManagementCtrl', ['$scope', '$rootScope', 'Enterprise', 'User', 'toaster', '$modal', 'BaseService', 'ngTableParams', '$http', 'AuthenticationService', '$stateParams','AccountResource','AccountRole', 'Authority', 'B2bUser', 'B2bCurrentRole', function ($scope, $rootScope, Enterprise, User, toaster, $modal, BaseService, ngTableParams, $http, AuthenticationService, $stateParams, AccountResource, AccountRole, Authority, B2bUser, B2bCurrentRole) {
         $rootScope.active = 'sso_management';
         document.title = '员工管理-帐户中心';
-        $scope.tab = 'auth';
+        $scope.tab = $stateParams.tab ? $stateParams.tab : 'auth';
         $scope.addingUser = false;
         $scope.setAddingUser = function (status) {
             $scope.addingUser = status;

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

@@ -65,8 +65,7 @@ define(['app/app', 'calendar'], function(app) {
         // applyToEnterpriseTableParams();
 
         $scope.findMore = function () {
-            window.location.href = '/sso#/management';
-            $rootScope.tab = 'bind';
+            window.location.href = '/sso#/management?tab=bind';
         }
 
         $scope.toAccount = function(){

src/main/webapp/resources/view/sso/forstore/ssoCenter.html

@@ -32,7 +32,7 @@
         margin:0;
     }
     .seller_data dl dd{
-        padding-top:40px;
+        padding:20px 0;
     }
     .seller_data dl dd span{
         margin:0;