账户管理-安全设置调整

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

@@ -1737,6 +1737,12 @@ define([ 'app/app' ], function(app) {
 		};
 	}]);
 
+  /**
+   * 左侧导航栏控制器
+   */
+	app.controller('leftNavCtrl', ["$scope", function($scope){
+
+  }]);
 	var getOriginalData = function(data) {
 		var result = {};
 		if(data&&data.length) {

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

@@ -7,6 +7,7 @@ define(['app/app', 'calendar'], function(app) {
         $rootScope.active = 'home';
         document.title='买家中心-优软商城';
         $scope.userInfo = $rootScope.userInfo;
+      $scope.userInfo.pwdEnable=false;
         var getRecommendComps = function (userUU, usedFor, pageable) {
             Recommendation.getRecommendComps({page: pageable.page, size: pageable.size}, function (data) {
                 $scope.recommendComps = data.content;
@@ -216,7 +217,6 @@ define(['app/app', 'calendar'], function(app) {
             width: 270,
             height: 220
         });
-
     }]);
   app.register.controller('homeModalCtrl', ['$scope',  '$modalInstance', 'toaster', '$http', 'ShippingAddress','$state', function($scope, $modalInstance, toaster, $http, ShippingAddress,$state){
     $scope.goLink = function(op){

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

@@ -205,7 +205,9 @@
 	</div>
 	<!--您的安全服务-->
 	<div class="count01 clearfix" ng-if="tab=='safe'">
-		<div class="rt_menu"><span>您的安全服务</span></div>
+		<div class="rt_menu"><span>您的安全服务</span>
+      <span class="last-login pull-right">上次登录时间：<span>{{userInfo.lastLoginTime | date:'yyyy-MM-dd HH:mm:ss'}} </span></span>
+    </div>
 		<ul>
 			<li class="safe-level">
 				<span>安全等级：
@@ -217,19 +219,12 @@
 					<i ng-if="userInfo.secLevel==5 || userInfo.secLevel==6">强</i>
 					<!--完成<a href="javascript:void(0)"> 密保设置</a>，提升账户安全。-->
 				</span>
-				<div class="last-login">上次登录时间：<span>{{userInfo.lastLoginTime | date:'yyyy-MM-dd HH:mm:ss'}} </span></div>
-			</li>
-			<li ng-switch="userInfo.idEnable">
-				<span>
-					<h5 ng-switch-when="1"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
-					<h5 ng-switch-when="0"><img src="static/img/user/images/safe.png"/></h5>
-					<h5 ng-switch-when="2"><img src="static/img/user/images/safe.png"/></h5>
-					<font>实名认证：</font>
-					<span>实名认证后，可通过实名信息找回支付密码、修改手机号等，提高账户安全性。</span>
-				</span>
-					<a ng-switch-when="0" ng-click="updateRealAuth()" class="mall-btn-default">立即设置</a>
-					<a ng-switch-when="1">审核通过</a>
-					<a ng-switch-when="2">待审核</a>
+        <span ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && (userInfo.userEmail==null?false:true)">
+          你的账户的安全等级过低，请 <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>
+          来保障您的账户安全！
+        </span>
 			</li>
 			<li>
 				<span>
@@ -251,14 +246,6 @@
 				<a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()" class="mall-btn-default">立即设置</a>
 				<a ng-show="userInfo.haveUserQuestion" ng-click="updateUserQuestion()">修改</a>
 			</li>
-			<li>
-				<span>
-					<h5><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
-					<font>手机验证：</font>
-					<span>您绑定的手机：<i ng-modal="userInfo.userTel" style="color:#666;">{{userInfo.userTel}}</i>。若已丢失或停用，请立即更换，避免账户被盗。</span>
-				</span>
-				<a ng-click="updateUserTel()">修改</a>
-			</li>
 			<li>
 				<span>
 					<h5 ng-show="userInfo.userEmail==null?false:true"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
@@ -270,6 +257,26 @@
 				<a ng-show="userInfo.userEmail==null?false:true" ng-click="updateUserEmail()">修改</a>
 				<a ng-hide="userInfo.userEmail==null?false:true" ng-click="updateUserEmail()">立即设置</a>
 			</li>
+			<li>
+				<span>
+					<h5><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
+					<font>手机验证：</font>
+					<span>您绑定的手机：<i ng-modal="userInfo.userTel" style="color:#666;">{{userInfo.userTel}}</i>。若已丢失或停用，请立即更换，避免账户被盗。</span>
+				</span>
+				<a ng-click="updateUserTel()">修改</a>
+			</li>
+			<li ng-switch="userInfo.idEnable">
+				<span>
+					<h5 ng-switch-when="1"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
+					<h5 ng-switch-when="0"><img src="static/img/user/images/safe.png"/></h5>
+					<h5 ng-switch-when="2"><img src="static/img/user/images/safe.png"/></h5>
+					<font>实名认证：</font>
+					<span>实名认证后，可通过实名信息找回支付密码、修改手机号等，提高账户安全性。</span>
+				</span>
+					<a ng-switch-when="0" ng-click="updateRealAuth()" class="mall-btn-default">立即设置</a>
+					<a ng-switch-when="1">审核通过</a>
+					<a ng-switch-when="2">待审核</a>
+			</li>
 			<li>
 				<span>
 					<h5 ng-show="userInfo.havePayPwd"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>

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

@@ -17,9 +17,12 @@
     #left-nav-fragment .user_left ul li a {
         padding-left: 0;
     }
+    .disabled {
+        cursor: not-allowed;
+    }
 </style>
 <body>
-    <div id="left-nav-fragment">
+    <div id="left-nav-fragment" ng-controller="leftNavCtrl">
         <div class="user_left fl">
             <a href="user#/home"><p ng-class="{'active' : active == 'home'}"><span>买家中心</span></p></a>
             <ul>
@@ -30,9 +33,9 @@
                     <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" >订单中心</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>
+                    <li ng-class="{'active' : active == 'buyer_order'}"><a ng-click="promptUpdate()" >订单中心</a></li>
+                    <li ng-class="{'active' : active == 'pay_center'}"><a ng-click="promptUpdate()" class="disabled" >支付中心</a></li>
+                    <li ng-class="{'active' : active == 'buyer_invoice'}"><a ng-click="promptUpdate()" class="disabled" >发票管理</a></li>
                 </div>
 
 

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

@@ -54,7 +54,7 @@
 			<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)">
+		<div ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
 			<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>