1、工作台新增物料导入、合并产品信息导入、服务导航点击后出现。

2、搜索结果、企业圈按钮优化。

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

src/main/webapp/WEB-INF/views/normal/index.html

@@ -240,7 +240,7 @@
 	<script src="static/lib/bootstrap/js/bootstrap.js"></script>
 <script type="text/javascript">
 	$(function(){
-		$('#home-dropdown').hover(function (){
+		$('#home-dropdown').click(function (){
 			$(".dropdown-tab").toggle();
 			$('.dropdown-tab01').mouseenter(function(){
 				$(".dropdown-tab").show();
@@ -249,7 +249,9 @@
 				$(".dropdown-tab").hide();
 			});
 		});
-
+		$('#home-dropdown').hover(function (){
+			$(".dropdown-tab").hide();
+		});
 		$('.dropdown-tab a').click(function(){
 			$(".dropdown-tab").hide();
 		});

src/main/webapp/resources/css/index.css

@@ -3125,9 +3125,10 @@ input::-webkit-clear{display:none;}
 	display: none;
 }
 #myquest-public  .all-btn a{
-	width: 94px;
-	height: 36px;
-	line-height: 36px;
+	width: 90px;
+	height: 30px;
+	line-height: 30px;
+	border-radius: 4px;
 	text-align: center;
 	color: #fff;
 	font-size: 14px;

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

@@ -231,10 +231,12 @@
 	text-align: center;
 }
 .order-table .btn {
-	border-radius: 0;
-	width: 94px;
-	height: 36px;
+	width: 90px;
+	height: 30px;
 	color: #fff;
+	border-radius: 4px;
+	padding: 0;
+	line-height: 30px;
 }
 .order-table .btn01 {
 	color: #327ebe;

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

@@ -233,10 +233,12 @@
 	font-size: 14px;
 	}
 .enterprise-table .btn{
-	border-radius: 0;
-	width: 94px;
-	height: 36px;
+	width: 90px;
+	height: 30px;
 	color: #fff;
+	border-radius: 4px;
+	padding: 0;
+	line-height: 30px;
 }
 .enterprise-table .btn01{
 	color: #327ebe;

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

@@ -5,7 +5,7 @@
 			<div class="btn-group btn-group-sm btn-group-justified">
 				<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'}" style="width: 120px;">全部合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
+					   ng-class="{'btn-info':status=='partner'}" style="width: 120px;margin-left: 18%;">全部合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
 				</div>
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.vendorInfo"
@@ -17,7 +17,7 @@
 				</div>
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.invitation"
-						ng-class="{'btn-info':status=='invitation'}">邀请注册记录</a>
+						ng-class="{'btn-info':status=='invitation'}" style="width: 110px;">邀请注册记录</a>
 				</div>
 			</div>
 		</div>

src/main/webapp/resources/tpl/index/cs/left.html

@@ -3,8 +3,8 @@
 		<i></i>增值服务
 	</div>
 	<ul class="list-unstyled">
-		<li><a href="{{userInfo.enterprise.enSaasUrl? 'http://' + userInfo.enterprise.enSaasUrl + '.saas.ubtob.com':'#/account/enterprise'}}">优企云服</a></li>
+		<li><a href="{{userInfo.enterprise.enSaasUrl? 'http://' + userInfo.enterprise.enSaasUrl + '.saas.ubtob.com':'#/account/enterprise'}}" target="_blank">优企云服</a></li>
 		<li><a href="http://www.usoftmall.com/" target="_blank">电子元器件市场</a></li>
-		<li><a href="#/baseInfo/enterpriseList">企业圈</a></li>
+		<li><a href="#/baseInfo/myRquest">企业圈</a></li>
 	</ul>
 </div>

src/main/webapp/resources/tpl/index/home/right.html

@@ -64,8 +64,7 @@
 					<div id="operateTips" ng-controller="VendCountCtrl">
 						<a class="col-xs-4" href="#/sale/customer"> 我的客户（<span ng-class="{'text-inverse': count.customer>0}">{{count.customer || 0}}</span>）</a>
 						<a class="col-xs-4" ui-sref="sale.prodList">产品信息</a>
-						<a class="col-xs-4" style="color: #327ebe" ui-sref="sale.newProdInfo"><i class="fa fa-plus"></i> 新增产品信息</a>
-						<a class="col-xs-4" style="color: #327ebe" ui-sref="sale.uploadByBatch"><i class="fa fa-plus"></i> 导入产品信息</a>
+						<a class="col-xs-4" style="color: #327ebe" ui-sref="sale.newProdInfo"><i class="fa fa-plus"></i> 产品导入</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/sale/quotation/new"><i class="fa fa-plus"></i> 新增主动报价单</a>
 					</div>
 				</div>
@@ -101,6 +100,7 @@
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/deputy/add"><i class="fa fa-plus"></i> 新增代采订单</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/addTender"><i class="fa fa-plus"></i> 发布招标</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/purcinquiry"><i class="fa fa-plus"></i> 发布询价</a>
+						<a class="col-xs-4" style="color: #327ebe" href="#/purc/product"><i class="fa fa-plus"></i> 物料导入</a>
 					</div>
 				</div>
 			</div>

src/main/webapp/resources/tpl/index/search/search_result.html

@@ -186,6 +186,12 @@
 	margin-top: 15px;
 	margin-right: 55px;
 	float: right;
+	width: 90px;
+	height: 30px;
+	color: #fff;
+	border-radius: 4px;
+	padding: 0;
+	line-height: 30px;
 }
 .enterprise-table .text-muted{
 	text-align: center;