Browse Source

处理bug

Administrator 7 years ago
parent
commit
32017999c0
36 changed files with 194 additions and 148 deletions
  1. 2 1
      src/main/webapp/resources/css/add.css
  2. 26 9
      src/main/webapp/resources/css/index.css
  3. BIN
      src/main/webapp/resources/img/home/UU.png
  4. 14 6
      src/main/webapp/resources/tpl/index/baseInfo/customersInfo.html
  5. 1 1
      src/main/webapp/resources/tpl/index/baseInfo/enterpriseList.html
  6. 1 13
      src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html
  7. 1 1
      src/main/webapp/resources/tpl/index/baseInfo/invitation.html
  8. 1 1
      src/main/webapp/resources/tpl/index/baseInfo/modal/fuzzysearch_enterprise_modal.html
  9. 14 6
      src/main/webapp/resources/tpl/index/baseInfo/myRequest.html
  10. 11 3
      src/main/webapp/resources/tpl/index/baseInfo/newPartner.html
  11. 15 8
      src/main/webapp/resources/tpl/index/baseInfo/searchresult.html
  12. 14 6
      src/main/webapp/resources/tpl/index/baseInfo/servicerInfo.html
  13. 14 6
      src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html
  14. 5 0
      src/main/webapp/resources/tpl/index/home/left.html
  15. 12 10
      src/main/webapp/resources/tpl/index/home/right.html
  16. 2 2
      src/main/webapp/resources/tpl/index/purc/deputyOrder.html
  17. 5 2
      src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html
  18. 3 3
      src/main/webapp/resources/tpl/index/purc/inquiry.html
  19. 2 2
      src/main/webapp/resources/tpl/index/purc/order.html
  20. 3 3
      src/main/webapp/resources/tpl/index/purc/pubInquiry.html
  21. 10 16
      src/main/webapp/resources/tpl/index/purc/saved_tender.html
  22. 10 16
      src/main/webapp/resources/tpl/index/purc/tender.html
  23. 2 2
      src/main/webapp/resources/tpl/index/purc/tender_answer_list.html
  24. 1 5
      src/main/webapp/resources/tpl/index/purc/tenderlist.html
  25. 2 1
      src/main/webapp/resources/tpl/index/sale/accept_detail.html
  26. 1 1
      src/main/webapp/resources/tpl/index/sale/inquiry.html
  27. 2 1
      src/main/webapp/resources/tpl/index/sale/inquiry_detail.html
  28. 1 1
      src/main/webapp/resources/tpl/index/sale/inquiry_list.html
  29. 1 13
      src/main/webapp/resources/tpl/index/sale/open_tender_detail.html
  30. 1 1
      src/main/webapp/resources/tpl/index/sale/opentenderlist.html
  31. 1 1
      src/main/webapp/resources/tpl/index/sale/quotation.html
  32. 5 1
      src/main/webapp/resources/tpl/index/sale/quotation_list.html
  33. 5 1
      src/main/webapp/resources/tpl/index/sale/quotation_new.html
  34. 2 1
      src/main/webapp/resources/tpl/index/sale/return_detail.html
  35. 2 2
      src/main/webapp/resources/tpl/index/sale/tender_question_list.html
  36. 2 2
      src/main/webapp/resources/tpl/index/sale/tenderlist.html

+ 2 - 1
src/main/webapp/resources/css/add.css

