修复正式环境 切换帐套跳转问题3

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

@@ -142,7 +142,11 @@
         <li ng-if="userInfo" class="dropdown">
             <a class="dropdown-toggle" href="javascript:void(0)">欢迎您，
                 <span ng-bind="userInfo.userName"></span>
-                <span href="javascript:void(0)" ng-click="logout()" class="logout">[退出]</span>
+                <span> | </span>
+
+                <span style="float:right;margin-left: 15px" href="javascript:void(0)" ng-click="logout()" class="logout">[退出]</span>
+                <span style="float:right;margin-left: 8px;max-width: 190px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;" ng-if="userInfo.enterprise" ng-bind="userInfo.enterprise.enName" ></span>
+                <span style="float:right;margin-left: 8px;max-width: 190px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;" ng-if="!userInfo.enterprise" ng-bind="'个人账户'" ></span>
             </a>
             <div class="dropdown-menu" style="top: 36px; left: 0; min-width: 220px;">
                <!-- <p>欢迎您，<span ng-bind="userInfo.userName"></span>
@@ -152,7 +156,7 @@
                     <!--<i class="fa fa-map-marker"></i> <span ng-if="userInfo.enterprises" ng-bind="userInfo.enterprise.enName"></span><span ng-if="!userInfo.enterprises" ng-bind="userInfo.userName"></span><span ng-if="!userInfo.enterprises">（个人账户）</span>-->
                     <i class="fa fa-map-marker"></i>
                     <span ng-if="userInfo.enterprise" ng-bind="userInfo.enterprise.enName" class="member-text"></span>
-                    <span ng-if="!userInfo.enterprise" ng-bind="userInfo.userName + '（个人账户）'" class="member-text"></span>
+                    <span ng-if="!userInfo.enterprise" ng-bind="' 个人账户'" class="member-text"></span>
                     <a href="javascript:void(0)" class="pull-right" ng-if="userInfo.enterprises" ng-click="toggleSwitch()" ng-bind="switching?'取消':'切换'">切换</a>
                 </p>
                 <ul class="unstyled" ng-show="switching" style="-webkit-padding-start: 0;">

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

@@ -18,7 +18,8 @@
                 <dl>
                     <dt><img src="static/img/user/images/user_photo.png" /></dt>
                     <dd>
-                       <span ng-cloak>{{userInfo.userName}}<br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                       <span ng-cloak>{{userInfo.userName}} | <br/> <!--<em>账户余额：￥68899.99</em>--></span>
+                        <span ng-cloak ng-bind="userInfo.enterprise.enName || '个人账户'"><br/> <!--<em>账户余额：￥68899.99</em>--></span>
                         <a href="user#/accountManager">账户设置&nbsp;》</a>
                     </dd>
                 </dl>

src/main/webapp/resources/view/vendor/forstore/vendor_index.html

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