账户管理-安全设置 新需求调整

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

@@ -1740,8 +1740,21 @@ define([ 'app/app' ], function(app) {
   /**
    * 左侧导航栏控制器
    */
-	app.controller('leftNavCtrl', ["$scope", function($scope){
-
+	app.controller('leftNavCtrl', ["$scope", "toaster", function($scope, toaster){
+		$scope.promptUpdate = function() {
+			if(!$scope.userInfo.pwdEnable){
+        toaster.pop("info", '提示', "请修改登录密码");
+        return;
+			}
+      if(!$scope.userInfo.userEmail){
+        toaster.pop("info", '提示', "请绑定邮箱");
+        return;
+      }
+      if(!$scope.userInfo.haveUserQuestion){
+        toaster.pop("info", '提示',  "请修改登录密码");
+        return;
+      }
+		}
   }]);
 	var getOriginalData = function(data) {
 		var result = {};

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

@@ -7,7 +7,9 @@ define(['app/app', 'calendar'], function(app) {
         $rootScope.active = 'home';
         document.title='买家中心-优软商城';
         $scope.userInfo = $rootScope.userInfo;
-      $scope.userInfo.pwdEnable=false;
+        $scope.userInfo.pwdEnable = false;
+      $scope.userInfo.haveUserQuestion = false;
+      $scope.userInfo.userEmail = null;
         var getRecommendComps = function (userUU, usedFor, pageable) {
             Recommendation.getRecommendComps({page: pageable.page, size: pageable.size}, function (data) {
                 $scope.recommendComps = data.content;

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

@@ -33,7 +33,7 @@
                     <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-click="promptUpdate()" >订单中心</a></li>
+                    <li ng-class="{'active' : active == 'buyer_order'}"><a ng-click="promptUpdate()" class="disabled">订单中心</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/forstore/vendor_account_management.html

@@ -584,7 +584,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>安全等级：
@@ -596,7 +598,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>
+          <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 ng-switch="userInfo.idEnable">
 				<span>

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

@@ -17,8 +17,11 @@
 	#vendor_left_bar.user_left ul li a {
 		padding-left: 0;
 	}
+	.disabled {
+		cursor: not-allowed;
+	}
 </style>
-<div id="vendor_left_bar" class="user_left fl" ng-controller="VendorMenuCtrl">
+<div id="vendor_left_bar" class="user_left fl" ng-controller="leftNavCtrl">
 	<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))">
@@ -55,17 +58,17 @@
 		</li>
 		</div>
 		<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>
+			<li ng-class="{'active' : active == 'vendor_order'}"><a ng-click="promptUpdate()" ng-click="promptUpdate()" class="disabled">订单中心</a></li>
+			<li ng-class="{'active' : active == 'vendor_logistics'}"><a ng-click="promptUpdate()" class="disabled">物流管理</a></li>
+			<li ng-class="{'active' : active == 'vendor_invoice'}"><a ng-click="promptUpdate()" class="disabled" >发票管理</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 == 'pay_center'}"><a ng-click="promptUpdate()" class="disabled" >结算中心</a></li>
+			<li ng-class="{'active' : active == 'vendor_brand_apply'}"><a ng-click="promptUpdate()" class="disabled" >品牌申请</a></li>
+			<li ng-class="{'active' : active == 'vendor_component_apply'}"><a ng-click="promptUpdate()" class="disabled" >器件申请</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_productOn'}"><a ng-click="promptUpdate()" class="disabled" >产品导入</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_material'}"><a ng-click="promptUpdate()" class="disabled" >产品管理</a></li>
 			<!--<li ng-class="{'active' : active == 'vendor_after_sale'}" class="undo">-->
 			<!--&lt;!&ndash;<a  ui-sref="vendor_after_sale">售后处理</a>&ndash;&gt;-->
 			<!--售后处理-->
@@ -73,15 +76,15 @@
 			<!--<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  ng-disabled="true"  ng-if="!store && applyStatus == 'NONE'">开店申请</a>
+				<a ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'NONE'">开店申请</a>
 				<!-- 店铺申请中 !store && applyStatus == 'PREPARE' -->
-				<a  ng-disabled="true"  ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
+				<a ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PREPARE'">开店申请</a>
 				<!-- 我的店铺 !store && applyStatus == 'PASS' -->
-				<a  ng-disabled="true"  ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
+				<a ng-click="promptUpdate()" class="disabled"  ng-if="!store && applyStatus == 'PASS'">我的店铺</a>
 				<!-- 我的店铺 store -->
-				<a  ng-disabled="true"  ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
+				<a ng-click="promptUpdate()" class="disabled"  ng-if="store && (!store.status || store.status === 'OPENED')">我的店铺</a>
 				<!-- 我的店铺申述 store -->
-				<a  ng-disabled="true"  ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
+				<a ng-click="promptUpdate()" class="disabled"  ng-if="store && store.status && store.status !== 'OPENED'">我的店铺</a>
 			</li>
 
 		</div>