@@ -1267,12 +1267,13 @@ input:focus, select:focus {
 
 .com_head span.fr {
     margin-right: 20px;
-    color: #959595;
+    color: #fff;
 }
 
 .com_head span.fr em {
     margin-right: 50px;
     font-size: 14px;
+    color:#fff;
 }
 
 .pro-add-tab dl dd select {

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

@@ -1566,7 +1566,7 @@ ul>li.item-link>a {
 	margin-left: 3px;
 }
 .feed-wrap .pane:first-child ,.feed-wrap .pane:nth-child(2){
-	height: 272px;
+	height: 275px;
 }
 .pane .pane-body {
 	padding: 10px;
@@ -3017,20 +3017,39 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	color: #fff;
 	font-size: 18px;
 }
-.pub-com_head  .p-right{
+.pub-com_head .p-right{
 	float: right;
 }
-.pub-com_head  .p-right a{
+.pub-com_head .p-right a{
 	color: #fff !important ;
 	font-size: 14px;
 	margin-right: 20px;
 }
-.pub-com_head  .p-right a img{
+.pub-com_head .p-right a img{
 	margin-right: 3px;
 }
-.pub-com_head  .p-right a:hover{
+.pub-com_head .p-right a:hover{
 	text-decoration: underline;
 }
+.pub-com_head .p-right em{
+	font-style:normal;
+	font-size: 14px;
+	margin-right: 20px;
+}
+.pub-com_head .p-right time{
+	font-size: 14px;
+	margin-right: 20px;
+}
+
+.com_head span.fr em{
+	font-style:normal;
+	font-size: 14px;
+	margin-right: 20px;
+}
+.com_head span.fr time{
+	font-size: 14px;
+	margin-right: 20px;
+}
 
 .load_icon {
 	display:inline-block;
@@ -3084,9 +3103,7 @@ input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
 	font-size: 14px;
 	color:#666;
 }
-#empty .right_link p span{}
 #empty .right_link a{
-	margin-left:10px;
 	color:#366df3;
 	font-size: 14px;
 }
@@ -3409,7 +3426,7 @@ input::-webkit-clear{display:none;}
 	line-height: 40px;
 }
 .wid_1170{
-	margin-left: -240px;
+	/*margin-left: -240px;*/
 	width: 1170px;
 }
 .myReuest .col-xs-4{
@@ -3532,7 +3549,7 @@ input::-webkit-clear{display:none;}
 	background: #f5f5f5;
 	text-align: center;
 	width: 1170px;
-	margin-left: -240px;
+	/*margin-left: -240px;*/
 }
 .sreach-index .form-control{
 	height: 36px;

BIN
src/main/webapp/resources/img/home/UU.png


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

@@ -113,7 +113,7 @@
 	border-bottom: none;
 }
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
+<div style="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>
@@ -199,11 +199,19 @@
 					</tr>
 			</tbody>
 			<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
-				<tr>
-					<td>
-						<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂无客户信息</h3></div>
-					</td>
-				</tr>
+			<tr>
+				<td colspan="5">
+					<div id="empty">
+						<div class="left_img">
+							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						</div>
+						<div class="right_link">
+							<p>暂无客户信息</p>
+						</div>
+					</div>
+				</td>
+			</tr>
 			</tbody>
 		</table>
 		</div>

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

@@ -257,7 +257,7 @@
 	position: relative;
 }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;">
+<div class="block" style="width: 1170px;">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>

+ 1 - 13
src/main/webapp/resources/tpl/index/baseInfo/inquiryItem_detail.html

@@ -443,21 +443,9 @@ input[type="radio"], input[type="checkbox"] {
    .purc-tender .col-xs-4 div:last-child{
        color: #969595;
    }
-    .p-right em{
-        font-style: normal;
-    }
-    .p-right .fr{
-        font-size: 14px;
-        color: #959595;
-        margin-right: 20px;
-    }
-    .p-right span.fr em {
-        margin-right: 50px;
-        font-size: 14px;
-    }
     .detail{
         width: 1170px;
-        margin-left: -240px;
+        /*margin-left: -240px;*/
         background: #fff;
         padding:30px 20px;
     }

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

@@ -119,7 +119,7 @@
 	border-bottom: none;
 }
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
+<div style="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;">

+ 1 - 1
src/main/webapp/resources/tpl/index/baseInfo/modal/fuzzysearch_enterprise_modal.html

@@ -288,7 +288,7 @@
 	font-style: italic;
 }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;">
+<div class="block" style="width: 1170px;">
 <table class="enterprise-table block">
 	<tbody ng-repeat="enterprise in enterprises" class="company-list">
 		<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">

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

@@ -334,7 +334,7 @@
 	/*background: #f5f5f5;*/
 }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;" id="myquest-public">
+<div class="block" style="width: 1170px;" id="myquest-public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
@@ -414,11 +414,19 @@
 		</tr>
 	</tbody>
 	<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
-		<tr>
-			<td>
-				<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂无合作伙伴!</h3></div>
-			</td>
-		</tr>
+	<tr>
+		<td colspan="5">
+			<div id="empty">
+				<div class="left_img">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+				</div>
+				<div class="right_link">
+					<p>暂无合作伙伴</p>
+				</div>
+			</div>
+		</td>
+	</tr>
 	</tbody>
 </table>
 </div>

+ 11 - 3
src/main/webapp/resources/tpl/index/baseInfo/newPartner.html

@@ -332,7 +332,7 @@
         background: #f5f5f5;
     }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;" id="myquest-public">
