Browse Source

账户管理样式修改

yangc 8 years ago
parent
commit
6a65517469

+ 3 - 3
src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -1743,15 +1743,15 @@ define([ 'app/app' ], function(app) {
 	app.controller('leftNavCtrl', ["$scope", "toaster", function($scope, toaster){
 	app.controller('leftNavCtrl', ["$scope", "toaster", function($scope, toaster){
 		$scope.promptUpdate = function() {
 		$scope.promptUpdate = function() {
 			if (!$scope.userInfo.pwdEnable) {
 			if (!$scope.userInfo.pwdEnable) {
-        toaster.pop("info", '提示', "请修改登录密码");
+        toaster.pop("info", "请修改登录密码");
         return;
         return;
 			}
 			}
       if (!$scope.userInfo.userEmail) {
       if (!$scope.userInfo.userEmail) {
-        toaster.pop("info", '提示', "请绑定邮箱");
+        toaster.pop("info", "请绑定邮箱");
         return;
         return;
       }
       }
       if (!$scope.userInfo.haveUserQuestion) {
       if (!$scope.userInfo.haveUserQuestion) {
-        toaster.pop("info", '提示',  "请修改登录密码");
+        toaster.pop("info",  "请修改登录密码");
         return;
         return;
       }
       }
 		}
 		}

+ 3 - 0
src/main/webapp/resources/js/usercenter/controllers/forstore/account_manager_ctrl.js

@@ -14,6 +14,9 @@ define(['app/app'], function (app) {
           $rootScope.active = 'account_manager';
           $rootScope.active = 'account_manager';
           $scope.tab = 'base';
           $scope.tab = 'base';
           $scope.userInfo = $rootScope.userInfo;
           $scope.userInfo = $rootScope.userInfo;
+          // $scope.userInfo.pwdEnable = false;
+          // $scope.userInfo.haveUserQuestion = false;
+          // $scope.userInfo.userEmail = null;
           $scope.userInfoBackup = angular.copy($scope.userInfo);
           $scope.userInfoBackup = angular.copy($scope.userInfo);
           $scope.canAddTotal = 20;
           $scope.canAddTotal = 20;
           //手机号和邮箱号的部分隐藏
           //手机号和邮箱号的部分隐藏

+ 3 - 0
src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -10,6 +10,9 @@ define(['app/app'], function(app) {
 		$scope.tab = 'base';
 		$scope.tab = 'base';
         $scope.userInfo = $rootScope.userInfo;
         $scope.userInfo = $rootScope.userInfo;
 		$scope.updateState = false;
 		$scope.updateState = false;
+        // $scope.userInfo.pwdEnable = false;
+        // $scope.userInfo.haveUserQuestion = false;
+        // $scope.userInfo.userEmail = null;
 
 
       //手机号和邮箱号的部分隐藏
       //手机号和邮箱号的部分隐藏
       if($scope.userInfo.userTel){
       if($scope.userInfo.userTel){

+ 29 - 8
src/main/webapp/resources/view/usercenter/forstore/account_manager.html

@@ -22,6 +22,15 @@
 		color: #666;
 		color: #666;
 		font-size: 14px;
 		font-size: 14px;
 	}
 	}
+	.rt_menu span.last-login {
+		font-size: 12px;
+		margin: 0 22px 0 0;
+		font-weight: normal;
+	}
+	.rt_menu span.last-login span {
+		font-size: 12px;
+		font-weight: normal;
+	}
 	.count01 .count-content{
 	.count01 .count-content{
 		width: 100%;
 		width: 100%;
 		background: #fff;
 		background: #fff;
@@ -102,6 +111,18 @@
 		color: #666;
 		color: #666;
 		margin-right: 7px;
 		margin-right: 7px;
 	}
 	}
+	.count01 ul li.safe-level .safe-remind {
+		float: right;
+		margin-right: 87px;
+	}
+	.count01 ul li.safe-level .safe-remind a {
+		color: #ff0000;
+		float: none !important;
+	}
+	.count01 ul li.active-safe-box {
+		background: #fef2f2;
+		border: 1px solid #faaebe;
+	}
 	.count01 ul li span font {
 	.count01 ul li span font {
 		font-size: 14px;
 		font-size: 14px;
 		color: #333;
 		color: #333;
@@ -219,14 +240,14 @@
 					<i ng-if="userInfo.secLevel==5 || userInfo.secLevel==6">强</i>
 					<i ng-if="userInfo.secLevel==5 || userInfo.secLevel==6">强</i>
 					<!--完成<a href="javascript:void(0)"> 密保设置</a>,提升账户安全。-->
 					<!--完成<a href="javascript:void(0)"> 密保设置</a>,提升账户安全。-->
 				</span>
 				</span>
-        <span ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
-          你的账户的安全等级过低,请 <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 class="safe-remind" ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
+          你的账户的安全等级过低,请 <a ng-hide="userInfo.pwdEnable" ng-click="updatePassword()">修改密码、</a>
+          <a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()">设置密保问题、</a>
+          <a  ng-hide="userInfo.userEmail" ng-click="updateUserEmail()">绑定邮箱</a>
           来保障您的账户安全!
           来保障您的账户安全!
         </span>
         </span>
 			</li>
 			</li>
-			<li>
+			<li ng-class="{'active-safe-box': !userInfo.pwdEnable}">
 				<span>
 				<span>
 					<h5 ng-show="userInfo.pwdEnable"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-show="userInfo.pwdEnable"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-hide="userInfo.pwdEnable"><img src="static/img/user/images/safe.png"/></h5>
 					<h5 ng-hide="userInfo.pwdEnable"><img src="static/img/user/images/safe.png"/></h5>
@@ -236,7 +257,7 @@
 				<a ng-show="userInfo.pwdEnable" ng-click="updatePassword()">修改</a>
 				<a ng-show="userInfo.pwdEnable" ng-click="updatePassword()">修改</a>
 				<a ng-hide="userInfo.pwdEnable" ng-click="updatePassword()" class="mall-btn-default">立即设置</a>
 				<a ng-hide="userInfo.pwdEnable" ng-click="updatePassword()" class="mall-btn-default">立即设置</a>
 			</li>
 			</li>
-			<li>
+			<li ng-class="{'active-safe-box': !userInfo.haveUserQuestion}">
 				<span>
 				<span>
 					<h5 ng-show="userInfo.haveUserQuestion"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-show="userInfo.haveUserQuestion"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-hide="userInfo.haveUserQuestion"><img src="static/img/user/images/safe.png"/></h5>
 					<h5 ng-hide="userInfo.haveUserQuestion"><img src="static/img/user/images/safe.png"/></h5>
@@ -246,7 +267,7 @@
 				<a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()" class="mall-btn-default">立即设置</a>
 				<a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()" class="mall-btn-default">立即设置</a>
 				<a ng-show="userInfo.haveUserQuestion" ng-click="updateUserQuestion()">修改</a>
 				<a ng-show="userInfo.haveUserQuestion" ng-click="updateUserQuestion()">修改</a>
 			</li>
 			</li>
-			<li>
+			<li ng-class="{'active-safe-box': !userInfo.userEmail}">
 				<span>
 				<span>
 					<h5 ng-show="userInfo.userEmail"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-show="userInfo.userEmail"><img class="ok-icon" src="static/img/user/images/ok-account.png"/></h5>
 					<h5 ng-hide="userInfo.userEmail"><img src="static/img/user/images/safe.png"/></h5>
 					<h5 ng-hide="userInfo.userEmail"><img src="static/img/user/images/safe.png"/></h5>
@@ -255,7 +276,7 @@
 					<span ng-hide="userInfo.userEmail">绑定邮箱可帮助您找回登录密码,并可订阅获取最新的订单动态、促销信息。</span>
 					<span ng-hide="userInfo.userEmail">绑定邮箱可帮助您找回登录密码,并可订阅获取最新的订单动态、促销信息。</span>
 				</span>
 				</span>
 				<a ng-show="userInfo.userEmail" ng-click="updateUserEmail()">修改</a>
 				<a ng-show="userInfo.userEmail" ng-click="updateUserEmail()">修改</a>
-				<a ng-hide="userInfo.userEmail" ng-click="updateUserEmail()">立即设置</a>
+				<a ng-hide="userInfo.userEmail" ng-click="updateUserEmail()" class="mall-btn-default">立即设置</a>
 			</li>
 			</li>
 			<li>
 			<li>
 				<span>
 				<span>

+ 6 - 0
src/main/webapp/resources/view/usercenter/left_nav.html

@@ -20,6 +20,12 @@
     .disabled {
     .disabled {
         cursor: not-allowed;
         cursor: not-allowed;
     }
     }
+    #toast-container > .toast-info {
+        background-color: #d88f2c;
+        font-size: 14px;
+        font-weight: normal;
+        width: auto;
+    }
 </style>
 </style>
 <body>
 <body>
     <div id="left-nav-fragment" ng-controller="leftNavCtrl">
     <div id="left-nav-fragment" ng-controller="leftNavCtrl">

+ 21 - 4
src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -338,6 +338,23 @@
   .count01 ul li span h5 {
   .count01 ul li span h5 {
     width: 30px;
     width: 30px;
   }
   }
+  .count01 ul li.safe-level .safe-remind {
+    float: right;
+    margin-right: 87px;
+  }
+  .count01 ul li.safe-level .safe-remind a {
+    color: #ff0000;
+    float: none !important;
+  }
+  .rt_menu span.last-login {
+    font-size: 12px;
+    margin: 0 22px 0 0;
+    font-weight: normal;
+  }
+  .rt_menu span.last-login span {
+    font-size: 12px;
+    font-weight: normal;
+  }
 </style>
 </style>
 <!--右侧主体部分-->
 <!--右侧主体部分-->
 <div class="count user_right fr">
 <div class="count user_right fr">
@@ -598,10 +615,10 @@
 					<i ng-if="userInfo.secLevel==5 || userInfo.secLevel==6">强</i>
 					<i ng-if="userInfo.secLevel==5 || userInfo.secLevel==6">强</i>
           <!--完成<a href="javascript:void(0)"> 密保设置</a>,提升账户安全。-->
           <!--完成<a href="javascript:void(0)"> 密保设置</a>,提升账户安全。-->
 				</span>
 				</span>
-          <span ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
-          你的账户的安全等级过低,请 <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 class="safe-remind" ng-hide="userInfo.pwdEnable && userInfo.haveUserQuestion && userInfo.userEmail">
+          你的账户的安全等级过低,请 <a ng-hide="userInfo.pwdEnable" ng-click="updatePassword()">修改密码、</a>
+          <a ng-hide="userInfo.haveUserQuestion" ng-click="updateUserQuestion()">设置密保问题、</a>
+          <a ng-hide="userInfo.userEmail" ng-click="updateUserEmail()">绑定邮箱</a>
           来保障您的账户安全!
           来保障您的账户安全!
         </span>
         </span>
         </li>
         </li>

+ 6 - 0
src/main/webapp/resources/view/vendor/left_nav.html

@@ -20,6 +20,12 @@
 	.disabled {
 	.disabled {
 		cursor: not-allowed;
 		cursor: not-allowed;
 	}
 	}
+	#toast-container > .toast-info {
+		background-color: #d88f2c;
+		font-size: 14px;
+		font-weight: normal;
+		width: auto;
+	}
 </style>
 </style>
 <div id="vendor_left_bar" class="user_left fl" ng-controller="leftNavCtrl">
 <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>
 	<a  ui-sref="vendor_index"><p ng-class="{'active' : active == 'index'}"><span>卖家中心</span></p></a>