Browse Source

器件详情页 店铺首页 器件筛选页 搜索结果页如果字段为空默认使用“-”

hangb 8 years ago
parent
commit
e238bac015

+ 12 - 8
components/product/ComponentGoods.vue

@@ -32,19 +32,23 @@
           <nuxt-link :to="'/store/' + compGoods.storeId" class="contact" :title="compGoods.storeName" target="_blank">{{compGoods.storeName}}</nuxt-link>
         </td>
         <td class="brand-code">
-          <div class="brand"><nuxt-link :to="`/product/brand/${compGoods.brand.uuid}/`" title="compGoods.brand.nameEn">{{compGoods.brand.nameEn}}</nuxt-link></div>
-          <div class="code"><nuxt-link :to="`/product/component/${compGoods.uuid}/`" :title="compGoods.code">{{compGoods.code}}</nuxt-link></div>
+          <div class="brand" v-if="compGoods.brand.nameEn"><nuxt-link :to="`/product/brand/${compGoods.brand.uuid}/`" title="compGoods.brand.nameEn">{{compGoods.brand.nameEn}}</nuxt-link></div>
+          <div class="brand" v-if="!compGoods.brand.nameEn">—</div>
+          <div class="code" v-if="compGoods.code"><nuxt-link :to="`/product/component/${compGoods.uuid}/`" :title="compGoods.code">{{compGoods.code}}</nuxt-link></div>
+          <div class="code" v-if="!compGoods.code">—</div>
         </td>
         <td>
-          <div class="package">{{compGoods.packaging || '暂无包装方式信息'}}</div>
-          <div class="date">{{compGoods.produceDate || '-'}}</div>
+          <div class="package" v-if="compGoods.packaging">{{compGoods.packaging}}</div>
+          <div v-if="!compGoods.produceDate && !compGoods.packaging">—</div>
+          <div class="date" v-if="compGoods.produceDate">{{compGoods.produceDate}}</div>
         </td>
         <td class="text-left">
-          <div class="goods">
-            库存:<span>{{compGoods.reserve || '暂无库存'}}</span>
+          <div class="goods" v-if="compGoods.reserve">
+            库存:<span>{{compGoods.reserve}}</span>
           </div>
-          <div class="from" v-if="compGoods.reserve > 0">
-            起拍:<span>{{compGoods.minBuyQty}}</span>
+          <div v-if="!compGoods.reserve" style="text-align: center;margin-left: 0;"><span>—</span></div>
+          <div class="from" v-if="compGoods.reserve && compGoods.reserve > 0">
+            起拍:<span v-if="compGoods.minBuyQty">{{compGoods.minBuyQty}}</span>
           </div>
           <!--<div class="multiple" v-if="compGoods.reserve > 0">
             倍数:<span>{{compGoods.minPackQty}}</span>

+ 4 - 5
components/product/component/StoreInfo.vue

@@ -61,15 +61,14 @@
             </td>
             <td style="text-align: left;padding-left: 25px;">
               <a>
-                <div>
+                <div v-if="list.reserve">
                   <span>库存:</span>
-                  <span v-if="list.reserve">{{list.reserve}}</span>
-                  <span v-if="!list.reserve">—</span>
+                  <span>{{list.reserve}}</span>
                 </div>
-                <div >
+                <div v-if="!list.reserve" style="text-align: center;margin-left: 0;"><span>—</span></div>
+                <div v-if="list.reserve && list.reserve>0">
                   <span>起拍:</span>
                   <span v-if="list.minBuyQty">{{list.minBuyQty}}</span>
-                  <span v-if="!list.minBuyQty">—</span>
                 </div>
 
                 <!--<div>-->

+ 4 - 5
components/search/GoodList.vue

@@ -80,13 +80,12 @@
               <div v-if="!item.storeName">—</div>
             </td>
             <td class="text-left">
-              <div class="goods">
-                库存:<span v-text="item.reserve"  v-if="item.reserve"></span>
-                <span v-if="!item.reserve">—</span>
+              <div class="goods"  v-if="item.reserve">
+                库存:<span v-text="item.reserve"></span>
               </div>
-              <div class="from" v-if="item.reserve > 0">
+              <div v-if="!item.reserve" style="text-align: center;margin-left: 0;"><span>—</span></div>
+              <div class="from" v-if="item.reserve && item.reserve > 0">
                 起拍:<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>

+ 4 - 6
components/store/CommodityList.vue

@@ -58,16 +58,14 @@
               <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-if="commodity.reserve" v-text="commodity.reserve">31500</span>
-                <span v-if="!commodity.reserve">—</span>
+              <div class="goods" v-if="commodity.reserve">
+                库存:<span v-text="commodity.reserve">31500</span>
               </div>
-              <div class="from">
+              <div v-if="!commodity.reserve" style="text-align: center;margin-left: 0;"><span>—</span></div>
+              <div class="from" v-if="commodity.reserve && commodity.reserve>0">
                 起拍:<span v-if="commodity.minBuyQty" v-text="commodity.minBuyQty">300</span>
-                <span v-if="!commodity.minBuyQty">—</span>
               </div>
               <!--<div class="multiple">
                 倍数:<span>1</span>