Browse Source

人员信息调整、企业信息加上2个链接、

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

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

@@ -1811,7 +1811,7 @@ ul>li.item-link>a {
 	height: 0;
 	height: 0;
 	line-height: 30px;
 	line-height: 30px;
 	padding: 0 10px;
 	padding: 0 10px;
-	top: 0;
+	top: 12px;
 	left: 100%;
 	left: 100%;
 	background-color: #333;
 	background-color: #333;
 	border-radius: 0 3px 3px 0;
 	border-radius: 0 3px 3px 0;
@@ -3264,4 +3264,9 @@ input::-webkit-clear{display:none;}
 }
 }
 .order-table .product .text-muted{
 .order-table .product .text-muted{
 	word-break: break-all;
 	word-break: break-all;
-}
+}
+
+/*hover移上去2px 2017-05-09*/
+.tender-list02 .comment-oder:hover,.tender-list dl dd:hover{
+	border: #d32526 2px solid !important;
+}

+ 1 - 1
src/main/webapp/resources/tpl/index/account/addExistUser.html

@@ -21,7 +21,7 @@
 
 
 <div class="modal-body">
 <div class="modal-body">
 	<form class="form-inline" name="searchForm">
 	<form class="form-inline" name="searchForm">
-		<div class="form-group" style="padding-left:60px; ">
+		<div class="form-group" style="padding-left:60px;padding-top: 15px;">
 			<label>查找用户:</label>
 			<label>查找用户:</label>
 			 <input
 			 <input
 				style="width: 300px;" type="text" class="form-control"
 				style="width: 300px;" type="text" class="form-control"

+ 2 - 2
src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -551,8 +551,8 @@
 	<div class="com_title01"><span>你拥有的服务</span></div>
 	<div class="com_title01"><span>你拥有的服务</span></div>
 	<div class="pane-body">
 	<div class="pane-body">
 		<div class="row">
 		<div class="row">
-			<div class="col-xs-6"><a href="#" class="bule">B2B商务平台</a></div>
-			<div class="col-xs-6"><a href="#" class="bule">优软商城</a></div>
+			<div class="col-xs-6"><a href="http://uas.ubtob.com/#/index" class="bule">B2B商务平台</a></div>
+			<div class="col-xs-6"><a href="http://mall.ubtob.com/#/index" class="bule" target="_blank">优软商城</a></div>
 		</div>
 		</div>
 	</div>
 	</div>
 	<div class="save-btn">
 	<div class="save-btn">

+ 9 - 3
src/main/webapp/resources/tpl/index/approvalFlow/user.html

@@ -167,6 +167,12 @@
 	.modal-body{
 	.modal-body{
 		padding-top: 0;
 		padding-top: 0;
 	}
 	}
+.table-default .header{
+	box-shadow: none;
+}
+#order-detail-list .table-default th, #order-detail-list .table-default td{
+	border-top: none;
+}
 </style>
 </style>
 <div class="loading in" ng-class="{'in': loading}">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 	<i></i>
@@ -241,7 +247,7 @@
 		</form>
 		</form>
 	</div>
 	</div>
 </div>
 </div>
-<div class="pane base-info">
+<div class="pane base-info" style="border-bottom: none;">
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 		<span class="f14">我的客户</span>
 		<span class="f14">我的客户</span>
 		<div class="pull-right">
 		<div class="pull-right">
@@ -249,7 +255,7 @@
 		</div>
 		</div>
 	</div>
 	</div>
 	<div class="pane-body" id="order-detail-list">
 	<div class="pane-body" id="order-detail-list">
-		<table class="block table table-default table-striped">
+		<table class="block table table-default table-striped" style="margin-bottom: 0;">
 			<tr class="header" style="height: 40px;">
 			<tr class="header" style="height: 40px;">
 				<th width="90">UU</th>
 				<th width="90">UU</th>
 				<th width="120">企业名称</th>
 				<th width="120">企业名称</th>
@@ -308,7 +314,7 @@
     </script>
     </script>
 <div class="pane base-info">
 <div class="pane base-info">
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
 	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-		<span class="f14">我的客户</span>
+		<span class="f14">企业人员信息</span>
 		<div class="pull-right" ng-show="user.sys">
 		<div class="pull-right" ng-show="user.sys">
 			<a title="新增用户默认密码为111111" ng-show="adding == true" class="btn btn-success btn-sm" ng-disabled="newUserForm.$invalid" ng-click="addUser(newUser)" class="text-simple" style="color: #fff;">
 			<a title="新增用户默认密码为111111" ng-show="adding == true" class="btn btn-success btn-sm" ng-disabled="newUserForm.$invalid" ng-click="addUser(newUser)" class="text-simple" style="color: #fff;">
 				<i class="fa fa-user-plus fa-fw"></i>
 				<i class="fa fa-user-plus fa-fw"></i>