Merge branch 'feature-wangcz-dammyStatas-1106' into feature-master

components/product/ComponentGoods.vue

@@ -100,8 +100,16 @@
         </td>
       </tr>
       <tr v-if="componentGoods.totalElements == 0">
-        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;">
-          <i class="fa fa-smile-o fa-lg"></i> 暂无产品信息
+        <td colspan="12">
+          <div class="empty">
+            <p class="empty-img">
+              <img src="/images/brandList/empty-cart.png">
+            </p>
+            <div class="empty-info">
+              <p class="grey"> 暂无产品信息 </p>
+              <a href="javascript:history.go(-1)"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
+            </div>
+          </div>
         </td>
       </tr>
       </tbody>
@@ -204,6 +212,41 @@
 </script>
 
 <style scoped>
+  /**/
+  .product-list tbody>tr .empty{
+    overflow: hidden;
+    margin: 0!important;
+    height:130px;
+    display:inline-flex;
+    align-items: center;
+  }
+  .product-list tbody>tr .empty .empty-img{
+    margin:0;
+    border:0;
+    min-width:143px;
+    min-height:72px;
+  }
+  .product-list tbody>tr .empty .empty-img img {
+    margin: 0;
+    border: 0;
+    min-width: 143px;
+    min-height: 72px;
+  }
+  .product-list tbody>tr .empty-info{
+    line-height: 14px;
+    width: 143px;
+  }
+  .product-list tbody>tr .grey{
+    color: #999;
+    font-size: 14px;
+  }
+  .product-list tbody>tr .empty .empty-info>a{
+    font-size: 14px;
+    color: #5078cb;
+  }
+  .product-list tbody>tr .empty .empty-info i{
+    margin-right:5px;
+  }
   .product-list{
     width: 1190px;
     margin-bottom: 20px;

components/product/component/StoreInfo.vue

@@ -124,7 +124,17 @@
             </td>
           </tr>
           <tr v-if="!storeList.content || storeList.content.length == 0">
-            <td colspan="10" class="text-center" style="line-height: 40px; font-size: 14px;"><i class="fa fa-smile-o fa-lg"></i> 暂无现货</td>
+            <td colspan="12">
+              <div class="empty">
+                <p class="empty-img">
+                  <img src="/images/brandList/empty-cart.png">
+                </p>
+                <div class="empty-info">
+                  <p class="grey"> 暂无现货信息 </p>
+                  <a href="javascript:history.go(-1)"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
+                </div>
+              </div>
+            </td>
           </tr>
         </tbody>
       </table>
@@ -395,4 +405,27 @@
     text-align: left;
     color: #333;
   }
+  /**/
+  .storeInfo .empty{
+    overflow: hidden;
+    margin: 0!important;
+    height:130px;
+    display:inline-flex;
+    align-items: center;
+  }
+  .storeInfo .empty-info{
+    line-height: 14px;
+    width: 143px;
+  }
+  .empty-info .grey{
+    color: #999;
+    font-size: 14px;
+  }
+  .storeInfo .empty .empty-info>a{
+    font-size: 14px;
+    color: #5078cb;
+  }
+  .storeInfo .empty .empty-info i{
+    margin-right:5px;
+  }
 </style>

components/search/GoodList.vue

@@ -137,8 +137,16 @@
             </td>
           </tr>
           <tr v-if="good_list.components.length == 'undefined' ||good_list.components.length == 0">
-            <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;">
-              <i class="fa fa-smile-o fa-lg"></i> 暂无产品信息
+            <td colspan="12">
+              <div class="empty">
+                <p class="empty-img">
+                  <img src="/images/brandList/empty-cart.png">
+                </p>
+                <div class="empty-info">
+                  <p class="grey"> 暂无产品信息 </p>
+                  <a href="javascript:history.go(-1)"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>
+                </div>
+              </div>
             </td>
           </tr>
           </tbody>
@@ -676,4 +684,39 @@
     color: #f39801;
   }
 
+/**/
+.product-list tbody>tr .empty{
+  overflow: hidden;
+  margin: 0!important;
+  height:130px;
+  display:inline-flex;
+  align-items: center;
+}
+.product-list tbody>tr .empty .empty-img{
+  margin:0;
+  border:0;
+  min-width:143px;
+  min-height:72px;
+}
+.product-list tbody>tr .empty .empty-img img {
+  margin: 0;
+  border: 0;
+  min-width: 143px;
+  min-height: 72px;
+}
+.product-list tbody>tr .empty-info{
+  line-height: 14px;
+  width: 143px;
+}
+.product-list tbody>tr .grey{
+  color: #999;
+  font-size: 14px;
+}
+.product-list tbody>tr .empty .empty-info>a{
+  font-size: 14px;
+  color: #5078cb;
+}
+.product-list tbody>tr .empty .empty-info i{
+  margin-right:5px;
+}
 </style>

components/store/CommodityList.vue

@@ -107,7 +107,7 @@
                 </div>
                 <div class="col-xs-4 txt-info">
                   <p class="grey f16">暂无器件信息</p>
-                  <i class="iconfont">&#xe610;</i>&nbsp;<a href="/">返回首页</a>
+                  <a href="/">马上去逛一逛</a>
                 </div>
               </div>
             </td>
@@ -478,7 +478,7 @@ export default {
 		color: #fff;
 	}
 	.category-content{
-		min-height: 243px;
+		/*min-height: 243px;*/
 	}
 	.no-record{
 		font-size: 14px;
@@ -508,6 +508,10 @@ export default {
 	}
 	.text-center  .txt-info a{
 		font-size: 14px;
+    display: block;
+    color: #5078cb;
+    background: url('/images/all/icon_nianxian.jpg')no-repeat 105px center;
+    padding-left: 50px;
 	}
 	.text-center  .col-xs-4 i{
 		color: #5078cb;

components/store/ComponentInfo.vue

@@ -5,14 +5,14 @@
         <span class="tab">产品参数<b class="tip">(仅供参考，以实际产品为准)</b></span>
       </div>
       <ul class="list-unstyled list-inline" style="margin-left: 0px;" v-if="component.properties">
-        <li v-for="property in component.properties" v-if="property.value">
+        <li v-for="property in component.properties">
           <div class="property-name">
             <span v-text="property.property.labelCn"></span>:
           </div>
-          <div class="property-value" v-text="property.value"></div>
+          <div class="property-value">{{property.value ? property.value : '-'}}</div>
         </li>
-        <li v-if="!component.properties || component.properties.length === 0" class="text-center">
-          <i class="fa fa-smile-o fa-lg"></i> 暂无参数信息
+        <li v-if="!component.properties || component.properties.length === 0" class="text-center" style="display:block;margin-top:0;">
+          暂无参数信息
         </li>
       </ul>
     </div>