+<div class="block" style="width: 1170px;" id="myquest-public">
     <div class="loading in" ng-class="{'in': loading}">
         <i></i>
     </div>
@@ -423,8 +423,16 @@
         </tbody>
         <tbody ng-if="tableParams.total() == 0" class="no-record-tab">
         <tr>
-            <td>
-                <div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂无合作伙伴!</h3></div>
+            <td colspan="5">
+                <div id="empty">
+                    <div class="left_img">
+                        <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                        <a href="#/index" title="B2B商务首页">B2B 商务</a>
+                    </div>
+                    <div class="right_link">
+                        <p>暂无合作伙伴</p>
+                    </div>
+                </div>
             </td>
         </tr>
         </tbody>

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

@@ -302,7 +302,7 @@
 	background: #f5f5f5;
 }
 </style>
-<div class="block" style="margin-left: -240px; width: 1170px;border: #e8e8e8 1px solid;border-top: none;">
+<div class="block" style="width: 1170px;border: #e8e8e8 1px solid;border-top: none;">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
@@ -372,13 +372,20 @@
 		</tr>
 	</tbody>
 	<tbody ng-if="tableParams.total() == 0" class="no-record-tab">
-		<tr>
-			<td class="text-center" colspan="7">
-				<br>
-				<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂未搜到与({{tip}})相关的企业信息<a ng-click="invite(tip)" class="text-inverse">立即邀请</a>注册优软云</h3></div>
-				<br>
-			</td>
-		</tr>
+	<tr>
+		<td colspan="7">
+			<div id="empty">
+				<div class="left_img">
+					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+					<a href="#/index" title="B2B商务首页">B2B 商务</a>
+				</div>
+				<div class="right_link">
+					<p>暂未搜到与({{tip}})相关的企业信息</p>
+					<a ng-click="invite(tip)"><i class="way_icon"></i>立即邀请注册优软云</a>
+				</div>
+			</div>
+		</td>
+	</tr>
 	</tbody>
 </table>
 </div>

+ 14 - 6
src/main/webapp/resources/tpl/index/baseInfo/servicerInfo.html

@@ -130,7 +130,7 @@
 	border-bottom: none;
 }
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
+<div style="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">
@@ -216,11 +216,19 @@
 					</tr>
 			</tbody>
 			<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
-				<tr>
-					<td>
-						<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂无服务商信息</h3></div>
-					</td>
-				</tr>
+			<tr>
+				<td colspan="5">
+					<div id="empty">
+						<div class="left_img">
+							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						</div>
+						<div class="right_link">
+							<p>暂无服务商信息</p>
+						</div>
+					</div>
+				</td>
+			</tr>
 			</tbody>
 		</table>
 	</div>

+ 14 - 6
src/main/webapp/resources/tpl/index/baseInfo/vendorsInfo.html

