企业圈。

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

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

@@ -4059,7 +4059,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 .com-tab-menu ul li a.add-btn{
 	width: 110px;
 	height: 24px;
-	line-height: 24px;
+	line-height: 22px;
 	border: #327ebe 1px solid;
 	border-radius: 5px;
 	color: #327ebe;
@@ -4170,4 +4170,7 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 	background: #f5f5f5;
 	right: -1px;
 	top: 0;
+}
+.line24{
+	line-height: 24px !important;
 }

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

@@ -49,6 +49,12 @@
 	height: 50px;
 	line-height: 50px;
 }
+.order-table .order-hd p{
+	line-height: 34px;
+}
+.order-table .order-hd td{
+	padding-bottom: 10px;
+}
 .order-table .order-hd td.first {
 	padding-left: 20px;
 }
@@ -238,6 +244,9 @@
 	padding: 0;
 	line-height: 24px;
 }
+.order-table .btn:hover{
+	background: #5078cb;
+}
 .order-table .btn01 {
 	color: #327ebe;
 	background: #fff;
@@ -401,7 +410,7 @@
 				<p><span class="btn01 btn label-danger white" ng-if="request.vendor == 1 && request.vendswitch == 0">供应商禁用 状态<a ng-click="activeVend(request.vendorId)">启用</a></span></p>-->
 				<!--<p><span class="btn01 btn label-danger white" ng-if="request.customer == 1 && request.custswitch == 1">客户启用状态<a ng-click="disableCust(request.custId)">禁用</a></span></p>
 				<p><span class="btn01 btn label-danger white" ng-if="request.customer == 1 && request.custswitch == 0">客户禁用状态<a ng-click="activeCust(request.custId)">启用</a></span></p>-->
-				<p ng-if="request.statusCode==313 && request.customer == 0"><a class="btn label-danger white" ng-click="addCust(request.vendUID)">添加客户</a></p>
+				<p ng-if="request.statusCode==313 && request.customer == 0"><a class="line24 btn label-danger white" ng-click="addCust(request.vendUID)">添加客户</a></p>
 				<p ng-if="request.statusCode==311 && request.method==0"><a  class="btn label-success white" ng-click="agree(request.id)">同意</a></p>
 				<p  ng-if="request.statusCode==311 && request.method==0"><a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)">拒绝</a></p>
 				<p ng-if="request.statusCode==311 && request.method==1"><span class="btn01 btn label-info white">待回复</span></p>

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

@@ -364,10 +364,10 @@
             <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 && request.method == 1">已通过</span>
+                <!--<span class="grey01" ng-if="request.statusCode==313 && request.method == 1">已通过</span>
                 <span class="grey01" ng-if="request.statusCode==310 && request.method==1">未通过</span>
                 <span class="grey01" ng-if="request.statusCode==313 && request.method == 0">已同意</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>
@@ -379,9 +379,10 @@
                 <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>
+                <span class="text-icon" ng-if="request.statusCode==313 && request.method == 1">已通过</span>
+                <span class="text-icon" ng-if="request.statusCode==310 && request.method==1">未通过</span>
+                <span class="text-icon" ng-if="request.statusCode==313 && request.method == 0">已同意</span>
+                <span class="text-icon" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>
                 <!-- <div>
                     原因：
                     <input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">

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

@@ -358,7 +358,8 @@
 				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请<br><a ng-click="view(enterprise.name)">立即查看</a></span>
 				<span class="btn01 label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
 				<!-- <br><a ng-click="view(enterprise.name)">立即查看</a> -->
-				<span class="btn label-info" ng-if="enterprise.requestStatus==313">已添加<br><a ng-click="view(enterprise.name)">立即查看</a></span>
+				<span class="btn label-info" ng-if="enterprise.requestStatus==313">已添加</span><br/>
+				<p class="line24" ng-if="enterprise.requestStatus==313"><span class="btn btn-primary" ng-click="view(enterprise.name)" >立即查看</span></p>
 			</td>
 		</tr>
 	</tbody>