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

src/main/java/com/uas/platform/b2c/external/erp/product/util/ModelConverter.java

@@ -528,6 +528,7 @@ public class ModelConverter {
 		product.setStandard(i);// 默认设置为非标准，到平台做匹配更新
 		Enterprise enter = SystemSession.getUser().getEnterprise();
 		// erp上传的数据默认赋值给标准信息
+		product.setPbranden(product.getBrand());
 		product.setPbrand(product.getBrand());
 		product.setPcmpcode(product.getCmpCode());
 		product.setKind(product.getProdName());

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

@@ -458,6 +458,15 @@
         padding-right: 15px;
         margin: 20px 0 12px 0;
     }
+    .seek-purchase .seek-purchase-content >table >tbody tr.empty td div {
+        text-align: center;
+        height: 200px;
+        line-height: 200px;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.empty td div span {
+        color: #999;
+        margin-left: 10px;
+    }
     .seek-purchase table {
         table-layout: fixed;
     }
@@ -926,13 +935,21 @@
             </tr>
             </tbody>
             <tbody>
-            <tr class="pager-row">
+            <tr class="pager-row" ng-if="seekListData.totalElements > 0">
                 <td colspan="10">
                     <div>
                         显示&nbsp;{{(seekListData.number - 1 ) * seekListData.size + 1}}-{{seekListData.number * seekListData.size}}&nbsp;条，共&nbsp;{{seekListData.totalElements}}&nbsp;条
                     </div>
                 </td>
             </tr>
+            <tr ng-if="!seekListData.totalElements" class="empty">
+                <td colspan="10">
+                    <div>
+                        <img src="static/img/all/empty-cart.png">
+                        <span>暂无求购信息</span>
+                    </div>
+                </td>
+            </tr>
             </tbody>
         </table>
     </div>

src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html

@@ -528,6 +528,16 @@
         margin: 18px 0 13px 0;
         border-radius: 2px;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.empty td div {
+        text-align: center;
+        height: 200px;
+        line-height: 200px;
+        border: 1px solid #e8e8e8;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.empty td div span {
+        color: #999;
+        margin-left: 10px;
+    }
 </style>
 <div class="user_right fr seek-purchase">
     <!--求购询价-->
@@ -702,6 +712,16 @@
             </tr>
             -->
             </tbody>
+            <tbody ng-if="$data.length == 0">
+            <tr class="empty">
+                <td colspan="10">
+                    <div>
+                        <img src="static/img/all/empty-cart.png">
+                        <span>暂无求购信息</span>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
         </table>
     </div>
     <div class="com-mall-del-box link-saler-box" ng-if="linkBoxIndex > -1">

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

@@ -327,6 +327,16 @@
     .seek-purchase .seek-purchase-content >table tbody.active tr.say-price{
         display: table-row;
     }
+    .seek-purchase .seek-purchase-content >table tbody tr.empty td div {
+        text-align: center;
+        height: 200px;
+        line-height: 200px;
+        border: 1px solid #e8e8e8;
+    }
+    .seek-purchase .seek-purchase-content >table >tbody tr.empty td div span {
+        color: #999;
+        margin-left: 10px;
+    }
     .ng-table-pager {
         margin-top: 20px;
     }
@@ -667,8 +677,8 @@
                         -->
                     </td>
                     <td class="user-name">
-                        <div ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></div>
-                        <div ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></div>
+                        <span ng-if="seek.inquiry.enterprise.enName" title="{{seek.inquiry.enterprise.enName}}" ng-bind="seek.inquiry.enterprise.enName"></span>
+                        <span ng-if="!seek.inquiry.enterprise.enName" title="{{seek.userName}}" ng-bind="seek.userName"></span>
                     </td>
                     <td><div title="{{seek.cmpCode}}" ng-bind="seek.cmpCode || '-'"></div></td>
                     <td><div title="{{seek.inbrand}}" ng-bind="seek.inbrand || '-'"></div></td>
@@ -690,6 +700,16 @@
                     </td>
                 </tr>
             </tbody>
+            <tbody ng-if="seekListData.length == 0">
+            <tr class="empty">
+                <td colspan="10">
+                    <div>
+                        <img src="static/img/all/empty-cart.png">
+                        <span>暂无求购信息</span>
+                    </div>
+                </td>
+            </tr>
+            </tbody>
         </table>
     </div>
     <div class="com-modal-wrap" ng-show="isShowSayPriceBox">

src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1116,6 +1116,9 @@
 		font-size: 13px;
 		font-weight: bold;
 	}
+	.oder01 ul li {
+		margin-left: 20px;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->