B2B和优软商城换位置

src/main/resources/dev/sys.properties

@@ -53,7 +53,7 @@ inquiryServiceInnerUrl=http://218.17.158.219:24000
 messageServiceUrl=http://192.168.253.12:24000/message/
 
 #b2b
-b2b=http://10.1.51.91:8090/platform-b2b
+b2b=http://192.168.253.12:9000/b2b-test
 b2bDomain=218.17.158.219:9000/b2b-test
 
 #lottery

src/main/webapp/resources/js/common/services.js

@@ -144,7 +144,7 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils, Big) {
 					// 	method: 'get',
 					// 	url: 'b2b/sale/accessUrl'
 					// }).success(function (data) {
-					// 	defer.resolve(data);
+					// 	defer.resolve(data);sty
 					// }).error(function (error) {
 					// 	defer.reject(error);
 					// });

src/main/webapp/resources/js/sso/controllers/b2b/LogCtrl.js

@@ -1,7 +1,7 @@
 define(['app/app'], function(app) {
-
-    app.register.controller('LogCtrl', ['$scope', '$rootScope', 'BaseService', 'ngTableParams', 'B2bErpLog', 'B2bUsageLog', function ($scope, $rootScope, BaseService, ngTableParams, ErpLog, UsageLog) {
-       $rootScope.active = 'approvalflow_log';
+    app.register.controller('LogCtrl', ['$scope', '$rootScope', 'BaseService', 'ngTableParams', 'B2bErpLog', 'B2bUsageLog',
+        function ($scope, $rootScope, BaseService, ngTableParams, ErpLog, UsageLog) {
+        $rootScope.active = 'approvalflow_log';
         $scope.erpParams = new ngTableParams({
             page: 1,
             count: 20,
@@ -34,7 +34,7 @@ define(['app/app'], function(app) {
         }, {
             total: 0,
             counts: [5, 10, 25, 50],
-            getData: function ($defer, params) {
+            getData: function($defer, params) {
                 $scope.loading = true;
                 UsageLog.get(BaseService.parseParams(params.url()), function (page) {
                     $scope.loading = false;
@@ -48,6 +48,5 @@ define(['app/app'], function(app) {
                 });
             }
         });
-    }]);
-
+    }])
 });

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

@@ -53,7 +53,7 @@
 		<li ng-class="{'active' : active == 'buyer_pay_center'}"><span ui-sref="payAccount({'status': 'pay-info'})">付款账户</span></li>
 		<li ng-class="{'active' : active == 'baseInfo_myRequest'}"><span ui-sref="baseInfo_myRequest">企业圈</span></li>
 		<li ng-class="{'active' : active == 'approvalflow_log'}"><span ui-sref="approvalflow_log">操作日志</span></li>
-		<li ng-class="{'active' : active == 'approvalflow_flow'}"><span ui-sref="approvalflow_flow">审批流</span></li>
+		<!--<li ng-class="{'active' : active == 'approvalflow_flow'}"><span ui-sref="approvalflow_flow">审批流</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>-->

src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -491,8 +491,8 @@
 <div class="user_right fr" style="position: relative">
   <div class="com_tab" style="margin-bottom: 10px">
     <ul class="fl" style="width: 100%">
-      <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
       <li class="active"><a href="javascript:void(0)">B2B</a></li>
+      <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
     </ul>
   </div>
   <div class="screen check-filter">

src/main/webapp/resources/view/usercenter/b2b/order/changeList.html

@@ -113,8 +113,8 @@
 	<!--</div>-->
 	<div class="com_tab" style="margin-bottom: 10px">
 		<ul class="fl" style="width: 100%">
-			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 			<li class="active"><a ui-sref="purc_usercenter_order" href="#/purc/order">B2B</a></li>
+			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
 	<div class="tab_top" style="margin-bottom: 10px">

src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder.html

@@ -205,8 +205,8 @@
 <!--</div>-->
 	<div class="com_tab" style="margin-bottom: 10px">
 		<ul class="fl" style="width: 100%">
-			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 			<li class="active"><a ui-sref="purc_usercenter_order" href="#/purc/order">B2B</a></li>
+			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
 	<div class="tab_top" style="margin-bottom: 10px">

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

@@ -756,8 +756,8 @@
 <div class="user_right fr">
 	<div class="com_tab" style="margin-bottom: 10px">
 		<ul class="fl" style="width: 100%">
-			<li class="active"><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 			<li><a ui-sref="purc_usercenter_order" href="#/purc/order">B2B</a></li>
+			<li class="active"><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
 	<!--订单中心-->

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

@@ -486,8 +486,8 @@
 	<div class="pay_record oder">
 		<div class="oder01" style="margin-bottom: 16px;">
 			<ul>
-				<li ng-if="status != 'pay-info'" ng-class="{'active' : status=='pay-history'}"><a href="javascript:void(0)">优软商城</a></li>
 				<li ng-if="status != 'pay-info'"><a ui-sref="fa_arCheck" href="javascript:void(0)">B2B</a></li>
+				<li ng-if="status != 'pay-info'" ng-class="{'active' : status=='pay-history'}"><a href="javascript:void(0)">优软商城</a></li>
 				<li ng-if="status == 'pay-info'" ng-class="{'active' : status=='pay-info'}"><a href="javascript:void(0)">付款帐户</a></li>
 			</ul>
 		</div>

src/main/webapp/resources/view/vendor/b2b/apBill.html

@@ -491,8 +491,8 @@
 <div class="user_right fr" style="position: relative">
   <div class="com_tab" style="margin-bottom: 10px">
     <ul class="fl" style="width: 100%">
-      <li><a ui-sref="vendorInvoice">优软商城</a></li>
       <li class="active"><a>B2B</a></li>
+      <li><a ui-sref="vendorInvoice">优软商城</a></li>
       <li class="down-purchase" style="margin-right: 20px;min-width: 80px">
           <span ng-click="exportXls()">
             <i class="fa fa-file-excel-o fa-fw"></i>导出Excel

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -501,8 +501,8 @@
 <div class="user_right fr" style="position: relative">
   <div class="com_tab" style="margin-bottom: 10px">
     <ul class="fl" style="width: 100%">
-      <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
       <li class="active"><a  href="javascript:void(0)">B2B</a></li>
+      <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
       <li class="down-purchase" style="margin-right: 0;min-width: 80px">
         <a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
       </li>

src/main/webapp/resources/view/vendor/b2b/sale_change.html

@@ -222,8 +222,8 @@
 	<div class="sellOder oder" id="sellOder">
 		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
-				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
+				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="down-purchase">
                     <span ng-click="exportXls()">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel

src/main/webapp/resources/view/vendor/b2b/sale_makechange.html

@@ -223,8 +223,8 @@
 	<div class="sellOder oder" id="sellOder">
 		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
-				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
+				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="down-purchase">
                     <span ng-click="downPurchase()">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel

src/main/webapp/resources/view/vendor/b2b/sale_notice.html

@@ -410,8 +410,8 @@
 	<div class="sellOder oder" id="sellOder">
 		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
-				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
+				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="down-purchase">
                     <span ng-click="exportXls()">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel

src/main/webapp/resources/view/vendor/b2b/sale_order.html

@@ -190,8 +190,8 @@
 	<div class="sellOder oder" id="sellOder">
 		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
-				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
+				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="down-purchase">
                     <span ng-click="exportXls()">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel

src/main/webapp/resources/view/vendor/b2b/sale_send.html

@@ -226,8 +226,8 @@
 	<div class="sellOder oder" id="sellOder">
 		<div class="com_tab" style="margin-bottom: 10px">
 			<ul class="fl" style="width: 100%">
-				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="active"><a ui-sref="saleOrder">B2B</a></li>
+				<li><a ui-sref="vendor_order">优软商城</a></li>
 				<li class="down-purchase">
                     <span ng-click="exportXls()">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel