Browse Source

企业圈制作修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9324 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 8 years ago
parent
commit
1062ff9adc

+ 301 - 179
src/main/webapp/resources/css/index.css

@@ -51,14 +51,14 @@ a.none:hover {
 
 .empty-block {
 	margin: 0 auto;
-    padding-top: 20px 25px;
-    text-align: center;
-    text-shadow: 0 2px 0 #fff, 0 -2px 0 #f8f6f2;
+	padding-top: 20px 25px;
+	text-align: center;
+	text-shadow: 0 2px 0 #fff, 0 -2px 0 #f8f6f2;
 }
 
 .empty-block i {
-    font-size: 120px;
-    color: #d9d7d3;
+	font-size: 120px;
+	color: #d9d7d3;
 }
 
 .f12 {
@@ -95,7 +95,7 @@ a.none:hover {
 }
 
 .text-blue {
-	color: #327ebe;	
+	color: #327ebe;
 }
 
 .text-inverse {
@@ -182,27 +182,27 @@ a.none:hover {
 
 .text-ellipsis {
 	float: left;
-    width: 260px;
-    clear: left;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;	
+	width: 260px;
+	clear: left;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }
 
 .text-link {
 	color: #5e696e;
-  	cursor: pointer;
-  	text-decoration: underline;
+	cursor: pointer;
+	text-decoration: underline;
 }
 
 .text-title {
 	font-size: 1.2em;
 	font-weight: bold;
-    text-indent: 1em;
-    line-height: 2em;
-    border-bottom: 1px solid #ddd;
-    margin-bottom: 15px;
-    color: #828282
+	text-indent: 1em;
+	line-height: 2em;
+	border-bottom: 1px solid #ddd;
+	margin-bottom: 15px;
+	color: #828282
 }
 
 .form-control {
@@ -214,9 +214,9 @@ a.none:hover {
 }
 
 .form-group-sm .form-control-feedback {
-  	width: 30px;
-  	height: 30px;
-  	line-height: 30px;
+	width: 30px;
+	height: 30px;
+	line-height: 30px;
 }
 
 .btn-default {
@@ -385,7 +385,7 @@ a.none:hover {
 	font-weight: 500 !important;
 	border-bottom: 1px solid #e8e8e8;
 	-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-  	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
+	box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
 }
 
 .ac-chart {
@@ -438,87 +438,87 @@ ul>li.item-link>a {
 }
 
 .throughline {
-  	position: relative;
+	position: relative;
 }
 
 .throughline .line {
 	position: absolute;
- 	border-top: 1px dashed #e5e2e2;
- 	left: 15px;
- 	right: 15px;
-  	top: 10px;
-  	z-index: 0;
+	border-top: 1px dashed #e5e2e2;
+	left: 15px;
+	right: 15px;
+	top: 10px;
+	z-index: 0;
 }
 
 .throughline .content {
 	position: relative;
 	color: #56a022;
 	padding: 0 10px;
-  	margin: 3px 0;
-  	background: #fff;
-  	display: inline-block;
+	margin: 3px 0;
+	background: #fff;
+	display: inline-block;
 }
 
 .stepline {
 	position: relative;
-  	height: 40px;
-  	line-height: 40px;
-  	margin: 40px 0 0;
+	height: 40px;
+	line-height: 40px;
+	margin: 40px 0 0;
 }
 
 .stepline:after, .stepline:before {
-  	background-color: #ddd;
-  	content: "";
-  	height: 2px;
-  	position: absolute;
-  	top: 19px;
-  	width: 50%;
+	background-color: #ddd;
+	content: "";
+	height: 2px;
+	position: absolute;
+	top: 19px;
+	width: 50%;
 }
 
 .stepline:before {
-  	background-image: -webkit-gradient(linear, right top, left top, from(#ddd), to(#fff));
-  	background-image: -webkit-linear-gradient(right, #ddd, #fff);
-  	background-image: -moz-linear-gradient(right, #ddd, #fff);
-  	background-image: -ms-linear-gradient(right, #ddd, #fff);
-  	background-image: -o-linear-gradient(right, #ddd, #fff);
-  	background-image: linear-gradient(right, #ddd, #fff);
-  	left: 0;
+	background-image: -webkit-gradient(linear, right top, left top, from(#ddd), to(#fff));
+	background-image: -webkit-linear-gradient(right, #ddd, #fff);
+	background-image: -moz-linear-gradient(right, #ddd, #fff);
+	background-image: -ms-linear-gradient(right, #ddd, #fff);
+	background-image: -o-linear-gradient(right, #ddd, #fff);
+	background-image: linear-gradient(right, #ddd, #fff);
+	left: 0;
 }
 
 .stepline:after {
-  	background-image: -webkit-gradient(linear, left top, right top, from(#ddd), to(#fff));
-  	background-image: -webkit-linear-gradient(left, #ddd, #fff);
-  	background-image: -moz-linear-gradient(left, #ddd, #fff);
-  	background-image: -ms-linear-gradient(left, #ddd, #fff);
-  	background-image: -o-linear-gradient(left, #ddd, #fff);
-  	background-image: linear-gradient(left, #ddd, #fff);
-  	left: 50%;
+	background-image: -webkit-gradient(linear, left top, right top, from(#ddd), to(#fff));
+	background-image: -webkit-linear-gradient(left, #ddd, #fff);
+	background-image: -moz-linear-gradient(left, #ddd, #fff);
+	background-image: -ms-linear-gradient(left, #ddd, #fff);
+	background-image: -o-linear-gradient(left, #ddd, #fff);
+	background-image: linear-gradient(left, #ddd, #fff);
+	left: 50%;
 }
 
 .stepline .item {
-  	position: relative;
+	position: relative;
 }
 
 .stepline .item span {
-  	position: absolute;
-  	left: 50%;
-  	height: 40px;
-  	width: 40px;
-  	margin-left: -20px;
-  	text-align: center;
-  	background-color: #fff;
-  	border: 2px solid #777;
-  	border-radius: 500px;
-  	color: #777;
-  	font-size: 18px;
-  	font-weight: bold;
-  	z-index: 4;
+	position: absolute;
+	left: 50%;
+	height: 40px;
+	width: 40px;
+	margin-left: -20px;
+	text-align: center;
+	background-color: #fff;
+	border: 2px solid #777;
+	border-radius: 500px;
+	color: #777;
+	font-size: 18px;
+	font-weight: bold;
+	z-index: 4;
 }
 
 .stepline .item .title {
-  	margin-top: 45px;
-  	text-align: center;
-  	line-height: 1.5;
+	margin-top: 45px;
+	text-align: center;
+	line-height: 1.5;
 }
 
 /* top css stylesheet*/
@@ -555,7 +555,7 @@ ul>li.item-link>a {
 
 
 #top ul.navbar-nav>li>a:hover,#top ul.navbar-nav>li>a:focus,#top ul.navbar-nav>li>a:hover *,#top ul.navbar-nav>li>a:focus *
-	{
+{
 	color: #f40;
 }
 
@@ -600,7 +600,7 @@ ul>li.item-link>a {
 }
 
 #top .dropdown-menu .pills ul>li {
-	
+
 }
 
 #top .dropdown-menu .pills ul>li>a {
@@ -701,7 +701,7 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse .navbar-brand:hover,#header.navbar-inverse .navbar-brand:focus
-	{
+{
 	color: #ffffff;
 	background-color: transparent;
 }
@@ -767,7 +767,7 @@ ul>li.item-link>a {
 	padding-left: 10px;
 }
 
-#home-search input::-ms-input-placeholder{ /*Internet Explorer*/ 
+#home-search input::-ms-input-placeholder{ /*Internet Explorer*/
 	padding-left: 10px;
 }
 
@@ -787,66 +787,66 @@ ul>li.item-link>a {
 /**dropdown-menu 样式 start **/
 
 #dropdown-menu-sale {
- 	color: #333333;
- 	font-size: 14px;
- 	height: 164px;
- 	border-bottom: 1px solid #e8e8e8;
- 	margin-top: 10px;
+	color: #333333;
+	font-size: 14px;
+	height: 164px;
+	border-bottom: 1px solid #e8e8e8;
+	margin-top: 10px;
 }
 
 #dropdown-menu-sale img {
-	margin-top: 50%;	
+	margin-top: 50%;
 }
 
 #dropdown-menu-purc {
 	color: #333333;
 	font-size: 14px;
 	height: 86px;
- 	border-bottom: 1px solid #e8e8e8;
- 	margin-top: 20px;
+	border-bottom: 1px solid #e8e8e8;
+	margin-top: 20px;
 }
 
 #dropdown-menu-purc img {
-	margin-top: 15%;	
+	margin-top: 15%;
 }
 
 #dropdown-menu-finance {
 	color: #333333;
 	font-size: 14px;
 	height: 86px;
- 	border-bottom: 1px solid #e8e8e8;
- 	margin-top: 20px;
+	border-bottom: 1px solid #e8e8e8;
+	margin-top: 20px;
 }
 
 #dropdown-menu-finance img {
-	margin-top: 15%;	
+	margin-top: 15%;
 }
 
 #dropdown-menu-report {
 	color: #333333;
 	font-size: 14px;
 	height: 86px;
- 	margin-top: 20px;
+	margin-top: 20px;
 }
 
 #dropdown-menu-report img {
-	margin-top: 15%;	
+	margin-top: 15%;
 }
 
- #home-dropdown:hover>.dropdown-menu {
+#home-dropdown:hover>.dropdown-menu {
 	margin-top: 0;
 	width: 500px;
 }
 /**dropdown-menu 样式 end **/
 
 #header.navbar-inverse .navbar-nav>li>a:hover,#header.navbar-inverse .navbar-nav>li>a:focus
-	{
+{
 	color: #d32526;
 	background-color: #e8e8e8;
 }
 
 #header.navbar-inverse .navbar-nav>.active>a,#header.navbar-inverse .navbar-nav>.active>a:hover,#header.navbar-inverse .navbar-nav>.active>a:focus
-	{
+{
 	color: #d32526;
 	background-color: #e8e8e8;
 	font-color: #d32526;
@@ -854,7 +854,7 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse .navbar-nav>.disabled>a,#header.navbar-inverse .navbar-nav>.disabled>a:hover,#header.navbar-inverse .navbar-nav>.disabled>a:focus
-	{
+{
 	color: #444444;
 	background-color: transparent;
 }
@@ -864,7 +864,7 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse .navbar-toggle:hover,#header.navbar-inverse .navbar-toggle:focus
-	{
+{
 	background-color: #333333;
 }
 
@@ -873,12 +873,12 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse .navbar-collapse,#header.navbar-inverse .navbar-form
-	{
+{
 	border-color: #101010;
 }
 
 #header.navbar-inverse .navbar-nav>.open>a,#header.navbar-inverse .navbar-nav>.open>a:hover,#header.navbar-inverse .navbar-nav>.open>a:focus
-	{
+{
 	background-color: #56a022;
 	color: #ffffff;
 }
@@ -896,12 +896,12 @@ ul>li.item-link>a {
 }
 
 #header.navbar-inverse .btn-link:hover,#header.navbar-inverse .btn-link:focus
-	{
+{
 	color: #ffffff;
 }
 
 #header.navbar-inverse .btn-link[disabled]:hover,#header fieldset[disabled] .navbar-inverse .btn-link:hover,#header.navbar-inverse .btn-link[disabled]:focus,#header fieldset[disabled] .navbar-inverse .btn-link:focus
-	{
+{
 	color: #444444;
 }
 
@@ -987,7 +987,7 @@ ul>li.item-link>a {
 }
 
 .user-image img {
-/* 	border-radius: 5%; */
+	/* 	border-radius: 5%; */
 	border: 1px solid #ccc;
 	width: 124px;
 	height: 124px;
@@ -1225,7 +1225,7 @@ ul>li.item-link>a {
 }
 .todo .todo-content #tips {
 	margin-top: 40px;
-	font-family: Microsoft YaHei, SimHei, Verdana; 
+	font-family: Microsoft YaHei, SimHei, Verdana;
 	font-size: 16px;
 	width: 100%;
 }
@@ -1271,7 +1271,7 @@ ul>li.item-link>a {
 	margin-top: 10px;
 	padding-top: 20px;
 	margin-bottom: 20px;
-	font-family: Microsoft YaHei, SimHei, Verdana; 
+	font-family: Microsoft YaHei, SimHei, Verdana;
 	font-size: 14px;
 	cursor: pointer;
 	border-top: 1px dashed #919090;
@@ -1417,7 +1417,7 @@ ul>li.item-link>a {
 }
 
 .side-image  img {
-	margin-bottom: 15px;	
+	margin-bottom: 15px;
 	/*cursor: pointer;*/
 }
 
@@ -1665,7 +1665,7 @@ ul>li.item-link>a {
 }
 
 .input-sm,.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn
-	{
+{
 	height: 30px;
 	padding: 0 7px;
 	font-size: 12px;
@@ -1674,7 +1674,7 @@ ul>li.item-link>a {
 }
 
 .input-xs,.input-group-xs>.form-control,.input-group-xs>.input-group-addon,.input-group-xs>.input-group-btn>.btn
-	{
+{
 	height: 26px;
 	padding: 0 5px;
 	font-size: 12px;
@@ -1693,7 +1693,7 @@ ul>li.item-link>a {
 
 .form-horizontal .form-group-inline, .form-horizontal .form-group-inline .form-group {
 	margin-left: 0;
-	margin-right: 0	
+	margin-right: 0
 }
 
 .form-horizontal .form-group-inline .input-group {
@@ -1765,7 +1765,7 @@ ul>li.item-link>a {
 .headerline .center {
 	position: absolute;
 	top: -12px;
-	left: 40%; 
+	left: 40%;
 	line-height : 24px;
 	padding: 0 15px;
 	background: #fff;
@@ -1791,21 +1791,21 @@ ul>li.item-link>a {
 }
 
 .user-role>.role-item>.icon{
-  	text-align: center;
-  	color: #333;
-  	padding: 1px 3px;
-  	border-radius: 50%;
-  	border: 1px solid #333;
+	text-align: center;
+	color: #333;
+	padding: 1px 3px;
+	border-radius: 50%;
+	border: 1px solid #333;
 }
 
 .user-role>.role-item>.icon.info{
-  	color: #56a022;
-  	border: 1px solid #56a022;
+	color: #56a022;
+	border: 1px solid #56a022;
 }
 
 .user-role>.role-item>.icon.warning{
-  	color: #8a6d3b;
-  	border: 1px solid #8a6d3b;
+	color: #8a6d3b;
+	border: 1px solid #8a6d3b;
 }
 
 .row-operator {
@@ -1911,18 +1911,18 @@ ul>li.item-link>a {
 	font-size: 16px;
 }
 .role-container>.role-list>.item>.icon{
-  	float: left;
-  	width: 60px;
-  	height: 60px;
-  	line-height: 60px;
-  	text-align: center;
-  	margin-top: 30px;
-  	color: #56a022;
-  	font-size: 52px;
-  	border-radius: 50%;
- 	-webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
-  	box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
-  	background-color: #f3f3f4;
+	float: left;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	text-align: center;
+	margin-top: 30px;
+	color: #56a022;
+	font-size: 52px;
+	border-radius: 50%;
+	-webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
+	box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
+	background-color: #f3f3f4;
 }
 .role-container>.role-list>.item>.icon i{
 	font-size: 36px;
@@ -1960,17 +1960,17 @@ ul>li.item-link>a {
 }
 
 .userrole-list>.item>.icon{
-  	float: left;
-  	width: 60px;
-  	height: 60px;
-  	line-height: 60px;
-  	text-align: center;
-  	color: #56a022;
-  	font-size: 36px;
-  	border-radius: 50%;
- 	-webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
-  	box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
-  	background-color: #f3f3f4;
+	float: left;
+	width: 60px;
+	height: 60px;
+	line-height: 60px;
+	text-align: center;
+	color: #56a022;
+	font-size: 36px;
+	border-radius: 50%;
+	-webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
+	box-shadow: inset 0 0 1px rgba(0, 0, 0, 0.03);
+	background-color: #f3f3f4;
 }
 
 .userrole-list>.item>.desc {
@@ -2047,7 +2047,7 @@ ul>li.item-link>a {
 .role-resources input[type="checkbox"] {
 	margin-right: 5px;
 	height: 16px;
-  	vertical-align: text-bottom;
+	vertical-align: text-bottom;
 	margin-top:	0;
 	cursor: pointer;
 }
@@ -2415,39 +2415,39 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 }
 /*ng-view*/
 .view-slide-in.ng-enter {
-  	transition: all .5s ease;
-  	-webkit-transition:all .5s ease;
-  	-moz-transition: all .5s ease;
-  	-o-transition: all .5s ease;
-  	position: relative;
-  	opacity: 0;
-  	top: 10px;
-  	left: 20px;
+	transition: all .5s ease;
+	-webkit-transition:all .5s ease;
+	-moz-transition: all .5s ease;
+	-o-transition: all .5s ease;
+	position: relative;
+	opacity: 0;
+	top: 10px;
+	left: 20px;
 }
 .view-slide-in.ng-enter.ng-enter-active {
-  	top: 0;
-  	left: 0;
-  	opacity: 1;
+	top: 0;
+	left: 0;
+	opacity: 1;
 }
 .view-slide-in.ng-leave.ng-leave-active{
-  	top: 5px;
-  	left: 5px;
-  	opacity: 1;
+	top: 5px;
+	left: 5px;
+	opacity: 1;
 }
 .view-slide-in.ng-leave{
-  	top: 0;
-  	left: 0;
-  	opacity: 0;
+	top: 0;
+	left: 0;
+	opacity: 0;
 }
 /*search*/
 .search-advance {
 	position: absolute;
 	right: 35px;
 	top: 5px;
-  	line-height: 20px;
-  	visibility: hidden;
-  	white-space: nowrap;
-  	cursor: pointer;
+	line-height: 20px;
+	visibility: hidden;
+	white-space: nowrap;
+	cursor: pointer;
 }
 
 .search-advance.active,input[type="search"]:focus + .search-advance{
@@ -2455,7 +2455,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 }
 
 .has-feedback input[type="search"] {
-  	padding-right: 80px;
+	padding-right: 80px;
 }
 
 #searchContainer {
@@ -2472,7 +2472,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 }
 .warningLg {
 	line-height: 40px;
-    height: 40px;
+	height: 40px;
 	font-family: "Microsoft YaHei", "Hiragino Sans GB";
 	font-weight: 700;
 	font-size: 17px;
@@ -2517,7 +2517,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 	padding: 0;
 	font-size: 16px;
 	color: #000;
- }
+}
 .dropdown-tab .nav-pills>li a:hover{
 	color: #d32526;
 }
@@ -3047,6 +3047,7 @@ input::-webkit-clear{display:none;}
 .myReuest p{
 	font-size: 14px;
 	line-height: 40px;
+	text-align: left;
 }
 .myReuest p em{
 	font-style: inherit;
@@ -3097,7 +3098,7 @@ input::-webkit-clear{display:none;}
 	margin-bottom: 10px;
 }
 #myquest-public .group-container{
-	height: 45px;
+	/*height: 45px;*/
 	padding: 0;
 	background: #fff;
 }
@@ -3113,7 +3114,7 @@ input::-webkit-clear{display:none;}
 }
 #myquest-public .customer-tab .customer-hd span{
 	font-size: 16px;
-	margin-left: 20px;
+	margin-left: 35px;
 }
 .text-left{
 	text-align: left !important;
@@ -3121,6 +3122,7 @@ input::-webkit-clear{display:none;}
 #myquest-public .customer-tab .customer-bd{
 	background: #fff;
 	line-height: 50px;
+	position: relative;
 }
 #myquest-public .customer-tab tbody{
 	border-bottom: #f5f5f5 16px solid;
@@ -3145,23 +3147,26 @@ input::-webkit-clear{display:none;}
 	display: none;
 }
 #myquest-public  .all-btn a{
-	width: 90px;
-	height: 30px;
-	line-height: 30px;
+	width: 70px;
+	height: 24px;
+	line-height: 24px;
 	border-radius: 4px;
 	text-align: center;
-	color: #fff;
+	color: #327ebe;
 	font-size: 14px;
 	display: inline-block;
 	margin: 0 auto;
 	margin-left: 50px;
+	border: #327ebe 1px solid;
 }
 #myquest-public  .all-btn a.btn01{
-	background: #27b6da;
+/*	background: #27b6da;*/
 	margin-bottom: 5px;
 }
 #myquest-public  .all-btn a.btn02{
-	background: #327ebe;
+	/*background: #327ebe;*/
+	border: #27b6da 1px solid;
+	color: #27b6da;
 }
 #myquest-public  .all-btn a:hover{
 	background: #5078cb;
@@ -3245,20 +3250,20 @@ input::-webkit-clear{display:none;}
 	margin: 0;
 }
 .tab-first .row a{
-	width: 190px;
+	width: 180px;
 	display: inline-block;
 	height: 45px;
-	line-height: 40px;
+	line-height: 45px;
 	text-align: center;
-	font-size: 16px;
-	border: #ccc 1px solid;
-	background: #eaeaea;
+	font-size: 18px;
 	float: left;
-	margin-right: 10px;
+	background: #eaeaea;
+	border-top-right-radius: 10px;
+	border-top-left-radius: 10px;
+	margin-right: 5px;
 }
 .tab-first .row a.active{
 	background: #fff;
-	color: #d32526;
 }
 #myquest-public .group-container .btn-group .btn,#myrequest-btn .btn-group .btn{
 	width: 80px;
@@ -3752,7 +3757,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	background: #f47a86;
 }
 .tab-list .tab02 a.a01{
- 	margin-top: 14px;
+	margin-top: 14px;
 }
 .tab-list .tab02 .line02 a,.tab-list .tab02 .line03 a,.tab-list .tab02 .line04 a,.tab-list .tab02 .line05 a,.tab-list .tab02 .line06 a{
 	width: 98px;
@@ -3994,4 +3999,121 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 .pagination>li>a, .pagination>li>span{
 	border: #ccc 1px solid;
+}
+
+/*企业圈新修改*/
+#myquest-public{
+	position: relative;
+}
+.com-tab-menu{
+	margin-top: 18px;
+}
+.com-tab-menu ul{
+	width: 100%;
+	margin: 0 auto;
+}
+.com-tab-menu ul li{
+	float: left;
+	height: 30px;
+	list-style: none;
+	position: relative;
+	padding: 0 30px;
+}
+.com-tab-menu ul li.no-after:after{
+	display: none;
+}
+.com-tab-menu ul li:first-child{
+	padding-left: 0;
+}
+.com-tab-menu ul li:after{
+	content: '';
+	position: absolute;
+	width: 1px;
+	height: 16px;
+	top: 8px;
+	right: 0;
+	display: inline-block;
+	background: #999999;
+}
+.com-tab-menu ul li:last-child:after{
+	display: none;
+}
+.com-tab-menu ul li a{
+	width: 100%;
+	height: 100%;
+	display: inline-block;
+	font-size: 16px;
+	line-height: 30px;
+	padding: 0 10px;
+}
+.com-tab-menu ul li a.add-btn{
+	width: 110px;
+	height: 24px;
+	line-height: 24px;
+	border: #327ebe 1px solid;
+	border-radius: 5px;
+	color: #327ebe;
+	font-size: 14px;
+	text-align: center;
+	padding: 0;
+	margin-top: 6px;
+}
+.com-tab-menu ul li a.add-btn:hover,.com-tab-menu ul li a.add-btn.active{
+	background:#327ebe;
+	color: #fff;
+	border-bottom: none !important;
+}
+.com-tab-menu ul li a.active{
+	border-bottom: #d32526 2px solid!important;
+	color:#d32526 ;
+}
+.form-input .form-group-sm .form-control{
+	height: 36px;
+	line-height: 36px;
+	border: #327ebe 1px solid;
+	border-radius: 0px;
+	font-size: 14px;
+}
+.form-input.search-bg .input-group-addon {
+	width: 85px;
+	height: 36px;
+	display: inline-block;
+	background: #327ebe;
+	font-size: 16px;
+	text-align: center;
+	line-height: 36px;
+	color: #fff;
+	padding: 0;
+	border: none;
+	border-radius: 0;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.form-input.search-bg{
+	margin-top: 15px;
+}
+.filter-list{
+	height: 30px;
+}
+.filter-list span{
+	color: #999;
+}
+.filter-list .input-select{
+	width: 110px;
+}
+.text-icon{
+	display: inline-block;
+	padding: 1px 20px;
+	font-size: 14px;
+	transform: rotate(-10deg);
+	border-radius: 5px;
+	white-space: nowrap;
+	text-align: center;
+	color: #e07b7c;
+	border: #e07b7c 1px solid;
+	position: relative;
+	line-height: inherit !important;
+	position: absolute;
+	right: 177px;
 }

+ 27 - 5
src/main/webapp/resources/tpl/index/baseInfo/addPartnerAndRecord.html

@@ -1,7 +1,7 @@
 <div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
-<div class="margin-bot group-container condition">
+<div class="group-container condition">
     <div class="row" ng-controller="RequestAmountCtrl">
-        <div class="col-xs-6">
+        <!--<div class="col-xs-6">
             <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.newPartner"
@@ -11,17 +11,39 @@
                     <a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.invitation"
                        ng-class="{'btn-info':status=='invitation'}" >邀请注册记录</a>
                 </div>
-                <!--<div class="btn-group btn-group-sm">
+                &lt;!&ndash;<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'}" style="width: 110px;">个人邀请注册记录</a>
                 </div>
                 <div class="btn-group btn-group-sm">
                     <a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.invitationforEn"
                        ng-class="{'btn-info':status=='invitationTeam'}" style="width: 110px;">企业邀请注册记录</a>
-                </div>-->
+                </div>&ndash;&gt;
                 <div class="btn-group btn-group-sm">
                     <a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.partner_searchresult"
-                       ng-class="{'btn-info':status=='add'}" >添加合作伙伴<!-- (<em>5</em>) --></a>
+                       ng-class="{'btn-info':status=='add'}" >添加合作伙伴&lt;!&ndash; (<em>5</em>) &ndash;&gt;</a>
+                </div>
+            </div>
+        </div>-->
+        <div class="com-tab-menu col-xs-6">
+            <ul>
+                <li><a ui-sref="baseInfo.newPartner" ng-class="{'active':status=='partner'}">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a></li>
+                <li class="no-after"><a  ui-sref="baseInfo.invitation" ng-class="{'active':status=='invitation'}" >邀请注册记录</a></li>
+                <li style="padding-left: 0;"><a ui-sref="baseInfo.partner_searchresult" ng-class="{'active':status=='add'}" class="add-btn">+ 添加合作伙伴</a></li>
+            </ul>
+        </div>
+        <div class="form-input col-xs-6 myReuest search-bg">
+            <div class="row">
+                <div class="col-xs-9">
+                    <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="输入企业名称、简称或申请人搜索" />
+                            <a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-3" style="padding-left: 0;">
+                    <p>搜索到<em>{{tableParams.total()}}</em>条</p>
                 </div>
             </div>
         </div>

+ 9 - 6
src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html

@@ -89,14 +89,17 @@
 #myquest-public .customer-tab .customer-hd .checkbox,#myquest-public .customer-tab .customer-hd .checkbox span{
 	margin-left: 0 !important;
 }
+#myquest-public .customer-tab .customer-hd span{
+	margin-left: 20px;
+}
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #f5f5f5;" id="myquest-public">
+<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="pane base-info" id="customer-tab">
-	<form class="form-horizontal">
+	<!--<form class="form-horizontal">
 		<div class="myReuest form-group" style="background: #f5f5f5;">
 			<div class="row">
 				<div class="col-xs-5">
@@ -110,7 +113,7 @@
 				</div>
 			</div>
 		</div>
-	</form>
+	</form>-->
 	<div class="pane-body">
 		<table class="customer-tab table table-bordered table-striped table-hover"
 			ng-table="customerParams">
@@ -128,9 +131,9 @@
 					</tr>
 					<tr class="customer-bd">
 						<td  class="first" colspan="4">
-							<div>企业地址:<span ng-bind="::customer.myEnterprise.enAddress"></span></div>
-							<div>联系人:<span ng-bind="::customer.myUser.userName"></span></div>
-							<div>电话:<span ng-bind="::customer.myUser.userTel"></span></div>
+							<div><span class="text-muted">企业地址:</span><span ng-bind="::customer.myEnterprise.enAddress"></span></div>
+							<div><span class="text-muted">联系人:</span><span ng-bind="::customer.myUser.userName"></span></div>
+							<div><span class="text-muted">电话:</span><span ng-bind="::customer.myUser.userTel"></span></div>
 						</td>
 						<td width="200" class="text-center all-btn">
 						</td>

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

@@ -2,12 +2,19 @@
 	.row a {
 		 text-decoration: none;
 	}
+	.tab-menu{
+		width: 422px;
+		height: 45px;
+		overflow: hidden;
+	}
 </style>
 <div class="tab-first" ng-controller="RequestAmountCtrl">
 	<div class="row">
-		<a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='vendor' || status=='customer' || status=='partner' && active=='done'}" 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.newPartner" class="tab-btn" ng-class="{'active':status=='add' || status=='invitation' && status!='send' && status!='add' || status=='partner' && active == 'all'}">新的合作伙伴</a>
-		<!--<a type="button" ui-sref="baseInfo.partner_searchresult" class="tab-btn" ng-class="{'active':status=='add'}">新的合作伙伴</a>-->
+		<div class="tab-menu">
+			<a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='vendor' || status=='customer' || status=='partner' && active=='done'}" 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.newPartner" class="tab-btn" ng-class="{'active':status=='add' || status=='invitation' && status!='send' && status!='add' || status=='partner' && active == 'all'}">新的合作伙伴</a>
+			<!--<a type="button" ui-sref="baseInfo.partner_searchresult" class="tab-btn" ng-class="{'active':status=='add'}">新的合作伙伴</a>-->
+		</div>
 	</div>
 </div>

+ 19 - 17
src/main/webapp/resources/tpl/index/baseInfo/invitation.html

@@ -94,7 +94,7 @@
 	margin-bottom: 10px;
 }
 #myquest-public .group-container{
-	height: 45px;
+	/*height: 45px;*/
 	padding: 0;
 	background: #fff;
 }
@@ -102,12 +102,12 @@
 	width: 85px;
 }
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #f5f5f5;" id="myquest-public">
+<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/addPartnerAndRecord.html'"></div>
 <link rel="stylesheet" href="static/css/public.css">
 <div id="public" style="background: #f5f5f5;">
 	<div class="condition" style="padding: 0;">
-		<div class="myReuest search-bg condition" >
+		<!--<div class="myReuest search-bg condition" >
 			<div class="row">
 				<div class="col-xs-5">
 					<div class="search">
@@ -121,17 +121,17 @@
 					<p>搜索到<em>{{tableParams.total()}}</em>条</p>
 				</div>
 			</div>
-		</div>
+		</div>-->
 	</div>
 </div>
-<div class="col-xs-12">
-	<div class="input-select col-xs-2">
+<div class="filter-list col-xs-12">
+	<div class="input-select col-xs-2" style="margin-left: 13px;">
 		<input name="self" type="radio" ng-click="setActive('invitation')" ng-checked="active == 'invitation'"/>
-		<span>只看自己</span>
+		<span class="f14">只看自己</span>
 	</div>
 	<div class="input-select col-xs-2">
 		<input  name="all" type="radio" ng-click="setActive('invitationTeam')" ng-checked="active == 'invitationTeam'"/>
-		<span>所有人</span>
+		<span class="f14">所有人</span>
 	</div>
 </div>
 <div class="wrap" id="customer-tab">
@@ -142,24 +142,26 @@
 			<tbody ng-repeat="record in $data">
 					<tr class="customer-hd">
 						<td colspan="4" class="text-left"><span ng-bind="::record.vendname"></span></td>
+						<td class="text-center"><span ng-bind="::record.date| date: 'yyyy-MM-dd'" class="text-muted" style="margin-left: 0;"></span></td>
 					</tr>
 					<tr class="customer-bd">
 						<td  class="first" colspan="4">
-							<div>联系人:<span ng-bind="::record.vendusername"></span></div>
-							<div ng-if="::record.vendusertel != null">电话:<span ng-bind="::record.vendusertel"></span></div>
-							<div ng-if="::record.venduseremail != null">邮箱:<span ng-bind="::record.venduseremail"></span></div>
-							<div>邀请时间:<span ng-bind="::record.date| date: 'yyyy-MM-dd'"></span></div>
-							<div>次数:<span ng-bind="::record.count"></span></div>
-							<div>注册状态:
+							<div class="col-md-2"><span class="text-muted">联系人:</span><span ng-bind="::record.vendusername"></span></div>
+							<div ng-if="::record.vendusertel != null"  class="col-md-3"><span class="text-muted">电话:</span><span ng-bind="::record.vendusertel"></span></div>
+							<div ng-if="::record.venduseremail != null"  class="col-md-3"><span class="text-muted">邮箱:</span><span ng-bind="::record.venduseremail"></span></div>
+							<div class="text-icon" ng-if="record.active == 1">已注册</div>
+							<div class="text-icon" ng-if="record.active == 0" style="border: #327ebe 1px solid; color: #327ebe;">未注册</div>
+							<!--<div><span class="text-muted">次数:</span><span ng-bind="::record.count"></span></div>-->
+							<!--<div><span class="text-muted">注册状态:</span>
 								<span ng-if="record.active == 1">已注册</span>
 								<span ng-if="record.active == 0">未注册<a ng-click="reInvite(record.id)">再次邀请</a></span>
-							</div>
+							</div>-->
 							<!-- <div ng-if="record.active == 0 && record.samecount > 1">
 								提示:当前企业名称匹配到多个企业,<a ng-click="search(record.vendname)">点击查看</a>
 							</div> -->
 						</td>
-						<td width="400" class="text-center all-btn">
-							
+						<td width="200" class="text-center all-btn">
+							<a ng-click="reInvite(record.id)" class="btn" ng-if="record.active == 0" style="padding: 0; background: #327ebe; color: #fff;">再次添加</a>
 						</td>
 					</tr>
 			</tbody>

+ 18 - 14
src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -138,7 +138,7 @@
 	/*margin-top: 20px;*/
 }
 .view-slide-in .block {
-	background: #f5f5f5;
+	background: #fff;
 }
 .view-slide-in .group-container {
 	background: #fff;
@@ -216,7 +216,7 @@
 	border-bottom: 20px solid #f5f5f5;
 }
 .order-table .order-hd span.margin-left20 {
-	margin-left: 20px;
+	margin-left: 35px;
 }
 .order-table .product {
 	line-height: 25px;
@@ -231,12 +231,12 @@
 	text-align: center;
 }
 .order-table .btn {
-	width: 90px;
-	height: 30px;
+	min-width: 70px;
+	height: 24px;
 	color: #fff;
 	border-radius: 4px;
 	padding: 0;
-	line-height: 30px;
+	line-height: 24px;
 }
 .order-table .btn01 {
 	color: #327ebe;
@@ -271,6 +271,7 @@
 }
 .order-table>tbody{
 	border-bottom: #f5f5f5 16px solid !important;
+	/*border: #f5f5f5 16px solid !important;*/
 }
 .label-success {
 	background: #27b6da;
@@ -284,6 +285,9 @@
 .new-dot{
 	top: 15px;
 }
+.order-table .company-list, .order-table .order-hd:first-child{
+	border-top:#e8e8e8 1px solid;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;" id="myquest-public">
 <div class="loading in" ng-class="{'in': loading}">
@@ -314,7 +318,7 @@
 			</div>
 	</div>
 </div> -->
-<div class="myReuest search-bg condition block">
+<!--<div class="myReuest search-bg">
 		<div class="row">
 			<div class="col-xs-5">
 				<div class="search">
@@ -327,22 +331,22 @@
 			<div class="col-xs-4">
 				<p>搜索到<em>{{tableParams.total()}}</em>条</p>
 			</div>
-			<!--<div class="col-xs-3">
+			&lt;!&ndash;<div class="col-xs-3">
 				<div class="btn-group btn-group-sm">
 					<a href="#/baseInfo/partner" class="add"><img src="static/img/icon/add.png">添加合作伙伴</a>
 				</div>
-			</div>-->
+			</div>&ndash;&gt;
 		</div>
-</div>
+</div>-->
 <table class="order-table block" ng-table="tableParams">
 	<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" style="position: relative;"><span ng-bind="request.vendName" class="margin-left20"></span><b class="new-dot" ng-if="request.statusCode==311 && request.method==0"></b><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
 			<td width="200" class="text-center">
 				<!--<span class="grey01" ng-if="request.statusCode==311 && request.method==1">等待处理</span>-->
-				<span class="grey01" ng-if="request.statusCode==313">已通过</span>
+				<!--<span class="grey01" ng-if="request.statusCode==313">已通过</span>
 				<span class="grey01" ng-if="request.statusCode==310 && request.method==1">未通过</span>
-				<span class="grey01" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>
+				<span class="grey01" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>-->
 			</td>
 			<!--<td width="200" class="grey01" ng-if="request.statusCode==311 && request.method==1">等待处理</td>
 			<td width="200" class="grey01" ng-if="request.statusCode==313">已通过</td>
@@ -351,9 +355,9 @@
 		</tr>
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
 			<td class="first" colspan="4">
-				<div>营业执照:<span ng-bind="::request.vendUID"></span></div>
-				<div>申请人:<span ng-bind="::request.custUserName"></span></div>
-				<div ng-if="::request.vendUserName != null">审核人:<span ng-bind="::request.vendUserName"></span></div>
+				<div class="col-md-4"><span class="text-muted">营业执照:</span><span ng-bind="::request.vendUID"></span></div>
+				<div class="col-md-2"><span class="text-muted">申请人:</span><span ng-bind="::request.custUserName"></span></div>
+				<div ng-if="::request.vendUserName != null" class="col-md-2"><span class="text-muted">审核人:</span><span ng-bind="::request.vendUserName"></span></div>
 				<!-- <div>
 					原因:
 					<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">

+ 21 - 12
src/main/webapp/resources/tpl/index/baseInfo/newPartner.html

@@ -138,7 +138,7 @@
         /*margin-top: 20px;*/
     }
     .view-slide-in .block {
-        background: #f5f5f5;
+        background: #fff;
     }
     .view-slide-in .group-container {
         background: #fff;
@@ -216,7 +216,7 @@
         border-bottom: 20px solid #f5f5f5;
     }
     .order-table .order-hd span.margin-left20 {
-        margin-left: 20px;
+        margin-left: 35px;
     }
     .order-table .product {
         line-height: 25px;
@@ -231,12 +231,12 @@
         text-align: center;
     }
     .order-table .btn {
-        width: 90px;
-        height: 30px;
+        width: 70px;
+        height: 24px;
         color: #fff;
         border-radius: 4px;
         padding: 0;
-        line-height: 30px;
+        line-height: 24px;
     }
     .order-table .btn01 {
         color: #327ebe;
@@ -284,6 +284,12 @@
     .new-dot{
         top: 15px;
     }
+    .order-table thead{
+        display: none;
+    }
+    .order-table .company-list, .order-table .order-hd:first-child{
+        border-top:#e8e8e8 1px solid;
+    }
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;" id="myquest-public">
     <div class="loading in" ng-class="{'in': loading}">
@@ -314,7 +320,7 @@
                 </div>
         </div>
     </div> -->
-    <div class="myReuest search-bg condition block">
+   <!-- <div class="myReuest search-bg condition block">
         <div class="row">
             <div class="col-xs-5">
                 <div class="search">
@@ -327,13 +333,13 @@
             <div class="col-xs-4">
                 <p>搜索到<em>{{tableParams.total()}}</em>条</p>
             </div>
-            <!--<div class="col-xs-3">
+            &lt;!&ndash;<div class="col-xs-3">
                 <div class="btn-group btn-group-sm">
                     <a href="#/baseInfo/partner" class="add"><img src="static/img/icon/add.png">添加合作伙伴</a>
                 </div>
-            </div>-->
+            </div>&ndash;&gt;
         </div>
-    </div>
+    </div>-->
     <table class="order-table block" ng-table="tableParams">
         <tbody ng-repeat="request in $data | orderBy :'method'" class="company-list">
         <tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
@@ -352,9 +358,12 @@
         </tr>
         <tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
             <td class="first" colspan="4">
-                <div>营业执照:<span ng-bind="::request.vendUID"></span></div>
-                <div>申请人:<span ng-bind="::request.custUserName"></span></div>
-                <div ng-if="::request.vendUserName != null">审核人:<span ng-bind="::request.vendUserName"></span></div>
+                <div class="col-md-4"><span class="text-muted">营业执照:</span><span ng-bind="::request.vendUID"></span></div>
+                <div class="col-md-2"><span class="text-muted">申请人:</span><span ng-bind="::request.custUserName"></span></div>
+                <div ng-if="::request.vendUserName != null" class="col-md-2"><span class="text-muted">审核人:</span><span ng-bind="::request.vendUserName"></span></div>
+                <div class="text-icon" ng-if="request.statusCode==313">已同意</div>
+                <div class="text-icon" ng-if="request.statusCode==310 && request.method==1">未通过</div>
+                <div class="text-icon" ng-if="request.statusCode==310 && request.method==0">已拒绝</div>
                 <!-- <div>
                     原因:
                     <input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">

+ 15 - 12
src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -146,7 +146,7 @@
 }
 /*	增加样式*/
 .view-slide-in .block{
-	background: #f5f5f5;
+	background: #fff;
 }
 .view-slide-in .group-container{
 	background: #fff;
@@ -233,12 +233,12 @@
 	font-size: 14px;
 	}
 .enterprise-table .btn{
-	width: 90px;
-	height: 30px;
+	width: 70px;
+	height: 24px;
 	color: #fff;
 	border-radius: 4px;
 	padding: 0;
-	line-height: 30px;
+	line-height: 24px;
 }
 .enterprise-table .btn01{
 	color: #327ebe;
@@ -287,13 +287,16 @@
 	margin: 0 8px;
 	font-style: italic;
 }
+.enterprise-table .company-list, .enterprise-table .enterprise-hd{
+	border-top:#e8e8e8 1px solid;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div ng-include src="'static/tpl/index/baseInfo/addPartnerAndRecord.html'"></div>
-<div class="myReuest search-bg condition block" style="margin-bottom: 0;">
+<!--<div class="myReuest search-bg condition block" style="margin-bottom: 0;">
 		<div class="row">
 			<div class="col-xs-5">
 				<div class="search">
@@ -312,7 +315,7 @@
 				<p ng-if="tip != null && tableParams.total() > 0" style="float: right;"><a ng-click="invite(tip)" class="text-inverse">立即邀请</a><span class="invite-text">{{tip}}</span>注册优软云</p>
 			</div>
 		</div>
-	</div>
+	</div>-->
 <table class="enterprise-table block" ng-table="tableParams">
 	<tbody ng-repeat="enterprise in $data" class="company-list">
 		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
@@ -322,13 +325,13 @@
 		</tr>
 		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
 			<td class="product" colspan="4">
-				<div class="">营业执照:<span ng-bind="::enterprise.businessCode" ></span></div>
-				<div class="" ng-if="::enterprise.industry != null">企业类型:<span class="text-muted" ng-bind="::enterprise.industry"></span></div>
-				<div class="" ng-if="::enterprise.address != null">企业地址:<span class="text-muted" ng-bind="::enterprise.address"></span></div>
+				<div class=""><span class="text-muted">营业执照:</span><span ng-bind="::enterprise.businessCode" ></span></div>
+				<div class="" ng-if="::enterprise.industry != null"><span class="text-muted">企业类型:</span><span class="text-muted" ng-bind="::enterprise.industry"></span></div>
+				<div class="" ng-if="::enterprise.address != null"><span class="text-muted">企业地址:</span><span class="text-muted" ng-bind="::enterprise.address"></span></div>
 				<div class="">
-					<span  ng-if="::enterprise.adminName != null">管理员:<em ng-bind-html="::enterprise.adminName| getkey:keyword"></em></span>
-					<span ng-if="::enterprise.adminTel != null">电话:{{::enterprise.adminTel}}</span>
-					<span ng-if="::enterprise.adminEmail != null">邮箱:{{::enterprise.adminEmail}}</span>
+					<span  ng-if="::enterprise.adminName != null"><span class="text-muted">管理员:</span><em ng-bind-html="::enterprise.adminName| getkey:keyword"></em></span>
+					<span ng-if="::enterprise.adminTel != null"><span class="text-muted">电话:</span>{{::enterprise.adminTel}}</span>
+					<span ng-if="::enterprise.adminEmail != null"><span class="text-muted">邮箱:</span>{{::enterprise.adminEmail}}</span>
 				</div>
 			</td>
 			<td width="100" class="text-center">

+ 26 - 4
src/main/webapp/resources/tpl/index/baseInfo/vendorAndCustomer.html

@@ -1,11 +1,11 @@
 <div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
-<div class="margin-bot group-container condition">
+<div class="group-container condition">
 	<div class="row" ng-controller="RequestAmountCtrl">
-		<div class="col-xs-6">
+		<!--<div class="col-xs-6">
 			<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;margin-left: 18%;">全部合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
+					   ng-class="{'btn-info':status=='partner'}">全部合作伙伴<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"
@@ -13,7 +13,29 @@
 				</div>
 				<div class="btn-group btn-group-sm">
 					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.customerInfo"
-						ng-class="{'btn-info':status=='customer'}" >客户<!-- (<em>5</em>) --></a>
+						ng-class="{'btn-info':status=='customer'}" >客户&lt;!&ndash; (<em>5</em>) &ndash;&gt;</a>
+				</div>
+			</div>
+		</div>-->
+		<div class="com-tab-menu col-xs-6">
+			<ul>
+				<li><a ui-sref="baseInfo.myRequest" ng-class="{'active':status=='partner'}">全部合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0" style="top:0;"></b></a></li>
+				<li><a  ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor'}" >供应商</a></li>
+				<li><a ui-sref="baseInfo.customerInfo" ng-class="{'active':status=='customer'}" >客户</a></li>
+			</ul>
+		</div>
+		<div class="form-input col-xs-6 myReuest search-bg">
+			<div class="row">
+				<div class="col-xs-9">
+					<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="输入企业名称、简称或申请人搜索" />
+							<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-3" style="padding-left: 0;">
+					<p>搜索到<em>{{tableParams.total()}}</em>条</p>
 				</div>
 			</div>
 		</div>

+ 11 - 8
src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html

@@ -94,7 +94,7 @@
 	margin-bottom: 10px;
 }
 #myquest-public .group-container{
-	height: 45px;
+	/*height: 45px;*/
 	padding: 0;
 	background: #fff;
 }
@@ -104,13 +104,16 @@
 #myquest-public .customer-tab .customer-hd .checkbox,#myquest-public .customer-tab .customer-hd .checkbox span{
 	margin-left: 0 !important;
 }
+#myquest-public .customer-tab .customer-hd span{
+	margin-left: 20px;
+}
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #f5f5f5;" id="myquest-public">
+<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
 <div ng-include src="'static/tpl/index/baseInfo/vendorAndCustomer.html'"></div>
 <link rel="stylesheet" href="static/css/public.css">
-<div id="public" style="background: #f5f5f5;">
+<div id="public">
 	<div class="condition" style="padding: 0;">
-		<div class="myReuest search-bg condition" >
+		<!--<div class="myReuest search-bg condition" >
 			<div class="row">
 				<div class="col-xs-5">
 					<div class="search">
@@ -124,7 +127,7 @@
 					<p>搜索到<em>{{total}}</em>条</p>
 				</div>
 			</div>
-		</div>
+		</div>-->
 	</div>
 </div>
 <div class="wrap" id="customer-tab">
@@ -146,9 +149,9 @@
 					</tr>
 					<tr class="customer-bd">
 						<td  class="first" colspan="4">
-							<div>企业地址:<span ng-bind="::vendor.vendorEnterprise.enAddress"></span></div>
-							<div>联系人:<span ng-bind="::vendor.vendorUser.userName"></span></div>
-							<div>电话:<span ng-bind="::vendor.vendorUser.userTel"></span></div>
+							<div><span class="text-muted">企业地址:</span><span ng-bind="::vendor.vendorEnterprise.enAddress"></span></div>
+							<div><span class="text-muted">联系人:</span><span ng-bind="::vendor.vendorUser.userName"></span></div>
+							<div><span class="text-muted">电话:</span><span ng-bind="::vendor.vendorUser.userTel"></span></div>
 						</td>
 						<td width="200" class="text-center all-btn">
 							<a ng-if="vendor.vendswitch == 1" href="#/purc/purcinquiry/{{vendor.vendorEnterprise.enBussinessCode}}" class="btn01">立即询价</a><br/>