企业圈样式调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8376 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/js/index/app.js

@@ -10377,6 +10377,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	 */
 	app.controller('AddPartnerRequestCtrl', ['$scope', 'AddPartnerMyRequest', 'toaster', 'BaseService', 'ngTableParams', 'AddPartner', '$timeout', function($scope, AddPartnerMyRequest, toaster, BaseService, ngTableParams, AddPartner, $timeout) {
 		BaseService.scrollBackToTop();
+		$scope.status = "partner";
 		$scope.active = 'todo';
 		
 		var getRequestStatus = function(active) {
@@ -10500,7 +10501,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			});
 		}
 		
-		$scope.status = 'send';
 	}]);
 	
 	

src/main/webapp/resources/tpl/index/baseInfo/enMenu.html

@@ -1,7 +1,7 @@
 <div class="tab-first">
-	<div class="row" ng-controller="RequestAmountCtrl">
+	<div class="row">
 		<a type="button" ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor' || 'customer' && status!='send' && status!='add'}" class="tab-btn">我的合作伙伴</a>
-		<a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='send'}" class="tab-btn">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
+		<!-- <a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='send'}" class="tab-btn">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a> -->
 		<a type="button" ui-sref="baseInfo.partner_searchresult" class="tab-btn" ng-class="{'active':status=='add'}">添加合作伙伴</a>
 	</div>
 </div>

src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -284,15 +284,15 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
-<div class="group-container condition block" id="myrequest-btn">
+<div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
+<!-- <div class="group-container condition block" id="myrequest-btn">
 		<div class="row">
 			<div class="col-xs-10">
 				<div class="btn-group btn-group-sm btn-group-justified">
-					<!-- <div class="btn-group btn-group-sm">
+					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
 							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div> -->
+					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
 							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">未处理</button>
@@ -308,7 +308,7 @@
 				</div>
 			</div>
 	</div>
-</div>
+</div> -->
 <div class="myReuest search-bg condition block">
 		<div class="row">
 			<div class="col-xs-5">

src/main/webapp/resources/tpl/index/baseInfo/vendorAndCustomer.html

@@ -1,6 +1,6 @@
 <div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
 <div class="margin-bot group-container condition">
-	<div class="row">
+	<div class="row" ng-controller="RequestAmountCtrl">
 		<div class="col-xs-6">
 			<div class="btn-group btn-group-sm btn-group-justified">
 				<div class="btn-group btn-group-sm">
@@ -11,6 +11,10 @@
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.customerInfo"
 						ng-class="{'btn-info':status=='customer'}" >客户<!-- （<em>5</em>） --></a>
 				</div>
+				<div class="btn-group btn-group-sm">
+					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myRequest"
+						ng-class="{'btn-info':status=='partner'}" >新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
+				</div>
 			</div>
 		</div>
 	</div>