1、器件详情页和器件搜索页面图片的设置（如果没有器件图片就使用品牌图片两者都没有就使用默认图片）

2、器件详情页面按商家列表如果字段为空默认使用“-”

components/product/component/StoreInfo.vue

@@ -55,23 +55,23 @@
               <a v-if="list.produceDate">{{list.produceDate}}</a>
               <a v-if="!list.produceDate">—</a>
             </td>
-            <td><a>{{list.packaging || '暂无包装方式'}}</a></td>
+            <td>
+              <a v-if="list.packaging">{{list.packaging}}</a>
+              <a v-if="!list.packaging">—</a>
+            </td>
             <td style="text-align: left;padding-left: 25px;">
               <a>
-                <div v-if="list.reserve">
+                <div>
                   <span>库存：</span>
-                  <span>{{list.reserve}}</span>
+                  <span v-if="list.reserve">{{list.reserve}}</span>
+                  <span v-if="!list.reserve">—</span>
                 </div>
-                <div v-if="!list.reserve">
-                  <span>—</span>
-                </div>
-                <div v-if="list.minBuyQty">
+                <div >
                   <span>起拍：</span>
-                  <span>{{list.minBuyQty}}</span>
-                </div>
-                <div v-if="!list.minBuyQty">
-                  <span>—</span>
+                  <span v-if="list.minBuyQty">{{list.minBuyQty}}</span>
+                  <span v-if="!list.minBuyQty">—</span>
                 </div>
+
                 <!--<div>-->
                   <!--<span>倍数：</span>-->
                   <!--<span>{{list.minPackQty}}</span>-->
@@ -270,6 +270,8 @@
   }
   .storeInfo .storeIn-active {
     width: 98px;
+    height: 49px;
+    line-height: 49px;
     float: left;
     border: 1px solid #5078cb;
     text-align: center;
@@ -284,6 +286,10 @@
     text-align: center;
     vertical-align: middle;
   }
+  .storeInList .choose a img{
+    max-width: 95px;
+    max-height: 46px;
+  }
   a.storeLogo>img,.storeIn-active a.storeLogo>img {
     max-width: 95px;
     max-height: 46px;

components/search/GoodList.vue

@@ -60,28 +60,33 @@
               </nuxt-link>
             </td>
             <td class="brand-code">
-              <div class="brand"><nuxt-link :to="`/product/brand/${item.brand.uuid}`" class="text-num" v-text="item.brand.nameEn"></nuxt-link></div>
-              <div class="code"><nuxt-link :to="`/product/component/${item.uuid}`" class="f16 text-bold text-num" v-text="item.code"></nuxt-link></div>
-              <div class="brand"><nuxt-link :to="`/product/kind/${item.kindid}`" v-text="item.kind.nameCn">
-              </nuxt-link></div>
+              <div class="brand" v-if="item.brand.nameEn"><nuxt-link :to="`/product/brand/${item.brand.uuid}`" class="text-num" v-text="item.brand.nameEn"></nuxt-link></div>
+              <div class="brand" v-if="!item.brand.nameEn">—</div>
+              <div class="code"  v-if="item.code"><nuxt-link :to="`/product/component/${item.uuid}`" class="f16 text-bold text-num" v-text="item.code"></nuxt-link></div>
+              <div class="brand" v-if="!item.code">—</div>
+              <div class="brand"  v-if="item.kind.nameCn"><nuxt-link :to="`/product/kind/${item.kindid}`" v-text="item.kind.nameCn"></nuxt-link></div>
+              <div class="brand" v-if="!item.kind.nameCn">—</div>
             </td>
             <td>
-              <div class="package" v-text="item.packaging?item.packaging:'暂无包装方式信息'"></div>
+              <div class="package" v-text="item.packaging"></div>
               <div class="date" v-text="item.produceDate"></div>
+              <div v-if="!item.packaging && !item.produceDate">—</div>
             </td>
             <td>
-              <div>
+              <div v-if="item.storeName">
                 <nuxt-link :to="'/store/' + item.storeId" v-text="item.storeName">
                 </nuxt-link>
-                <span v-if="!item.storeName">—</span>
               </div>
+              <div v-if="!item.storeName">—</div>
             </td>
             <td class="text-left">
               <div class="goods">
-                库存：<span v-text="item.reserve || '暂无库存'"></span>
+                库存：<span v-text="item.reserve"  v-if="item.reserve"></span>
+                <span v-if="!item.reserve">—</span>
               </div>
               <div class="from" v-if="item.reserve > 0">
-                起拍：<span v-text="item.minBuyQty"></span>
+                起拍：<span v-text="item.minBuyQty" v-if="item.minBuyQty"></span>
+                <span v-if="!item.minBuyQty">—</span>
               </div>
              <!-- <div class="multiple" v-if="item.reserve > 0">
                 倍数：<span v-text="item.minPackQty"></span>

components/store/CommodityList.vue

@@ -49,19 +49,25 @@
               </a>
             </td>
             <td class="brand-code">
-              <div class="brand" v-text="commodity.brandNameEn"></div>
-              <div class="code" v-text="commodity.code"></div>
+              <div class="brand" v-if="commodity.brandNameEn" v-text="commodity.brandNameEn"></div>
+              <div class="brand" v-if="!commodity.brandNameEn">—</div>
+              <div class="code" v-if="commodity.code" v-text="commodity.code"></div>
+              <div class="code" v-if="!commodity.code">—</div>
             </td>
             <td>
-              <div class="package" v-text="commodity.packaging || '暂无包装信息'"></div>
-              <div class="date" v-text="commodity.produceDate">2016-12-01</div>
+              <div class="package" v-if="commodity.packaging" v-text="commodity.packaging"></div>
+              <div class="package" v-if="!commodity.packaging && !commodity.produceDate">—</div>
+              <div class="date" v-if='commodity.produceDate' v-text="commodity.produceDate">2016-12-01</div>
+              <div class="date" v-if="!commodity.produceDate">—</div>
             </td>
             <td style="text-align: left;vertical-align: middle;">
               <div class="goods">
-                库存：<span v-text="commodity.reserve">31500</span>
+                库存：<span v-if="commodity.reserve" v-text="commodity.reserve">31500</span>
+                <span v-if="!commodity.reserve">—</span>
               </div>
               <div class="from">
-                起拍：<span v-text="commodity.minBuyQty">300</span>
+                起拍：<span v-if="commodity.minBuyQty" v-text="commodity.minBuyQty">300</span>
+                <span v-if="!commodity.minBuyQty">—</span>
               </div>
               <!--<div class="multiple">
                 倍数：<span>1</span>
@@ -88,6 +94,7 @@
                 <span v-if="commodity.b2cMinDelivery != commodity.b2cMaxDelivery" v-text="commodity.b2cMinDelivery + '-' + commodity.b2cMaxDelivery"></span>
                 <span v-if="commodity.b2cMinDelivery == commodity.b2cMaxDelivery" v-text="commodity.b2cMinDelivery"></span>
               </div>
+              <div v-if="!commodity.b2cMinDelivery"><span>—</span></div>
             </td>
             <td>
               <buy :item="commodity"></buy>