Просмотр исходного кода

1、服务下拉效果改动,企业圈企业列表与合作伙伴改成搜索结果类似布局。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7483 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 лет назад
Родитель
Сommit
38151b2c6b

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

@@ -19,6 +19,7 @@
 </head>
 <body ng-controller="AuthCtrl">
 	<!-- top Start -->
+	<div class="fixed-menu">
 	<header class="navbar navbar-static-top" id="top">
 		<div class="container">
 			<nav class="hidden-xs">
@@ -123,7 +124,7 @@
 				</div>
 			</div>
 		</div>
-
+	</div>
 	</div>
 	<!-- header End -->
 	<!-- body Start -->
@@ -215,16 +216,16 @@
 	<script src="static/lib/bootstrap/js/bootstrap.js"></script>
 <script type="text/javascript">
 	$(function(){
-		$('#home-dropdown').hover(function (e){
+		$('#home-dropdown').hover(function (){
 			$(".dropdown-tab").toggle();
-			e.stopPropagation();
 			$('.dropdown-tab01').mouseenter(function(){
 				$(".dropdown-tab").show();
 			});
 			$('.dropdown-tab01').mouseleave(function(){
 				$(".dropdown-tab").hide();
 			});
-		})
+		});
+
 		$('.dropdown-tab a').click(function(){
 			$(".dropdown-tab").hide();
 		});

+ 7 - 1
src/main/webapp/resources/css/index.css

@@ -910,6 +910,7 @@ ul>li.item-link>a {
 	width: 1170px;
 	margin: 0 auto;
 	padding: 0 15px;
+	margin-top: 90px;
 }
 
 .body:before,.body:after {
@@ -2389,11 +2390,16 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	position: fixed;
 	z-index: 1;
 	background: rgba(0, 0, 0, 0.2);
-	top: 95px;
 	left: 0;
 	display: none;
 	transition: display .2s ease-in;
 }
+.fixed-menu{
+	position: fixed;
+	width: 100%;
+	top: 0;
+	z-index: 10000;
+}
 .dropdown-tab01{
 	width: 100%;
 	position: absolute;

+ 2 - 2
src/main/webapp/resources/tpl/index/baseInfo/enMenu.html

@@ -4,11 +4,11 @@
 			<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.enterpriseList"
-						ng-class="{'btn-info':status=='enList'}" >企业列表</a>
+						ng-class="{'btn-info':status=='enList'}" >企业列表(<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=='send'}" >合作伙伴</a>
+						ng-class="{'btn-info':status=='send'}" >合作伙伴(<em>5</em>)</a>
 				</div>
 				<!-- <div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myPartners"

+ 127 - 50
src/main/webapp/resources/tpl/index/baseInfo/enterpriseList.html

@@ -128,89 +128,166 @@
 .unPrinted {
 	color: #56a022;
 }
-
+.view-slide-in{
+	margin-top: 20px;
+}
 .info-container .info:hover {
 	color: #CC3333;
 }
 .enterprise-hd .btn{
 	border-radius: 0;
 }
+/*	增加样式*/
+.view-slide-in .block{
+	background: #f5f5f5;
+}
+.view-slide-in .group-container{
+	background: #fff;
+}
+.view-slide-in .group-container .btn-group{
+	width: 160px;
+	border: none;
+	height: 45px;
+}
+.view-slide-in .group-container .btn-group .btn-info{
+	color: #d32526;
+	background: #fff;
+	border: none;
+}
+.view-slide-in .group-container .btn-group .btn{
+	border: none;
+	font-size: 16px;
+	font-family: "Microsoft YaHei", "微软雅黑";
+}
+.view-slide-in .group-container .btn-group .btn em{
+	color: #d32526;
+	font-style: inherit;
+}
+.view-slide-in .group-container .btn-group .btn:hover{
+	background: #fff;
+	color: #d32526;
+}
+.view-slide-in .group-container{
+	padding: 0;
+}
+.view-slide-in .search-bg{
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+#topSearch{
+	font-size: 18px;
+}
+.view-slide-in #topSearch .search-bg i{
+	color: #999;
+	margin-left: 10px;
+}
+.form-group-sm .form-control-feedback{
+	width: 85px;
+	height: 36px;
+	line-height: 36px;
+	color: #fff;
+	background: #327ebe;
+	text-align: center;
+	font-size: 14px;
+	cursor: pointer;
+}
+#topSearch .input-sm, .form-group-sm .form-control{
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+.enterprise-table .company-list{
+	margin-bottom: 10px;
+}
+.enterprise-table .company-list,.enterprise-table .enterprise-hd{
+	background: #fff;
+	font-size: 16px;
+	height: 55px;
+	line-height: 55px;
+	border-bottom: #ddd 1px solid;
+}
+.enterprise-table .company-list,.enterprise-table .enterprise-bd{
+	border-bottom: #f5f5f5 20px solid;
+}
+.enterprise-table .enterprise-hd span:first-child{
+	margin-left: 20px;
+}
+.enterprise-table .product{
+	line-height: 25px;
+	font-size: 14px;
+}
+.enterprise-table .product span{
+	margin-right: 10px;
+}
+.grey01{
+	color: #969595;
+	font-size: 14px;
+	}
+.enterprise-table .btn{
+	border-radius: 0;
+	width: 94px;
+	height: 36px;
+	color: #fff;
+}
+.enterprise-table .btn01{
+	color: #327ebe;
+	background: #fff;
+	border: none;
+	font-size: 16px;
+	}
 </style>
 <div class="block">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
-<div class="condition block">
+<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"优软",为您找到结果:</span>
+				企业10家;器件10个
+			</div>
+			<div class="col-xs-6" style="float: right">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称、管理员姓名进行搜索" />
 						<div id="searchContainer" class="dropdown-menu">
 						</div>
-						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+						<a class="form-control-feedback text-simple">搜索</a>
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-2">
+			<!--<div class="col-xs-2">
 				<div class="text-default f14 total">
 					共 <span ng-bind="tableParams.total()" class="text-num"></span>
 				</div>
-			</div>
+			</div>-->
 		</div>
 	</div>
 <table class="enterprise-table block" ng-table="tableParams">
-	<thead>
-		<tr class="header">
-			<th width="120">营业执照</th>
-			<th width="200">企业名称</th>
-			<th width="200">简称</th>
-			<th width="300">地址</th>
-			<th width="100">操作</th>
-		</tr>
-		<tr class="sep-row">
-			<td colspan="5"></td>
-		</tr>
-		<tr class="sep-row">
-			<td colspan="6"></td>
-		</tr>
-	</thead>
-	<tbody ng-repeat="enterprise in $data">
+	<tbody ng-repeat="enterprise in $data" class="company-list">
 		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
-			<td width="120" class="text-center">
-				<span ng-bind="::enterprise.businessCode" ></span>
-			</td>
-			<td width="200" class="text-center"><span ng-bind="::enterprise.name" class="text-center"></span></td>
-			<td width="200" class="text-center"><span ng-bind="::enterprise.shortName"></span>
-			</td>
-			<td width="300" class="text-center"><span ng-bind="enterprise.area"></span>
-			</td>
-			<td width="100" class="text-center">
-				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">合作伙伴</a>
-				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
-				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
-				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==313">已添加</span>
-			</td>
+			<td colspan="4"><span ng-bind="::enterprise.name" class="text-center"></span>(<span ng-bind="::enterprise.shortName"></span>)<img src="resources/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
+			<td width="200" class="grey01">当前企业不是优软云用户</td>
 		</tr>
 		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
-			<td class="product" width="150">
+			<td class="product" colspan="4">
+				<div class="">营业执照:<span ng-bind="::enterprise.businessCode" ></span></div>
+				<div class="">企业类型:<span class="text-muted" ng-bind="::enterprise.industry"></span></div>
+				<div class="">企业地址:<span class="text-muted" ng-bind="::enterprise.industry"></span></div>
 				<div class="">
-					管理员:
-					<span ng-bind="::enterprise.adminName"></span>
+					管理员:<span ng-bind="::enterprise.adminName"></span>
+					电话:<span ng-bind="::enterprise.adminTel"></span>
+					邮箱:<span ng-bind="::enterprise.adminEmail"></span>
 				</div>
-				<div class="text-muted" ng-bind="::enterprise.adminTel"></div>
-				<div class="text-muted" ng-bind="::enterprise.adminEmail"></div>
 			</td>
-			<td class="text-center br-l">
-				企业类型:
-				<span class="text-muted" ng-bind="::enterprise.industry"></span>
-			</td>
-			<td class="text-center">
-			</td>
-			<td class="text-center">
-			</td>
-			<td class="">
+			<td width="100" class="text-center">
+				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">合作伙伴</a>
+				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
+				<span class="btn01 btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
+				<span class="btn label-info" ng-if="enterprise.requestStatus==313">已添加</span>
 			</td>
 		</tr>
 	</tbody>

+ 151 - 56
src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -71,7 +71,8 @@
 }
 
 .order-table>tbody:hover {
-	border: #d32526 2px solid;
+	border: #fff 1px solid;
+	border-bottom: 20px solid #f5f5f5;
 }
 .order-table .operates {
 	display: none;
@@ -132,97 +133,191 @@
 .white{
 	color: #fff;
 }
+/*增加样式*/
+.view-slide-in {
+	margin-top: 20px;
+}
+.view-slide-in .block {
+	background: #f5f5f5;
+}
+.view-slide-in .group-container {
+	background: #fff;
+	margin-bottom: 10px;
+}
+.view-slide-in .group-container .btn-group {
+	width: 160px;
+	border: none;
+	height: 45px;
+}
+.view-slide-in .group-container .btn-group .btn {
+	color: #000;
+}
+.view-slide-in .group-container .btn-group .btn-info {
+	color: #d32526;
+	background: #fff;
+	border: none;
+}
+.view-slide-in .group-container .btn-group .btn {
+	border: none;
+	font-size: 16px;
+	font-family: "Microsoft YaHei", "微软雅黑";
+}
+.view-slide-in .group-container .btn-group .btn em {
+	color: #d32526;
+	font-style: inherit;
+}
+.view-slide-in .group-container .btn-group .btn:hover {
+	background: #fff;
+	color: #d32526;
+}
+.view-slide-in .group-container {
+	padding: 0;
+}
+.view-slide-in .search-bg {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+#topSearch {
+	font-size: 18px;
+}
+.view-slide-in #topSearch .search-bg i {
+	color: #999;
+	margin-left: 10px;
+}
+.form-group-sm .form-control-feedback {
+	width: 85px;
+	height: 36px;
+	line-height: 36px;
+	color: #fff;
+	background: #327ebe;
+	text-align: center;
+	font-size: 14px;
+	cursor: pointer;
+}
+#topSearch .input-sm, .form-group-sm .form-control {
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+.search-bg .col-xs-6,.search-bg .row {
+	padding-right: 0;
+}
+.order-table .company-list,.order-table .order-hd:first-child {
+	background: #fff;
+	font-size: 16px;
+	height: 55px;
+	line-height: 55px;
+	border-bottom: #ddd 1px solid;
+}
+.order-table .company-list {
+	width:100%;
+	height: 190px;
+	border-bottom: 20px solid #f5f5f5;
+}
+.order-table .order-hd span.margin-left20 {
+	margin-left: 20px;
+}
+.order-table .product {
+	line-height: 25px;
+	font-size: 14px;
+}
+.order-table .product span {
+	margin-right: 10px;
+}
+.grey01 {
+	color: #969595;
+	font-size: 14px;
+	text-align: center;
+}
+.order-table .btn {
+	border-radius: 0;
+	width: 94px;
+	height: 36px;
+	color: #fff;
+}
+.order-table .btn01 {
+	color: #327ebe;
+	background: #fff;
+	border: none;
+	font-size: 16px;
+}
+.order-table .order-hd td.first {
+	line-height: 25px;
+	font-size: 14px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+}
 </style>
 <div class="block">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
-<div class="condition block">
+<div class="group-container condition block">
 		<div class="row">
 			<div class="col-xs-4">
 				<div class="btn-group btn-group-sm btn-group-justified">
 					<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>
+							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部(<em>10</em>)</button>
 					</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>
+							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待处理(<em>2</em>)</button>
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已通过</button>
+							ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已通过(<em>1</em>)</button>
 					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">未通过</button>
+							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">未通过(<em>7</em>)</button>
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-5">
+	</div>
+</div>
+<div class="search-bg condition block">
+		<div class="row">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"优软",为您找到结果:</span>
+				企业10家;器件10个
+			</div>
+			<div class="col-xs-6" style="float: right">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入企业名称、简称或申请人搜索" />
-						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+						<span class="form-control-feedback text-simple">搜索</span>
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
 		</div>
-	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
-	<thead>
-		<tr class="header">
-			<th width="140" class="text-center">企业名称</th>
-			<th width="120" class="text-center">营业执照</th>
-			<th width="80" class="text-center">申请人</th>
-			<th width="80" class="text-center">审核人</th>
-			<th width="120" class="text-center">原因</th>
-			<th width="120" class="text-center">操作</th>
-		</tr>
-		<tr class="sep-row">
-			<td colspan="6"></td>
-		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="5">
-			</td>
-			<td class="text-center">
-			</td>
-		</tr>
-		<tr class="sep-row">
-			<td colspan="6"></td>
+	<tbody ng-repeat="request in $data" class="company-list">
+		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
+			<td colspan="4"><span ng-bind="request.vendName" class="margin-left20"></span><img src="resources/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
+			<td width="200" class="grey01">已通过</td>
 		</tr>
-	</thead>
-	<tbody ng-repeat="request in $data">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first" class="text-center">
-				<div class="order-main" >
-					<span ng-bind="request.vendName"></span>
+			<td class="first" colspan="4">
+				<div>营业执照:<span ng-bind="::request.vendUID"></span></div>
+				<div>申请人:<span ng-bind="::request.custUserName"></span></div>
+				<div>审核人:<span ng-bind="request.vendUserName"></span></div>
+				<div>
+					原因:
+					<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0">
+					<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 				</div>
-			</td>
-			<td colspan="1" class="text-center"><span ng-bind="::request.vendUID"></span></td>
-			<td colspan="1" class="text-center">
-				<span ng-bind="::request.custUserName"></span>
-			</td>
-			<td colspan="1" class="text-center">
-				<span ng-bind="request.vendUserName"></span>
-			</td>
-			<td colspan="1" class="text-center">
-				<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0">
-				<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
-			</td>
-			<td colspan="1" class="text-center">
-				<a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>供应商 </a>
-				&nbsp;<a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>客户</a>
+			<td width="200" class="text-center">
+				<a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313">添加供应商 </a><br/>
+				&nbsp;&nbsp;<a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313">添加客户</a>
 				<a  class="btn label-success white" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a>
 				&nbsp;<a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a>
-				<span class="btn label-info white" ng-if="request.statusCode==311 && request.method==1">等待处理</span>
-				<span class="btn label-danger white" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
+				<span class="btn01 btn label-info white" ng-if="request.statusCode==311 && request.method==1">等待处理</span>
+				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
 				<span class="btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
 			</td>
 		</tr>