Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -19,6 +19,7 @@ define(['app/app'], function (app) {
           // $scope.userInfo.userEmail = null;
           $scope.userInfoBackup = angular.copy($scope.userInfo);
           $scope.canAddTotal = 20;
+
           //手机号和邮箱号的部分隐藏
           if($scope.userInfo.userTel){
             $scope.userInfo.userTel = $scope.userInfo.userTel.substr(0, 3)
@@ -439,10 +440,11 @@ define(['app/app'], function (app) {
 				}
 			});
 
-            modalInstance.result.then(function () {
-            }, function () {
-            });
-          };
+			modalInstance.result.then(function () {
+				window.location.href = "user#/accountManager/sec";
+			}, function () {
+			});
+		};
 
           $scope.updateUserEmail = function () {
             var modalInstance = $modal.open({
@@ -458,6 +460,7 @@ define(['app/app'], function (app) {
             });
 
             modalInstance.result.then(function () {
+              window.location.href = "user#/accountManager/sec";
             }, function () {
             });
           };
@@ -512,6 +515,7 @@ define(['app/app'], function (app) {
             });
 
             modalInstance.result.then(function () {
+              window.location.href = "user#/accountManager/sec";
             }, function () {
             });
           };
@@ -554,8 +558,12 @@ define(['app/app'], function (app) {
 
   // 修改密码Controller
   app.register.controller('PasswordCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
-        function ($scope, $modalInstance, user, User, toaster,$state) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster,$state) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           $scope.user = user;
           $scope.checking = false;
           $scope.showPassword = false;
@@ -774,8 +782,12 @@ define(['app/app'], function (app) {
 
   // 修改邮箱Controller
   app.register.controller('UserEmailCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster, $interval) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           User.getPageToken();
           $scope.user = user;
           $scope.user.userEmail = null;
@@ -941,10 +953,14 @@ define(['app/app'], function (app) {
           };
         }]);
 
-  //手机验证Controller
+  // 手机验证Controller
   app.register.controller('UserTelCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster, $interval) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           User.getPageToken();
           $scope.user = user;
           $scope.user.userTel = null;
@@ -1106,8 +1122,12 @@ define(['app/app'], function (app) {
 
   // 设置支付密码Controller
   app.register.controller('UserPayCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           //原密码框是否显示
           $scope.user = angular.copy(user);
           $scope.checking = true;
@@ -1325,8 +1345,12 @@ define(['app/app'], function (app) {
 
   // 设置密保问题Controller
   app.register.controller('UserQuestionCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
-        function ($scope, $modalInstance, user, User, toaster,$timeout) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster,$timeout) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           //查询所有的密保问题
           $scope.pageInfo = {page: 1, count: 20};
           User.getAllSecQuestion($scope.pageInfo, function (data) {
@@ -1449,8 +1473,12 @@ define(['app/app'], function (app) {
 
   // 实名认证Controller
   app.register.controller('UserRealAuthCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           $scope.user = user;
           //姓名验证  不超过20个字符
           $scope.checkSuccess = false;

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

@@ -217,7 +217,12 @@ define(['app/app', 'calendar'], function(app) {
             height: 220
         });
     }]);
-  app.register.controller('homeModalCtrl', ['$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($scope, $modalInstance, toaster, $http, ShippingAddress,$state){
+    
+  app.register.controller('homeModalCtrl', ['$rootScope', '$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($rootScope, $scope, $modalInstance, toaster, $http, ShippingAddress,$state){
+    $rootScope.$on('$stateChangeStart',
+        function(event, toState, toParams, fromState, fromParams){
+          $modalInstance.dismiss();
+    })
     $scope.goLink = function(op){
       $state.go('account_manager',{op:op});
       $modalInstance.dismiss('cancel');

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

@@ -309,8 +309,8 @@ define(['app/app'], function(app) {
                 }
               }
             });
-
             modalInstance.result.then(function () {
+              window.location.href = "vendor#/account/management/sec";
             }, function () {
             });
           };
@@ -326,6 +326,7 @@ define(['app/app'], function(app) {
             });
 
             modalInstance.result.then(function(){
+              window.location.href = "vendor#/account/management/sec";
             }, function(){
             });
           };
@@ -371,6 +372,7 @@ define(['app/app'], function(app) {
             });
 
             modalInstance.result.then(function(){
+              window.location.href = "vendor#/account/management/sec";
             }, function(){
             });
           };
@@ -495,8 +497,12 @@ define(['app/app'], function(app) {
 
   // 修改密码Controller
   app.register.controller('PasswordCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
-        function ($scope, $modalInstance, user, User, toaster,$state) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster','$state',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster,$state) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           $scope.user = user;
           $scope.checking = false;
           $scope.showPassword = false;
@@ -715,8 +721,12 @@ define(['app/app'], function(app) {
 
   // 修改邮箱Controller
   app.register.controller('UserEmailCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster, $interval) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           User.getPageToken();
           $scope.user = user;
           $scope.user.userEmail = null;
@@ -884,8 +894,12 @@ define(['app/app'], function(app) {
 
   //手机验证Controller
   app.register.controller('UserTelCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
-        function ($scope, $modalInstance, user, User, toaster, $interval) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster, $interval) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           User.getPageToken();
           $scope.user = user;
           $scope.user.userTel = null;
@@ -1047,8 +1061,12 @@ define(['app/app'], function(app) {
 
   // 设置支付密码Controller
   app.register.controller('UserPayCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           //原密码框是否显示
           $scope.user = angular.copy(user);
           $scope.checking = true;
@@ -1266,8 +1284,12 @@ define(['app/app'], function(app) {
 
   // 设置密保问题Controller
   app.register.controller('UserQuestionCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
-        function ($scope, $modalInstance, user, User, toaster,$timeout) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster,$timeout) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           //查询所有的密保问题
           $scope.pageInfo = {page: 1, count: 20};
           User.getAllSecQuestion($scope.pageInfo, function (data) {
@@ -1390,8 +1412,12 @@ define(['app/app'], function(app) {
 
   // 实名认证Controller
   app.register.controller('UserRealAuthCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$rootScope', '$scope', '$modalInstance', 'user', 'User', 'toaster',
+        function ($rootScope, $scope, $modalInstance, user, User, toaster) {
+          $rootScope.$on('$stateChangeStart',
+              function(event, toState, toParams, fromState, fromParams){
+                $modalInstance.dismiss();
+          })
           $scope.user = user;
           //姓名验证  不超过20个字符
           $scope.checkSuccess = false;

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

@@ -90,8 +90,11 @@ define(['app/app', 'calendar'], function(app) {
 
     }]);
 
-    app.register.controller('homeModalCtrl', ['$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($scope, $modalInstance, toaster, $http, ShippingAddress,$state){
-        console.info($scope.userInfo);
+    app.register.controller('homeModalCtrl', ['$rootScope', '$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($rootScope, $scope, $modalInstance, toaster, $http, ShippingAddress,$state){
+        $rootScope.$on('$stateChangeStart',
+          function(event, toState, toParams, fromState, fromParams){
+            $modalInstance.dismiss();
+        })
         $scope.goLink = function(op) {
             $state.go('vendor_account_management',{op:op});
             $modalInstance.dismiss('cancel');

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

@@ -33,7 +33,7 @@
                     <dt><img src="static/img/user/images/user_photo.png" /></dt>
                     <dd>
                         <span ng-cloak ng-bind="userInfo.userName" class="user" title="{{userInfo.userName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
-                        <span ng-cloak ng-bind="'|&nbsp;' + userInfo.enterprise.enName || '个人账户'" class="enName" title="{{userInfo.enterprise.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                        <span ng-cloak ng-bind="'|&nbsp;' + (userInfo.enterprise.enName || '个人账户')" class="enName" title="{{userInfo.enterprise.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
                         <a ui-sref="account_manager" href="#/accountManager/">账户设置&nbsp;》</a>
                     </dd>
                 </dl>

src/main/webapp/resources/view/vendor/forstore/vendor_index.html

@@ -37,7 +37,7 @@
                 <dt><img src="static/img/vendor/images/user_photo.png" /></dt>
                 <dd>
                     <span ng-bind="userInfo.userName" class="user" title="{{userInfo.userName}}"><br/><!--<em>账户余额：￥68899.99</em>--></span>
-                    <span ng-bind="'|&nbsp;' + vendor.enName || '个人账户'" class="enName" title="{{vendor.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                    <span ng-bind="'|&nbsp;' + (vendor.enName || '个人账户')" class="enName" title="{{vendor.enName}}"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
                     <a ui-sref="vendor_account_management" href="#/account/management/">账户设置&nbsp;》</a>
                     <!--<p><img src="static/img/vendor/images/sell_grade.png"/>专有服务：******</p>-->
                 </dd>

src/main/webapp/resources/view/vendor/left_nav.html

@@ -1,10 +1,10 @@
 <style>
-	#vendor_left_bar.user_left a, span {
+	#vendor_left_bar.user_left a {
 		font-size: 1.1em;
-		cursor: pointer;
 	}
 	#vendor_left_bar.user_left p {
 		text-align: center;
+		cursor: pointer;
 	}
 	#vendor_left_bar.user_left p span {
 		margin-left: 0;
@@ -34,6 +34,7 @@
 		width: 100%;
 		display: inline-block;
 		height: 50px;
+		cursor: pointer;
 	}
 	.user_content .user_left ul li.active span, .user_content .user_left ul li:hover span {
 		color: #fff;