Merge remote-tracking branch 'origin/dev' into dev

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

@@ -1550,7 +1550,6 @@ ul>li.item-link>a {
 	padding: 10px;
 }
 .feed-wrap .pane-body{
-	height: 230px;
 	overflow-y: auto;
 	overflow-x: hidden;
 }

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

@@ -414,6 +414,15 @@
                                    </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>暂无对应的公共询价信息</p>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>

src/main/webapp/resources/tpl/index/home/left.html

@@ -98,9 +98,6 @@
 		-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: 230px;
-	}
 	.right .feed-wrap {
 		width: 246px;
 	}

src/main/webapp/resources/tpl/public/info/notice_detail.html

@@ -16,7 +16,8 @@
 	}
 	.body .row .content li {
 		border-top: 1px solid #e8e8e8;
-		height: 80px;
+		height: 50px;
+		line-height:50px;
 		padding: 0px 15px;
 	}
 	.body .row .content li:last-child{
@@ -26,7 +27,6 @@
 		height: 100%;
 		width: 100%;
 		display: inline-block;
-		padding-top: 10px;
 		font-size: 16px;
 	}
 	.body .row .content li a span{