安全设置 bug处理

src/main/java/com/uas/platform/b2c/common/account/controller/AuthenticationController.java

@@ -35,7 +35,8 @@ public class AuthenticationController {
 			return null;
 		}
 		List<UserQuestion> userQuestion = userQuestionService.findUserQuestionByUserUUOrderBySortAsc(SystemSession.getUser().getUserUU());
-		UserInfo userInfo = new UserInfo(SystemSession.getUser());
+		User user = userService.findUserByUserUU(SystemSession.getUser().getUserUU());
+		UserInfo userInfo = new UserInfo(user);
 		if(userQuestion!=null){
 			if(userQuestion.size()>0){
 				userInfo.setHaveUserQuestion(true);

src/main/java/com/uas/platform/b2c/common/account/controller/UserController.java

@@ -541,6 +541,7 @@ public class UserController {
 			if(sysUser.getEnterprise()!=null){
 				user.setCurrentEnterprise(sysUser.getEnterprise().getUu());
 			}
+			request.getSession().setAttribute("user", user);
 			SystemSession.setUser(user);
 			assert logger != null;
 			logger.log("用户信息", "提交实名认证信息，UU：" + sysUser.getUserUU());

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -73,7 +73,8 @@ public class UserServiceImpl implements UserService {
         u.setEnable((short) 1);
         u.setUserEmail(user.getSecondUID());
         u.setUserUU(Long.valueOf(user.getDialectUID()));
-
+        u.setPwdSecLevel(user.getPwdSecLevel());
+        u.setLastLoginTime(user.getLastLoginTime());
         Enterprise enterprise = null;
         if(user.getSpaceDialectUID()!=null){
             enterprise = enterpriseDao.findByUu(Long.valueOf(user.getSpaceDialectUID()));

src/main/webapp/resources/css/user/user.css

@@ -4237,4 +4237,11 @@ body {
 }
 .oder_xq_list dl span a{
     color: #333;
+}
+
+/*去掉input自动补全后的黄色样式*/
+input:-webkit-autofill, input:-webkit-autofill:hover, input:-webkit-autofill:focus, input:-webkit-autofill:active {
+    -webkit-transition-delay: 99999s;
+    -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
+    /* -webkit-box-shadow: 0 0 0px 1000px white inset; */
 }

src/main/webapp/resources/css/vendor/sell.css

@@ -5307,4 +5307,11 @@ body {
 .sellOder .oder_list dl dd.line01 span a:hover,
 .ticket_record_list dl dd span a:hover{
     color: #5078cb !important;
-}
+}
+
+/*去掉input自动补全后的黄色样式*/
+input:-webkit-autofill, input:-webkit-autofill:hover, input:-webkit-autofill:focus, input:-webkit-autofill:active {
+    -webkit-transition-delay: 99999s;
+    -webkit-transition: color 99999s ease-out, background-color 99999s ease-out;
+    /* -webkit-box-shadow: 0 0 0px 1000px white inset; */
+}

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

@@ -679,7 +679,7 @@ define(['app/app'], function (app) {
               //toaster.pop('error', '错误', '密码为8-20字符的英文、数字混合');
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = true;
-              return;
+              return false;
             } else {
               $scope.checkSuccess1 = true;
               $scope.checkFailed1 = false;
@@ -696,23 +696,23 @@ define(['app/app'], function (app) {
             $scope.checkFailed1 = false;
             if (newPassword == null) {
               $scope.secLevel = 0;
-              return;
+              return false;
             }
             //不足8位，或仅有数字，或仅有英文
             if (newPassword.length < 8 || /^[0-9]*$/.test(newPassword)
                 || /^[A-Za-z]*$/.test(newPassword)) {
               $scope.secLevel = 1;
-              return;
+              return false;
             }
             if (/^[A-Z0-9]{8,20}$/.test(newPassword) || /^[a-z0-9]{8,20}$/.test(
                     newPassword)) {//达到8位，且 仅有数字+英文小写 或 仅有数字+英文大写
               $scope.secLevel = 2;
-              return;
+              return false;
             }
             if (/^(?=.*[0-9].*)(?=.*[A-Z].*)(?=.*[a-z].*).{8,20}$/.test(
                     newPassword)) {
               $scope.secLevel = 3;
-              return;
+              return false;
             }
           }
 
@@ -724,7 +724,7 @@ define(['app/app'], function (app) {
                     == $scope.user.newPassword1)) {
               $scope.checkSuccess2 = true;
               $scope.checkFailed2 = false;
-              return;
+              return false;
             }
             $scope.checkSuccess2 = false;
             $scope.checkFailed2 = true;
@@ -791,8 +791,8 @@ define(['app/app'], function (app) {
 
   // 修改邮箱Controller
   app.register.controller('UserEmailCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval','$location',
-        function ($scope, $modalInstance, user, User, toaster, $interval,$location) {
+      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($scope, $modalInstance, user, User, toaster, $interval) {
           $scope.user = user;
           $scope.user.userEmail = null;
           $scope.user.newUserEmail = null;
@@ -801,7 +801,7 @@ define(['app/app'], function (app) {
             if (userEmail == null) {
               $scope.checkFailed = true;
               $scope.checkSuccess = false;
-              return;
+              return false;
             }
             $scope.checkSuccess = false;
             $scope.checkFailed = false;
@@ -831,7 +831,7 @@ define(['app/app'], function (app) {
               $scope.checkFailed1 = true;
               $scope.sendSuccess = false;
               $scope.checkFailed1_1 = false;
-              return;
+              return false;
             }
             User.emailEnable({email: newUserEmail}, function (data) {
               if (data.data == "true") {//邮箱可用
@@ -993,7 +993,7 @@ define(['app/app'], function (app) {
               $scope.checkSuccess1 = false;
               $scope.sendSuccess = false;
               $scope.checkFailed1_1 = false;
-              return;
+              return false;
             }
             $scope.checking1 = true;
             $scope.checkSuccess1 = false;
@@ -1052,7 +1052,7 @@ define(['app/app'], function (app) {
             if(!telCheckCode){
               $scope.checkSuccess2 = false;
               $scope.checkFailed2 = true;
-              return;
+              return false;
             }
             User.validTelCheckCode({telCheckCode: telCheckCode,newUserTel:$scope.user.newUserTel},
                 function (data) {
@@ -1079,7 +1079,7 @@ define(['app/app'], function (app) {
               $scope.telEnable($scope.user.newUserTel);
             }
             //验证码校验
-            $scope.validTelCheckCode($scope.checkCode);
+            $scope.validTelCheckCode($scope.telCheckCode);
             if(!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2){
               return;
             }
@@ -1230,7 +1230,7 @@ define(['app/app'], function (app) {
             if (userPay == null) {
               $scope.checkFailed = true;
               $scope.checkSuccess = false;
-              return;
+              return false;
             }
             $scope.checkSuccess = false;
             $scope.checkFailed = false;
@@ -1250,7 +1250,7 @@ define(['app/app'], function (app) {
             if (newUserPay == null) {
               $scope.checkFailed1 = true;
               $scope.checkSuccess1 = false;
-              return;
+              return false;
             }
             //如果两者相同 则返回
             if ($scope.checking && ($scope.user.userPay
@@ -1258,14 +1258,14 @@ define(['app/app'], function (app) {
               toaster.pop('error', '错误', '新密码与原密码相同');
               $scope.checkFailed1 = true;
               $scope.checkSuccess1 = false;
-              return;
+              return false;
             }
             //正则校验
             var reg = /^\d{6}$/;
             if (!reg.test(newUserPay)) {
               $scope.checkFailed1 = true;
               $scope.checkSuccess1 = false;
-              return;
+              return false;
             }
             $scope.checkFailed1 = false;
             $scope.checkSuccess1 = true;
@@ -1286,7 +1286,7 @@ define(['app/app'], function (app) {
                       == $scope.user.newUserPay1)) {
                 $scope.checkSuccess2 = true;
                 $scope.checkFailed2 = false;
-                return;
+                return false;
               }
               $scope.checkSuccess2 = false;
               $scope.checkFailed2 = true;
@@ -1341,8 +1341,8 @@ define(['app/app'], function (app) {
 
   // 设置密保问题Controller
   app.register.controller('UserQuestionCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
+        function ($scope, $modalInstance, user, User, toaster,$timeout) {
           //查询所有的密保问题
           $scope.pageInfo = {page: 1, count: 20};
           User.getAllSecQuestion($scope.pageInfo, function (data) {
@@ -1516,7 +1516,7 @@ define(['app/app'], function (app) {
               $scope.checkFailed1 = true;
               $scope.checkFailed1_1 = false;
               return false;
-            } else if (userIdcode.length != 18) {
+            } else if (!(/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(userIdcode))) {
               //toaster.pop('error', '请输入18位的身份证号');
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = false;

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

@@ -28,7 +28,7 @@ define(['app/app', 'calendar'], function(app) {
       }
 
         //安全级别
-        if(!($scope.userInfo.pwdEnable && ($scope.userInfo.haveUserQuestion || ($scope.userInfo.userEmail==null?false:true)))){
+        if(!($scope.userInfo.pwdEnable && $scope.userInfo.haveUserQuestion && ($scope.userInfo.userEmail==null?false:true))){
           $scope.openHomeCenterModel();
         }
 
@@ -218,7 +218,6 @@ 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);
     $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

@@ -586,7 +586,7 @@ define(['app/app'], function (app) {
               //toaster.pop('error', '错误', '密码为8-20字符的英文、数字混合');
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = true;
-              return;
+              return false;
             } else {
               $scope.checkSuccess1 = true;
               $scope.checkFailed1 = false;
@@ -603,23 +603,23 @@ define(['app/app'], function (app) {
             $scope.checkFailed1 = false;
             if (newPassword == null) {
               $scope.secLevel = 0;
-              return;
+              return false;
             }
             //不足8位，或仅有数字，或仅有英文
             if (newPassword.length < 8 || /^[0-9]*$/.test(newPassword)
                 || /^[A-Za-z]*$/.test(newPassword)) {
               $scope.secLevel = 1;
-              return;
+              return false;
             }
             if (/^[A-Z0-9]{8,20}$/.test(newPassword) || /^[a-z0-9]{8,20}$/.test(
                     newPassword)) {//达到8位，且 仅有数字+英文小写 或 仅有数字+英文大写
               $scope.secLevel = 2;
-              return;
+              return false;
             }
             if (/^(?=.*[0-9].*)(?=.*[A-Z].*)(?=.*[a-z].*).{8,20}$/.test(
                     newPassword)) {
               $scope.secLevel = 3;
-              return;
+              return false;
             }
           }
 
@@ -631,7 +631,7 @@ define(['app/app'], function (app) {
                     == $scope.user.newPassword1)) {
               $scope.checkSuccess2 = true;
               $scope.checkFailed2 = false;
-              return;
+              return false;
             }
             $scope.checkSuccess2 = false;
             $scope.checkFailed2 = true;
@@ -698,8 +698,8 @@ define(['app/app'], function (app) {
 
   // 修改邮箱Controller
   app.register.controller('UserEmailCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval','$location',
-        function ($scope, $modalInstance, user, User, toaster, $interval,$location) {
+      ['$scope', '$modalInstance', 'user', 'User', 'toaster', '$interval',
+        function ($scope, $modalInstance, user, User, toaster, $interval) {
           $scope.user = user;
           $scope.user.userEmail = null;
           $scope.user.newUserEmail = null;
@@ -708,7 +708,7 @@ define(['app/app'], function (app) {
             if (userEmail == null) {
               $scope.checkFailed = true;
               $scope.checkSuccess = false;
-              return;
+              return false;
             }
             $scope.checkSuccess = false;
             $scope.checkFailed = false;
@@ -738,7 +738,7 @@ define(['app/app'], function (app) {
               $scope.checkFailed1 = true;
               $scope.sendSuccess = false;
               $scope.checkFailed1_1 = false;
-              return;
+              return false;
             }
             User.emailEnable({email: newUserEmail}, function (data) {
               if (data.data == "true") {//邮箱可用
@@ -900,7 +900,7 @@ define(['app/app'], function (app) {
               $scope.checkSuccess1 = false;
               $scope.sendSuccess = false;
               $scope.checkFailed1_1 = false;
-              return;
+              return false;
             }
             $scope.checking1 = true;
             $scope.checkSuccess1 = false;
@@ -959,7 +959,7 @@ define(['app/app'], function (app) {
             if(!telCheckCode){
               $scope.checkSuccess2 = false;
               $scope.checkFailed2 = true;
-              return;
+              return false;
             }
             User.validTelCheckCode({telCheckCode: telCheckCode,newUserTel:$scope.user.newUserTel},
                 function (data) {
@@ -986,7 +986,7 @@ define(['app/app'], function (app) {
               $scope.telEnable($scope.user.newUserTel);
             }
             //验证码校验
-            $scope.validTelCheckCode($scope.checkCode);
+            $scope.validTelCheckCode($scope.telCheckCode);
             if(!$scope.checkSuccess || !$scope.checkSuccess1 || !$scope.checkSuccess2){
               return;
             }
@@ -1137,7 +1137,7 @@ define(['app/app'], function (app) {
             if (userPay == null) {
               $scope.checkFailed = true;
               $scope.checkSuccess = false;
-              return;
+              return false;
             }
             $scope.checkSuccess = false;
             $scope.checkFailed = false;
@@ -1157,7 +1157,7 @@ define(['app/app'], function (app) {
             if (newUserPay == null) {
               $scope.checkFailed1 = true;
               $scope.checkSuccess1 = false;
-              return;
+              return false;
             }
             //如果两者相同 则返回
             if ($scope.checking && ($scope.user.userPay
@@ -1165,14 +1165,14 @@ define(['app/app'], function (app) {
               toaster.pop('error', '错误', '新密码与原密码相同');
               $scope.checkFailed1 = true;
               $scope.checkSuccess1 = false;
-              return;
+              return false;
             }
             //正则校验
             var reg = /^\d{6}$/;
             if (!reg.test(newUserPay)) {
               $scope.checkFailed1 = true;
               $scope.checkSuccess1 = false;
-              return;
+              return false;
             }
             $scope.checkFailed1 = false;
             $scope.checkSuccess1 = true;
@@ -1193,7 +1193,7 @@ define(['app/app'], function (app) {
                       == $scope.user.newUserPay1)) {
                 $scope.checkSuccess2 = true;
                 $scope.checkFailed2 = false;
-                return;
+                return false;
               }
               $scope.checkSuccess2 = false;
               $scope.checkFailed2 = true;
@@ -1248,8 +1248,8 @@ define(['app/app'], function (app) {
 
   // 设置密保问题Controller
   app.register.controller('UserQuestionCtrl',
-      ['$scope', '$modalInstance', 'user', 'User', 'toaster',
-        function ($scope, $modalInstance, user, User, toaster) {
+      ['$scope', '$modalInstance', 'user', 'User', 'toaster','$timeout',
+        function ($scope, $modalInstance, user, User, toaster,$timeout) {
           //查询所有的密保问题
           $scope.pageInfo = {page: 1, count: 20};
           User.getAllSecQuestion($scope.pageInfo, function (data) {
@@ -1423,7 +1423,7 @@ define(['app/app'], function (app) {
               $scope.checkFailed1 = true;
               $scope.checkFailed1_1 = false;
               return false;
-            } else if (userIdcode.length != 18) {
+            } else if (!(/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(userIdcode))) {
               //toaster.pop('error', '请输入18位的身份证号');
               $scope.checkSuccess1 = false;
               $scope.checkFailed1 = false;
@@ -1487,6 +1487,7 @@ define(['app/app'], function (app) {
               $scope.checkSuccess = false;
               $scope.checkFailed = false;
               window.location.href = "vendor#/account/management/sec";
+
               window.location.reload();
               $modalInstance.close();
             }, function(response){

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

@@ -53,7 +53,7 @@ define(['app/app', 'calendar'], function(app) {
       }
 
       //安全级别
-      if(!($scope.userInfo.pwdEnable && ($scope.userInfo.haveUserQuestion || ($scope.userInfo.userEmail==null?false:true)))){
+      if(!($scope.userInfo.pwdEnable && $scope.userInfo.haveUserQuestion && $scope.userInfo.userEmail==null?false:true)){
         $scope.openHomeCenterModel();
       }
 

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

@@ -23,30 +23,30 @@
         <div class="user_left fl">
             <a href="user#/home"><p ng-class="{'active' : active == 'home'}"><span>买家中心</span></p></a>
             <ul>
-                <li ng-class="{'active' : active == 'buyer_cart'}"><a href="javascript:void(0)" ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
+                <li ng-class="{'active' : active == 'buyer_cart'}"><a  ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
                 <div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true))">
-                    <li ng-class="{'active' : active == 'buyer_order'}"><a href="javascript:void(0)" ui-sref="buyer_order">订单中心</a></li>
-                    <li ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)" ui-sref="pay_center">支付中心</a></li>
-                    <li ng-class="{'active' : active == 'buyer_invoice'}"><a href="javascript:void(0)" ui-sref="buyer_invoice">发票管理</a></li>
+                    <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">订单中心</a></li>
+                    <li ng-class="{'active' : active == 'pay_center'}"><a  ui-sref="pay_center">支付中心</a></li>
+                    <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_invoice">发票管理</a></li>
                 </div>
                 <div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true)">
-                    <li  ng-class="{'active' : active == 'buyer_order'}"><a ng-disabled="true" href="javascript:void(0)">订单中心</a></li>
-                    <li ng-class="{'active' : active == 'pay_center'}"><a ng-disabled="true" href="javascript:void(0)">支付中心</a></li>
-                    <li ng-class="{'active' : active == 'buyer_invoice'}"><a ng-disabled="true" href="javascript:void(0)">发票管理</a></li>
+                    <li  ng-class="{'active' : active == 'buyer_order'}"><a ng-disabled="true" >订单中心</a></li>
+                    <li ng-class="{'active' : active == 'pay_center'}"><a ng-disabled="true" >支付中心</a></li>
+                    <li ng-class="{'active' : active == 'buyer_invoice'}"><a ng-disabled="true" >发票管理</a></li>
                 </div>
 
 
                 <!--<li ng-class="{'active' : active == 'my_wallet'}" class="undo">-->
-                   <!--<a href="javascript:void(0)" ui-sref="my_wallet">我的钱包</a>-->
+                   <!--<a  ui-sref="my_wallet">我的钱包</a>-->
                 <!--</li>-->
                 <!--<li ng-class="{'active' : active == 'my_seek_purchase'}" class="undo">-->
-                    <!--<a href="javascript:void(0)" ui-sref="my_seek_purchase">我的求购</a>-->
+                    <!--<a  ui-sref="my_seek_purchase">我的求购</a>-->
                 <!--</li>-->
-                <!--<li ng-class="{'active' : active == 'buyer_logistics'}"><a href="javascript:void(0)" ui-sref="buyer_logistics">物流信息</a></li>-->
+                <!--<li ng-class="{'active' : active == 'buyer_logistics'}"><a  ui-sref="buyer_logistics">物流信息</a></li>-->
                 <!--<li ng-class="{'active' : active == 'after_sale'}" class="undo">-->
-                    <!--<a href="javascript:void(0)" ui-sref="after_sale">申请售后</a>-->
+                    <!--<a  ui-sref="after_sale">申请售后</a>-->
                 <!--</li>-->
-                <li ng-class="{'active' : active == 'account_manager'}"><a href="javascript:void(0)" ui-sref="account_manager">账户管理</a></li>
+                <li ng-class="{'active' : active == 'account_manager'}"><a  ui-sref="account_manager">账户管理</a></li>
             </ul>
         </div>
     </div>

src/main/webapp/resources/view/usercenter/modal/homeCenter_modal.html

@@ -24,8 +24,9 @@
         padding: 27px 20px;
         line-height: 20px;
     }
-    .modal-body a {
+    .modal-body span {
         color: #e83825;
+        cursor: pointer;
     }
     .modal-body .mall-btn-default {
         height: 28px;
@@ -48,9 +49,9 @@
        <!-- <i class="glyphicon glyphicon-remove" ng-click="cancel()"></i>-->
     </div>
     <div class="modal-body">
-        你的账户的安全等级过低，请 <a ng-show="!userInfo.pwdEnable" ng-click="goLink('pwd')">修改密码</a>
-        <a ng-show="!userInfo.haveUserQuestion" ng-click="goLink('question')">,设置密保问题</a>
-        <a  ng-show="!(userInfo.userEmail==null?false:true)" ng-click="goLink('email')">,绑定邮箱</a>
+        你的账户的安全等级过低，请 <span ng-hide="userInfo.pwdEnable" ng-click="goLink('pwd')"> 修改密码 </span>
+        <span ng-hide="userInfo.haveUserQuestion" ng-click="goLink('question')"> 设置密保问题 </span>
+        <span  ng-hide="userInfo.userEmail" ng-click="goLink('email')"> 绑定邮箱 </span>
         来保障您的账户安全！
         <a class="mall-btn-default" ng-click="goLink('sec')" >立即前往</a>
     </div>

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

@@ -19,72 +19,72 @@
 	}
 </style>
 <div id="vendor_left_bar" class="user_left fl" ng-controller="VendorMenuCtrl">
-	<a href="javascript:void(0)" ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></a>
+	<a  ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></a>
 	<ul>
 		<div ng-hide="!(userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true))">
-		<li ng-class="{'active' : active == 'vendor_order'}"><a href="javascript:void(0)" ui-sref="vendor_order">订单中心</a></li>
+		<li ng-class="{'active' : active == 'vendor_order'}"><a  ui-sref="vendor_order">订单中心</a></li>
 		<li ng-class="{'active' : active == 'vendor_logistics'}">
-			<a href="javascript:void(0)" ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</a>
-			<a href="javascript:void(0)" ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</a>
+			<a  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</a>
+			<a  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</a>
 		</li>
-		<li ng-class="{'active' : active == 'vendor_invoice'}"><a href="javascript:void(0)" ui-sref="vendorInvoice">发票管理</a></li>
-	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ui-sref="vendor_logistics">物流管理</a></li>-->
-		<li ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)" ui-sref="pay_center">结算中心</a></li>
-		<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a href="javascript:void(0)" ui-sref="vendor_brand_apply">品牌申请</a></li>
-		<li ng-class="{'active' : active == 'vendor_component_apply'}"><a href="javascript:void(0)" ui-sref="vendor_component_apply">器件申请</a></li>
-	<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)" ui-sref="vendor_productOn">产品导入</a></li>-->
-		<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)" ui-sref="vendor_upload">产品导入</a></li>
-		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a href="javascript:void(0)" ui-sref="vendor_repository">仓库管理</a></li>-->
-		<li ng-class="{'active' : active == 'vendor_material'}"><a href="javascript:void(0)" ui-sref="vendor_material">产品管理</a></li>
+		<li ng-class="{'active' : active == 'vendor_invoice'}"><a  ui-sref="vendorInvoice">发票管理</a></li>
+	<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><a  ui-sref="vendor_logistics">物流管理</a></li>-->
+		<li ng-class="{'active' : active == 'pay_center'}"><a  ui-sref="pay_center">结算中心</a></li>
+		<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a  ui-sref="vendor_brand_apply">品牌申请</a></li>
+		<li ng-class="{'active' : active == 'vendor_component_apply'}"><a  ui-sref="vendor_component_apply">器件申请</a></li>
+	<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><a  ui-sref="vendor_productOn">产品导入</a></li>-->
+		<li ng-class="{'active' : active == 'vendor_productOn'}"><a  ui-sref="vendor_upload">产品导入</a></li>
+		<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a  ui-sref="vendor_repository">仓库管理</a></li>-->
+		<li ng-class="{'active' : active == 'vendor_material'}"><a  ui-sref="vendor_material">产品管理</a></li>
 		<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
-		<!--&lt;!&ndash;<a href="javascript:void(0)" ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
+		<!--&lt;!&ndash;<a  ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
 		<!--售后处理-->
 		<!--</li>-->
-		<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><a href="javascript:void(0)" ui-sref="vendor_manufacture">原厂认证</a></li>-->
+		<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><a  ui-sref="vendor_manufacture">原厂认证</a></li>-->
 		<li ng-class="{'active' : active == 'vendor_store'}">
 			<!-- 我要开店 !store && applyStatus == 'NONE' -->
-			<a href="javascript:void(0)" ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</a>
+			<a  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</a>
 			<!-- 店铺申请中 !store && applyStatus == 'PREPARE' -->
-			<a href="javascript:void(0)" ui-sref="vendor_store_wait" ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
+			<a  ui-sref="vendor_store_wait" ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
 			<!-- 我的店铺 !store && applyStatus == 'PASS' -->
-			<a href="javascript:void(0)" ui-sref="vendor_store_info" ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
+			<a  ui-sref="vendor_store_info" ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
 			<!-- 我的店铺 store -->
-			<a href="javascript:void(0)" ui-sref="vendor_store_maintain" ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
+			<a  ui-sref="vendor_store_maintain" ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
 			<!-- 我的店铺申述 store -->
-			<a href="javascript:void(0)" ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
+			<a  ui-sref="vendor_store_maintain" ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
 		</li>
 		</div>
 		<div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true)">
-			<li ng-class="{'active' : active == 'vendor_order'}"><a href="javascript:void(0)" ng-disabled="true">订单中心</a></li>
-			<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ng-disabled="true">物流管理</a></li>
-			<li ng-class="{'active' : active == 'vendor_invoice'}"><a href="javascript:void(0)" ng-disabled="true" >发票管理</a></li>
-			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><a href="javascript:void(0)" ui-sref="vendor_logistics">物流管理</a></li>-->
-			<li ng-class="{'active' : active == 'pay_center'}"><a href="javascript:void(0)"  ng-disabled="true" >结算中心</a></li>
-			<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a href="javascript:void(0)"  ng-disabled="true" >品牌申请</a></li>
-			<li ng-class="{'active' : active == 'vendor_component_apply'}"><a href="javascript:void(0)"  ng-disabled="true" >器件申请</a></li>
-			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)" ui-sref="vendor_productOn">产品导入</a></li>-->
-			<li ng-class="{'active' : active == 'vendor_productOn'}"><a href="javascript:void(0)"  ng-disabled="true" >产品导入</a></li>
-			<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a href="javascript:void(0)" ui-sref="vendor_repository">仓库管理</a></li>-->
-			<li ng-class="{'active' : active == 'vendor_material'}"><a href="javascript:void(0)"  ng-disabled="true" >产品管理</a></li>
+			<li ng-class="{'active' : active == 'vendor_order'}"><a  ng-disabled="true">订单中心</a></li>
+			<li ng-class="{'active' : active == 'vendor_logistics'}"><a  ng-disabled="true">物流管理</a></li>
+			<li ng-class="{'active' : active == 'vendor_invoice'}"><a  ng-disabled="true" >发票管理</a></li>
+			<!--	<li ng-class="{'active' : active == 'vendor_logistics'}"><a  ui-sref="vendor_logistics">物流管理</a></li>-->
+			<li ng-class="{'active' : active == 'pay_center'}"><a   ng-disabled="true" >结算中心</a></li>
+			<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a   ng-disabled="true" >品牌申请</a></li>
+			<li ng-class="{'active' : active == 'vendor_component_apply'}"><a   ng-disabled="true" >器件申请</a></li>
+			<!--	<li ng-class="{'active' : active == 'vendor_productOn'}"><a  ui-sref="vendor_productOn">产品导入</a></li>-->
+			<li ng-class="{'active' : active == 'vendor_productOn'}"><a   ng-disabled="true" >产品导入</a></li>
+			<!--<li ng-class="{'active' : active == 'vendor_repository'}"><a  ui-sref="vendor_repository">仓库管理</a></li>-->
+			<li ng-class="{'active' : active == 'vendor_material'}"><a   ng-disabled="true" >产品管理</a></li>
 			<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
-			<!--&lt;!&ndash;<a href="javascript:void(0)" ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
+			<!--&lt;!&ndash;<a  ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
 			<!--售后处理-->
 			<!--</li>-->
-			<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><a href="javascript:void(0)" ui-sref="vendor_manufacture">原厂认证</a></li>-->
+			<!--<li ng-class="{'active' : active == 'vendor_manufacture'}"><a  ui-sref="vendor_manufacture">原厂认证</a></li>-->
 			<li ng-class="{'active' : active == 'vendor_store'}">
 				<!-- 我要开店 !store && applyStatus == 'NONE' -->
-				<a href="javascript:void(0)" ng-disabled="true"  ng-if="!store && applyStatus == 'NONE'">开店申请</a>
+				<a  ng-disabled="true"  ng-if="!store && applyStatus == 'NONE'">开店申请</a>
 				<!-- 店铺申请中 !store && applyStatus == 'PREPARE' -->
-				<a href="javascript:void(0)" ng-disabled="true"  ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
+				<a  ng-disabled="true"  ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
 				<!-- 我的店铺 !store && applyStatus == 'PASS' -->
-				<a href="javascript:void(0)" ng-disabled="true"  ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
+				<a  ng-disabled="true"  ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
 				<!-- 我的店铺 store -->
-				<a href="javascript:void(0)" ng-disabled="true"  ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
+				<a  ng-disabled="true"  ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
 				<!-- 我的店铺申述 store -->
-				<a href="javascript:void(0)" ng-disabled="true"  ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
+				<a  ng-disabled="true"  ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
 			</li>
 
 		</div>
-		<li ng-class="{'active' : active == 'vendor_account_management'}"><a href="javascript:void(0)" ui-sref="vendor_account_management">账户管理</a></li>
+		<li ng-class="{'active' : active == 'vendor_account_management'}"><a  ui-sref="vendor_account_management">账户管理</a></li>
 	</ul>
 </div>

src/main/webapp/resources/view/vendor/modal/updateUserQuestion.html

@@ -80,9 +80,6 @@
             <label class="col-md-3 col-sm-3 col text-right">问题1：</label>
             <div class="col-md-8 col-sm-8 col">
                 <input ng-model="uq[0].id" type="hidden"/>
-                <!--
-                <input ng-model="uq[0].question" class="form-control input-sm" name="uq[0].question" required>
-                -->
                 <select class="form-control" style="opacity: unset;"  ng-blur="choose()"   ng-model="uq[0].question">
                     <option value="">请选择一个问题</option>
                     <option value="{{info.question}}" ng-repeat="info in secQuestions" ng-if="info.type==1">{{info.question}}</option>
@@ -97,7 +94,7 @@
         <div class="row">
             <label class="col-md-3 col-sm-3 col text-right">答案：</label>
             <div class="col-md-8 col-sm-8 col">
-                <input ng-model="uq[0].answer" ng-blur="inputAnswer()"  class="form-control input-sm" name="uq[0].answer" required>
+                <input ng-model="uq[0].answer" ng-blur="inputAnswer()"  class="form-control input-sm" name="uq[0].answer">
                 <!-- <div>密码复杂度</div> -->
             </div>
             <div class="col">
@@ -113,9 +110,6 @@
             <label class="col-md-3 col-sm-3 col text-right">问题2：</label>
             <div class="col-md-8 col-sm-8 col">
                 <input ng-model="uq[1].id" type="hidden"/>
-                <!--
-                <input ng-model="uq[1].question"  class="form-control input-sm" name="uq[1].question" required>
-                -->
                 <select class="form-control" ng-blur="choose1()"  style="opacity: unset;"  ng-model="uq[1].question">
                     <option value="">请选择一个问题</option>
                     <option value="{{info.question}}" ng-repeat="info in secQuestions" ng-if="info.type==2">{{info.question}}</option>
@@ -130,7 +124,7 @@
         <div class="row">
             <label class="col-md-3 col-sm-3 col text-right">答案：</label>
             <div class="col-md-8 col-sm-8 col">
-                <input  ng-model="uq[1].answer" ng-blur="inputAnswer1()" class="form-control input-sm" name="uq[1].answer" required>
+                <input  ng-model="uq[1].answer" ng-blur="inputAnswer1()" class="form-control input-sm" name="uq[1].answer">
                 <!-- <div>密码复杂度</div> -->
             </div>
             <div class="col">