@@ -130,7 +130,7 @@
 	border-bottom: none;
 }
 </style>
-<div style="margin-left: -240px; width: 1170px; background: #fff;" id="myquest-public">
+<div style="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">
@@ -218,11 +218,19 @@
 					</tr>
 			</tbody>
 			<tbody ng-if="customerParams.total() == 0" class="no-record-tab">
-				<tr>
-					<td>
-						<div class="text-muted"><h3><img src="static/img/icon/no-record.png" />暂无供应商信息</h3></div>
-					</td>
-				</tr>
+			<tr>
+				<td colspan="5">
+					<div id="empty">
+						<div class="left_img">
+							<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+							<a href="#/index" title="B2B商务首页">B2B 商务</a>
+						</div>
+						<div class="right_link">
+							<p>暂无供应商信息</p>
+						</div>
+					</div>
+				</td>
+			</tr>
 			</tbody>
 		</table>
 	</div>

+ 5 - 0
src/main/webapp/resources/tpl/index/home/left.html

@@ -92,6 +92,11 @@
 		height: 200px;
 		border: #e8e8e8 1px solid;
 		border-radius: 5px;
+		overflow: hidden;
+		box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 	}
 	.feed-wrap .pane .pane-body{
 		height: 158px;

+ 12 - 10
src/main/webapp/resources/tpl/index/home/right.html

@@ -11,20 +11,22 @@
 		margin: 0 auto;
 	}
 	.toto-menu .row{
-		margin: 0 0 20px;
+		margin: 0 0 15px;
 		width: 755px;
 		border: #e8e8e8 1px solid;
 		background: #fff;
-		box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-		-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-		-o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-		-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
+		border-radius: 5px;
+		overflow: hidden;
+		box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+		-moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 	}
 	.toto-menu .row .header{
 		padding-left: 10px;
 		width: 100%;
-		height: 35px;
-		line-height: 35px;
+		height: 40px;
+		line-height: 40px;
 		font-size: 18px;
 		font-weight: bold;
 		color: #545555;
@@ -35,7 +37,7 @@
 	}
 	.toto-menu .row .content {
 		overflow: hidden;
-		padding: 0 24px 33px;
+		padding: 0 24px 91px;
 		width: 100%;
 	}
 	.toto-menu .row .content .item-list{
@@ -223,8 +225,8 @@
 	}
 	.side-enterprise .header{
 		padding-left: 16px;
-		height: 45px;
-		line-height: 45px;
+		height: 40px;
+		line-height: 40px;
 		border-bottom: 1px solid #dcdcdc;
 		font-size: 16px;
 		color: #333;

+ 2 - 2
src/main/webapp/resources/tpl/index/purc/deputyOrder.html

@@ -119,7 +119,7 @@
 }
 
 .tender-table tbody>tr:nth-child(odd) td:hover {
-	border: 2px solid #D32526;
+	border: 2px solid #366df3;
 }
 
 .tender-table tbody tr td a {
@@ -196,7 +196,7 @@
         <div class="pub-com_head">
             <span>代采订单</span>
             <div class="p-right">
-            	<span ng-if="!isUser" style="color: #3a89d1">总金额: {{odersAmount| number}} </span><span></span>
+            	<span ng-if="!isUser" style="color: #fff;font-size: 14px;margin-right:20px;">总金额: {{odersAmount| number}} </span>
                 <a ui-sref="purc.newdeputy" type="button" title="新增代采订单"><img src="static/img/icon/add.png">新增</a>
                 <a ui-sref="purc.deputylog" type="button" title="错误日志"><i class="fa fa-file-text"></i> 错误日志</a>
             </div>

+ 5 - 2
src/main/webapp/resources/tpl/index/purc/deputyOrder_detail.html

@@ -150,8 +150,11 @@
     <div class=" purchase">
         <form class="width100" name="order" autocomplete="off">
            <!-- <div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
-            <div class="com_head"><span>代采订单</span>
-                <a class="pull-right" ng-click="copyorder(deOrder.id)" title="复制生成一张新的订单,除了采购单号和合同编号不同,其他信息基本相同"><i class="fa fa-copy"></i> 复制订单</a>
+            <div class="com_head">
+                <span>代采订单</span>
+                <div class="p-right">
+                    <a ng-click="copyorder(deOrder.id)" title="复制生成一张新的订单,除了采购单号和合同编号不同,其他信息基本相同"><i class="fa fa-copy"></i> 复制订单</a>
+                </div>
             </div>
             <div class="purchase_form">
                 <!--基本信息-->

+ 3 - 3
src/main/webapp/resources/tpl/index/purc/inquiry.html

@@ -426,12 +426,12 @@ margin-left: 55px;
 			<th width="75">操作</th>
 		</tr>
 		<tr class="sep-row">
-			<td colspan="7"></td>
+			<td colspan="8"></td>
 		</tr>
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
-			<td colspan="7">
+			<td colspan="8">
 				<div id="empty">
 					<div class="left_img">
 						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
@@ -444,7 +444,7 @@ margin-left: 55px;
 			</td>
 		</tr>
 		<tr>
-			<td colspan="7">
+			<td colspan="8">
 				<div id="empty_info">
 					<div class="f16 text-center empty_title">
 						<p>为什么我没有接收到客户的询价单?</p>

+ 2 - 2
src/main/webapp/resources/tpl/index/purc/order.html

@@ -313,7 +313,7 @@
 	</thead>
 	<tbody ng-if="tableParams.total() == 0">
 	<tr>
-		<td colspan="6">
+		<td colspan="7">
 			<div id="empty">
 				<div class="left_img">
 					<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
@@ -326,7 +326,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td colspan="6">
+		<td colspan="7">
 			<div id="empty_info">
 				<div class="f16 text-center empty_title">
 					<p>为什么我没有采购订单?</p>

+ 3 - 3
src/main/webapp/resources/tpl/index/purc/pubInquiry.html

@@ -424,12 +424,12 @@ margin-left: 55px;
 			<th width="75">操作</th>
 		</tr>
 		<tr class="sep-row">
-			<td colspan="7"></td>
+			<td colspan="8"></td>
 		</tr>
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
-			<td colspan="7">
+			<td colspan="8">
 				<div id="empty">
 					<div class="left_img">
 						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
@@ -442,7 +442,7 @@ margin-left: 55px;
 			</td>
 		</tr>
 		<tr>
-			<td colspan="7">
+			<td colspan="8">
 				<div id="empty_info">
 					<div class="f16 text-center empty_title">
 						<p>为什么我没有接收到客户的询价单?</p>

+ 10 - 16
src/main/webapp/resources/tpl/index/purc/saved_tender.html

@@ -1022,22 +1022,6 @@
                 <th width="80px">选择</th>
             </tr>
             </thead>
-            <tbody ng-if="tableParams.total() == 0">
-            <tr>
-                <td colspan="5">
-                    <div id="empty">
-                        <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
-                        </div>
-                        <div class="right_link">
-                            <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
-                            <p ng-if="tip == null">您还未添加商品信息</p>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            </tbody>
             <tbody>
             <tr ng-repeat="product in $data">
                 <td class="text-center" ng-bind="::product.code"></td>
@@ -1077,6 +1061,16 @@
             </tr>
             </tbody>
         </table>
+        <div id="empty" ng-if="tableParams.total() == 0">
+            <div class="left_img">
+                <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                <a href="#/index" title="B2B商务首页">B2B 商务</a>
+            </div>
+            <div class="right_link">
+                <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+                <p ng-if="tip == null">您还未添加商品信息</p>
+            </div>
+        </div>
     </div>
 </div>
 <!--设置-企业设置-收货地址编辑-->

+ 10 - 16
src/main/webapp/resources/tpl/index/purc/tender.html

@@ -1055,22 +1055,6 @@ input[type="radio"], input[type="checkbox"] {
                 <th width="80px">选择</th>
             </tr>
             </thead>
-            <tbody ng-if="tableParams.total() == 0">
-            <tr>
-                <td colspan="5">
-                    <div id="empty">
-                        <div class="left_img">
-                            <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
-                            <a href="#/index" title="B2B商务首页">B2B 商务</a>
-                        </div>
-                        <div class="right_link">
-                            <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
-                            <p ng-if="tip == null">您还未添加商品信息</p>
-                        </div>
-                    </div>
-                </td>
-            </tr>
-            </tbody>
             <tbody>
             <tr ng-repeat="product in $data">
                 <td class="text-center" ng-bind="::product.code"></td>
@@ -1110,6 +1094,16 @@ input[type="radio"], input[type="checkbox"] {
             </tr>
             </tbody>
         </table>
+        <div id="empty" ng-if="tableParams.total() == 0">
+            <div class="left_img">
+                <a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
+                <a href="#/index" title="B2B商务首页">B2B 商务</a>
+            </div>
+            <div class="right_link">
+                <p ng-if="tip != null">搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</p>
+                <p ng-if="tip == null">您还未添加商品信息</p>
+            </div>
+        </div>
     </div>
 </div>
 <!--设置-企业设置-收货地址编辑-->

+ 2 - 2
src/main/webapp/resources/tpl/index/purc/tender_answer_list.html

@@ -122,12 +122,12 @@
     }
 
     .tender-table tbody.not-done > tr:nth-child(odd):hover {
-        border: 2px solid #D32526;
+        border: 2px solid #366df3;
 
     }
 
     .tender-table > tbody.is-done:hover {
-        border: 2px solid #D32526;
+        border: 2px solid #366df3;
     }
 
     .tender-table > tbody.is-done > tr:first-child {

+ 1 - 5
src/main/webapp/resources/tpl/index/purc/tenderlist.html

@@ -118,7 +118,7 @@
     }
 
     .tender-table tbody > tr:nth-child(odd):hover {
-        border: 2px solid #D32526;
+        border: 2px solid #366df3;
 
     }
 
@@ -299,10 +299,6 @@
                             <p>当前没有对应的招标单!</p>
                         </div>
                     </div>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="6">
                     <div id="empty_info">
                         <div class="f16 text-center empty_title">
                             <p>为什么我没有招标单?</p>

+ 2 - 1
src/main/webapp/resources/tpl/index/sale/accept_detail.html

@@ -4,13 +4,14 @@
 	}
 	.pub-com_head span.fr {
 		margin-right: 20px;
-		color: #959595;
+		color: #fff;
 		float: right;
 	}
 	.pub-com_head span.fr em {
 		margin-right: 50px;
 		font-size: 14px;
 		font-style: inherit;
+		color:#fff;
 	}
 	.base-info .title{
 		width: 85px;

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -269,7 +269,7 @@
 						<a href="#/index" title="B2B商务首页">B2B 商务</a>
 					</div>
 					<div class="right_link">
-						<p>暂无对应的采购订单</p>
+						<p>暂无对应的采购询价信息</p>
 					</div>
 				</div>
 			</td>

+ 2 - 1
src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -4,13 +4,14 @@
 	}
 	.pub-com_head span.fr {
 		margin-right: 20px;
-		color: #959595;
+		color: #fff;
 		float: right;
 	}
 	.pub-com_head span.fr em {
 		margin-right: 50px;
 		font-size: 14px;
 		font-style: inherit;
+		color:#fff;
 	}
 </style>
 <div class="pane base-info" id="order-detail-list">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/inquiry_list.html

@@ -5,7 +5,7 @@
 /*新增样式 2017-04-19*/
 #tender-list{
     width: 1170px;
-    margin-left: -240px;
+    /*margin-left: -240px;*/
 }
 #tender-list .tender-label{
     height: auto;

