Browse Source

添加合作伙伴—搜索之后再显示立即邀请的按钮相关信息。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8457 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 years ago
parent
commit
4d58b82576

+ 11 - 9
src/main/webapp/resources/css/index.css

@@ -3207,15 +3207,6 @@ input::-webkit-clear{display:none;}
 	border-bottom: 2px solid #d32526 !important;
 	border-radius: 0 !important;
 }
-/*
-.view-slide-in .tab-active .btn-group .btn-info{
-	border-top: 1px solid #d32526 !important;
-	border-left: 1px solid #d32526 !important;
-	border-right: 1px solid #d32526 !important;
-	margin-top: 10px;
-	background: #fff;
-	border-radius: 0 !important;
-}*/
 .no-record{
 	text-align: center;
 	color: #666;
@@ -3310,4 +3301,15 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 .pro-search .search {
 	margin-top: 26px !important;
+}
+
+/*统一弹出框背景透明度*/
+.bomb-box{
+	background: rgba(0,0,0,.5) !important;
+}
+.purchase .com_title01 a{
+	font-size: 14px;
+}
+.tender-content .tender-list02 dl dd:hover{
+	border: #d32526 2px solid;
 }

+ 23 - 4
src/main/webapp/resources/tpl/index/baseInfo/searchresult.html

@@ -267,13 +267,32 @@
 	font-family: "Microsoft YaHei", "微软雅黑";
 	font-style: normal;
 }
+.invite-btn{
+	display: inline-block;
+	width: 94px;
+	height: 36px;
+	line-height: 36px;
+	border: #d32526 1px solid;
+	color: #d32526;
+	font-size: 14px;
+	text-align: center;
+	margin-right: 38px;
+}
+.invite-btn:hover{
+	border: #d32526 2px solid;
+}
+.invite-text{
+	font-size: 14px;
+	margin-right: 10px;
+	color: #999;
+}
 </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/enMenu.html'"></div>
-<div class="myReuest search-bg condition block">
+<div class="myReuest search-bg condition block" style="margin-bottom: 0;">
 		<div class="row">
 			<div class="col-xs-6">
 				<div class="search">
@@ -288,8 +307,8 @@
 			<div class="col-xs-2">
 				<p>搜索到<em>{{tableParams.total()}}</em>条</p>
 			</div>
-			<div class="col-xs-4">
-				<p><a ng-click="invite(tip)" class="text-inverse" >立即邀请</a><span ng-if="tip != null">({{tip}})注册优软云</span></p>
+			<div class="invite-right col-xs-4">
+				<p ng-if="tip != null" style="float: right;"><span class="invite-text">{{tip}}</span><a ng-click="invite(tip)" class="invite-btn">立即邀请</a></p>
 			</div>
 		</div>
 	</div>
@@ -323,7 +342,7 @@
 		<tr>
 			<td class="text-center" colspan="7">
 				<br>
-				<div class="text-muted"><h3><i class="fa fa-spinner"></i>暂未搜到与({{tip}})相关的企业信息<a ng-click="invite(tip)" class="text-inverse">立即邀请</a>注册优软云</h3></div>
+				<div class="text-muted"><h3><i class="fa fa-spinner"></i>暂未搜到与({{tip}})相关的企业信息<!--<a ng-click="invite(tip)" class="text-inverse">立即邀请</a>注册优软云--></h3></div>
 				<br>
 			</td>
 		</tr>

+ 1 - 1
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -122,7 +122,7 @@
 				</div>
 			</div>
 			<div class="col-xs-4 f12" style="text-align: right;height: 40px;line-height: 40px; margin-right: 20px; float: right;">
-				<a class="text-simple append" ui-sref="fa.apCheckList"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a>&nbsp;&nbsp;&nbsp;
+				<a class="text-simple append" ui-sref="fa.apCheckList" title="新增对账单"><big><img src="static/img/icon/add.png" style="margin-right: 3px;">新增对账单</big></a>&nbsp;&nbsp;&nbsp;
 				<a href="sale/apCheck/allxls?_state={{active}}&searchFilter={{searchFilterXls}}" 
 					target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
 			</div>