Browse Source

顶部企业切换交互调整

yangc 8 years ago
parent
commit
18b60caf02

+ 3 - 3
src/main/java/com/uas/platform/b2c/common/account/model/UsageLog.java

@@ -197,7 +197,7 @@ public class UsageLog extends BufferedLogable implements Serializable {
 		if(user != null && user.getUserTel()!=null){
 		if(user != null && user.getUserTel()!=null){
 			return user.getUserTel().substring(0,user.getUserTel().length()-(user.getUserTel().substring(3)).length())+"****"+user.getUserTel().substring(7);
 			return user.getUserTel().substring(0,user.getUserTel().length()-(user.getUserTel().substring(3)).length())+"****"+user.getUserTel().substring(7);
 		}
 		}
-		return user.getUserTel();
+		return null;
 	}
 	}
 
 
 	public String getUserEmail() {
 	public String getUserEmail() {
@@ -209,14 +209,14 @@ public class UsageLog extends BufferedLogable implements Serializable {
 			else
 			else
 				return org.apache.commons.lang.StringUtils.rightPad(org.apache.commons.lang.StringUtils.left(email, 1), index, "*").concat(org.apache.commons.lang.StringUtils.mid(email, index, org.apache.commons.lang.StringUtils.length(email)));
 				return org.apache.commons.lang.StringUtils.rightPad(org.apache.commons.lang.StringUtils.left(email, 1), index, "*").concat(org.apache.commons.lang.StringUtils.mid(email, index, org.apache.commons.lang.StringUtils.length(email)));
 		}
 		}
-		return user.getUserEmail();
+		return null;
 	}
 	}
 
 
 	public String getUserName() {
 	public String getUserName() {
 		if(user.getUserName()!=null){
 		if(user.getUserName()!=null){
 			return user.getUserName().substring(0,1)+"**";
 			return user.getUserName().substring(0,1)+"**";
 		}
 		}
-		return user.getUserName();
+		return null;
 	}
 	}
 
 
 	public UsageLog() {
 	public UsageLog() {

+ 3 - 2
src/main/webapp/resources/view/common/site-nav.html

@@ -98,10 +98,11 @@
     }
     }
     #site-nav .dropdown .dropdown-menu >ul >li.switch-enterprises a:hover {
     #site-nav .dropdown .dropdown-menu >ul >li.switch-enterprises a:hover {
         color: #5078cb;
         color: #5078cb;
+        text-decoration: none;
     }
     }
     #site-nav .dropdown:hover .dropdown-toggle {
     #site-nav .dropdown:hover .dropdown-toggle {
-        border: 1px solid #999999;
-        border-bottom: none;
+        border-left: 1px solid #999999;
+        border-right: 1px solid #999999;
         background: #ffffff;
         background: #ffffff;
         color: #333333;
         color: #333333;
         z-index:11;
         z-index:11;

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/home_center.html

@@ -13,12 +13,12 @@
 <!--右侧主体部分-->
 <!--右侧主体部分-->
 <div class="user_home">
 <div class="user_home">
     <div class="user_right fr">
     <div class="user_right fr">
-        <div class="right_l" ng-controller="AuthenticationCtrl">
+        <div class="right_l">
             <div class="user_r_01">
             <div class="user_r_01">
                 <dl>
                 <dl>
                     <dt><img src="static/img/user/images/user_photo.png" /></dt>
                     <dt><img src="static/img/user/images/user_photo.png" /></dt>
                     <dd>
                     <dd>
-                       <span ng-cloak>{{userInfo.userName}} | <br/> <!--<em>账户余额:¥68899.99</em>--></span>
+                       <span ng-cloak ng-bind="userInfo.userName + '&nbsp;|'"><br/> <!--<em>账户余额:¥68899.99</em>--></span>
                         <span ng-cloak ng-bind="userInfo.enterprise.enName || '个人账户'"><br/> <!--<em>账户余额:¥68899.99</em>--></span>
                         <span ng-cloak ng-bind="userInfo.enterprise.enName || '个人账户'"><br/> <!--<em>账户余额:¥68899.99</em>--></span>
                         <a ui-sref="account_manager" href="#/accountManager/">账户设置&nbsp;》</a>
                         <a ui-sref="account_manager" href="#/accountManager/">账户设置&nbsp;》</a>
                     </dd>
                     </dd>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_index.html

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