+ 1 - 13
src/main/webapp/resources/tpl/index/sale/open_tender_detail.html

@@ -338,21 +338,9 @@
     .purc-tender .col-xs-4 div:last-child,.purc-tender .col-xs-8 div:last-child{
         color: #969595;
     }
-    .p-right em{
-        font-style: normal;
-    }
-    .p-right .fr{
-        font-size: 14px;
-        color: #959595;
-        margin-right: 20px;
-    }
-    .p-right span.fr em {
-        margin-right: 50px;
-        font-size: 14px;
-    }
 </style>
 
-<div class="ng-scope" style="width: 1170px; margin-left: -240px;">
+<div class="ng-scope" style="width: 1170px;">
     <form name="tenderForm">
         <div class="purc-tender">
             <div class="pub-com_head">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/opentenderlist.html

@@ -118,7 +118,7 @@
     }
 
     .tender-table tbody > tr:nth-child(odd):hover {
-        border: 2px solid #D32526;
+        border: 2px solid #366df3;
 
     }
 

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/quotation.html

@@ -146,7 +146,7 @@
 }
 .pub-com_head  .time-per{
 		margin-right: 20px;
-		color: #959595 !important;
+		color: #fff !important;
 		float: right;
 	}
 .pub-com_head  .time-per em,.pub-com_head  .time-per time{

+ 5 - 1
src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -169,15 +169,19 @@
 	}
 	.pub-com_head  .time-per{
 		margin-right: 20px;
-		color: #959595 !important;
+		color: #fff !important;
 		float: right;
 	}
 	.pub-com_head  .time-per em,.pub-com_head  .time-per time{
 		font-style : normal;
+		font-size: 14px;
+		color:#fff;
+		margin-right: 20px;
 	}
 	.pub-com_head span.fr em {
 		margin-right: 50px;
 		font-size: 14px;
+		color:#fff;
 	}
 
 

