Merge branch 'release-201802-wangcz' into dev

src/main/webapp/resources/css/add.css

@@ -1701,7 +1701,7 @@ option {
 }
 
 .oder-change dl dd:hover {
-    border: #d32526 1px solid;
+    border: #3f84f6 1px solid;
 }
 
 .oder-change dl dd:hover b.wid02 a {

src/main/webapp/resources/tpl/index/purc/cart.html

@@ -255,7 +255,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td colspan="6">
+		<td colspan="7">
 			<div id="empty_info">
 				<div class="f16 text-center empty_title">
 					<p>为什么我没有采购订单？</p>

src/main/webapp/resources/tpl/index/purc/pubInquiry_new.html

@@ -912,6 +912,12 @@ select.disabled {
 }
 .left-dropdown-menu .dropdown-menu li span{
     width: auto !important;
+}
+    .hover-table {
+        background: #fff;
+    }
+.hover-table:hover tr td {
+    background: #fff!important;
 }
 </style>
 <div class="ng-scope">
@@ -1121,7 +1127,7 @@ select.disabled {
 					<th width="80px">选择</th>
 				</tr>
 			</thead>
-			<tbody ng-if="tableParams.total() == 0">
+			<tbody ng-if="tableParams.total() == 0" class="hover-table">
             <tr>
                 <td colspan="7" style="border-bottom: none;">
                     <div id="empty">