Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -458,12 +458,12 @@
         padding-right: 15px;
         margin: 20px 0 12px 0;
     }
-    .seek-purchase .seek-purchase-content >table >tbody tr.empty td div {
+    .seek-purchase tr.empty td div {
         text-align: center;
         height: 200px;
         line-height: 200px;
     }
-    .seek-purchase .seek-purchase-content >table >tbody tr.empty td div span {
+    .seek-purchase tr.empty td div span {
         color: #999;
         margin-left: 10px;
     }
@@ -535,6 +535,11 @@
         vertical-align: middle;
         margin: 0 0 0 21px;
     }
+    .seek-purchase .bom-manage tr.empty div{
+        line-height: 200px;
+        display: block;
+        margin: 0;
+    }
     .seek-purchase .bom-manage > table tbody tr td > div p {
         font-size: 14px;
         font-weight: bold;
@@ -1017,6 +1022,14 @@
                     <a href="user#/bomDetail/{{bom.id}}" class="fr">查看详情</a>
                 </td>
             </tr>
+            <tr ng-if="!$data.length" class="empty">
+                <td>
+                    <div>
+                        <img src="static/img/all/empty-cart.png">
+                        <span>暂无求购信息</span>
+                    </div>
+                </td>
+            </tr>
             </tbody>
         </table>
     </div>