+ 5 - 1
src/main/webapp/resources/tpl/index/sale/quotation_new.html

@@ -261,15 +261,19 @@
 	}
 	.pub-com_head  .time-per{
 		margin-right: 20px;
-		color: #959595 !important;
+		color: #fff !important;
 		float: right;
 	}
 	.pub-com_head  .time-per em,.pub-com_head  .time-per time{
 		font-style : normal;
+		font-size: 14px;
+		color:#fff;
+		margin-right: 20px;
 	}
 	.pub-com_head span.fr em {
 		margin-right: 50px;
 		font-size: 14px;
+		color:#fff;
 	}
 </style>
 <div class="loading" ng-class="{'in': loading}">

+ 2 - 1
src/main/webapp/resources/tpl/index/sale/return_detail.html

@@ -4,13 +4,14 @@
     }
     .pub-com_head span.fr {
         margin-right: 20px;
-        color: #959595;
+        color: #fff;
         float: right;
     }
     .pub-com_head span.fr em {
         margin-right: 50px;
         font-size: 14px;
         font-style: inherit;
+        color:#fff;
     }
     .base-info .title{
         width: 85px;

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/tender_question_list.html

@@ -122,12 +122,12 @@
     }
 
     .tender-table tbody.not-done > tr:nth-child(odd):hover {
-        border: 2px solid #D32526;
+        border: 2px solid #366df3;
 
     }
 
     .tender-table > tbody.is-done:hover {
-        border: 2px solid #D32526;
+        border: 2px solid #366df3;
     }
 
     .tender-table > tbody.is-done > tr:first-child {

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/tenderlist.html

@@ -122,12 +122,12 @@
     }
 
     .tender-table tbody.not-done > tr:nth-child(odd):hover {
-        border: 2px solid #D32526;
+        border: 2px solid #366df3;
 
     }
 
     .tender-table > tbody.is-done:hover {
-        border: 2px solid #D32526;
+        border: 2px solid #366df3;
     }
 
     .tender-table > tbody.is-done > tr:first-child {