处理b2b和商城位置

src/main/webapp/resources/js/sso/controllers/rolePermissionCtrl.js

@@ -7,7 +7,7 @@ define(['app/app'], function (app) {
     app.register.controller('rolePermissionCtrl', ['$scope', '$rootScope', 'Enterprise', 'User', 'toaster', '$modal', 'BaseService', 'ngTableParams', '$http', 'AuthenticationService', '$stateParams','AccountResource','AccountRole', 'Authority', 'B2bAccountRole', 'B2bAccountUser', function ($scope, $rootScope, Enterprise, User, toaster, $modal, BaseService, ngTableParams, $http, AuthenticationService, $stateParams, AccountResource, AccountRole, Authority, B2bAccountRole, B2bAccountUser) {
         $rootScope.active = 'sso_permission';
         document.title = '角色权限';
-        $scope.tab = 'b2c';
+        $scope.tab = 'b2b';
         $scope.addingUser = false;
         $scope.setAddingUser = function (status) {
             $scope.addingUser = status;

src/main/webapp/resources/view/sso/rolePermission.html

@@ -906,8 +906,8 @@
 <div class="count user_right fr" ng-click="hideList()">
     <div class="com_tab">
         <ul>
-            <li ng-class="{active: tab == 'b2c'}" ng-click="setTab('b2c')"><a href="javascript:void(0)">商城角色</a></li>
             <li ng-class="{active: tab == 'b2b'}" ng-click="setTab('b2b')"><a href="javascript:void(0)">B2B角色</a></li>
+            <li ng-class="{active: tab == 'b2c'}" ng-click="setTab('b2c')"><a href="javascript:void(0)">商城角色</a></li>
         </ul>
     </div>
     <!--安全设置-->

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

@@ -39,8 +39,8 @@
                 <li ng-class="{'active' : active == 'seek_purchase'}"><a ui-sref="buyerSeekPurchase">采购询价</a></li>
                 <!--<li ng-class="{'active' : active == 'purc_haseinquiry'}"><a ui-sref="purc_haseinquiry">定向询价</a></li>-->
                 <li ng-class="{'active' : active == 'buyer_cart'}"><a  ui-sref="buyer_cart">购物车<em>(<span ng-bind="countCart || 0 | number"></span>)</em></a> </li>
-                <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="buyer_order">采购订单</a></li>
-                <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="pay_center">应付对账</a></li>
+                <li ng-class="{'active' : active == 'buyer_order'}"><a  ui-sref="purc_usercenter_order">采购订单</a></li>
+                <li ng-class="{'active' : active == 'buyer_pay_center'}"><a  ui-sref="fa_arCheck">应付对账</a></li>
                 <li ng-class="{'active' : active == 'buyer_invoice'}"><a  ui-sref="buyer_no_invoice">发票管理</a></li>
                 <li ng-class="{'active' : active == 'buyer_tender'}"><a  ui-sref="purc_tenderlist">采购招标</a></li>
                 <li ng-class="{active: active == 'purc_vendor'}"><a ui-sref="purc_vendor">供应商资料</a></li>

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

@@ -45,13 +45,13 @@
 	<ul>
 		<div>
 			<li ng-class="{'active' : active == 'vendor_seek_purchase'}"><span ui-sref="vendorSeekPurchase">商机管理</span></li>
-			<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="vendor_order">销售订单</span></li>
+			<li ng-class="{'active' : active == 'vendor_order'}"><span  ui-sref="saleOrder">销售订单</span></li>
 			<li ng-class="{'active' : active == 'vendor_logistics'}">
 				<span  ui-sref="vendor_logistics" ng-hide="store && (!store.status || store.status === 'OPENED')">物流管理</span>
 				<span  ui-sref="vendor_deliveryRule" ng-if="store && (!store.status || store.status === 'OPENED')">物流管理</span>
 			</li>
 			<li ng-class="{'active' : active == 'vendor_invoice'}"><span  ui-sref="vendorInvoice">开票管理</span></li>
-			<li ng-class="{'active' : active == 'vendor_pay_center'}"><span  ui-sref="pay_center">应收对账</span></li>
+			<li ng-class="{'active' : active == 'vendor_pay_center'}"><span  ui-sref="fa_apCheck">应收对账</span></li>
 			<li ng-class="{'active' : active == 'vendor_store'}">
 				<!-- 我要开店 !store && applyStatus == 'NONE' -->
 				<span  ui-sref="vendor_store_apply" ng-if="!store && applyStatus == 'NONE'">开店申请</span>