Browse Source

1、器件详情页和器件搜索页面图片的设置(如果没有器件图片就使用品牌图片两者都没有就使用默认图片)
2、器件详情页面按商家列表如果字段为空默认使用“-”

hangb 8 years ago
parent
commit
60bf51c34c

+ 1 - 1
components/product/ComponentGoods.vue

@@ -25,7 +25,7 @@
         <td>
           <!--store/{{compGoods.storeId}}#/batchInfo/{{compGoods.batchCode}}-->
           <nuxt-link v-if="compGoods.batchCode" :to="`/store/${compGoods.storeId}/${compGoods.batchCode}`" target="_blank">
-            <img :src="compGoods.img || '/images/all/default.png'"/>
+            <img :src="compGoods.img?compGoods.img:compGoods.brand.logoUrl?compGoods.brand.logoUrl:'/images/all/default.png'"/>
           </nuxt-link>
           <img v-if="!compGoods.batchCode" :src="compGoods.img || '/images/all/default.png'"/>
           <!--store/{{compGoods.storeId}}#/home-->

+ 1 - 1
components/product/component/ComponentDetail.vue

@@ -6,7 +6,7 @@
       </div>-->
       <div class="detail">
         <div class="component-img">
-          <img :src="list.img || '/images/component/default.png'"/>
+          <img :src="list.img?list.img:list.brand.logoUrl?list.brand.logoUrl:'/images/component/default.png'"/>
         </div>
         <div class="component-message">
           <div class="message-code">

+ 22 - 6
components/product/component/StoreInfo.vue

@@ -4,7 +4,7 @@
       <div class="storeIns">
         <div class="sign">选择商家:</div>
         <div class="storeInList" v-for="storeIn in store">
-          <div class="choose" :class="{'storeIn-active' : storeIn.isSelected, 'storeIn' : !storeIn.isSelected}" @click="addStore(storeIn)">
+          <div class="choose" :class="{'storeIn-active' : storeIn.isSelected, 'storeIn' : !storeIn.isSelected}" @click="store.length==1?'':addStore(storeIn)">
             <a class="storeLogo">
               <img :src="storeIn.logoUrl || '/images/component/default.png'" :alt="storeIn.storeName" :title="storeIn.storeName">
             </a>
@@ -47,19 +47,31 @@
         </thead>
         <tbody class="text-center">
           <tr style="cursor: pointer;" v-for="list in storeList.content" @click="goProductDetail(list.storeid, list.batchCode)">
-            <td><a>{{list.code}}</a></td>
-            <td><a>{{list.produceDate}}</a></td>
+            <td>
+              <a v-if="list.code">{{list.code}}</a>
+              <a v-if="!list.code">—</a>
+            </td>
+            <td>
+              <a v-if="list.produceDate">{{list.produceDate}}</a>
+              <a v-if="!list.produceDate">—</a>
+            </td>
             <td><a>{{list.packaging || '暂无包装方式'}}</a></td>
             <td style="text-align: left;padding-left: 25px;">
               <a>
-                <div>
+                <div v-if="list.reserve">
                   <span>库存:</span>
                   <span>{{list.reserve}}</span>
                 </div>
-                <div>
+                <div v-if="!list.reserve">
+                  <span>—</span>
+                </div>
+                <div v-if="list.minBuyQty">
                   <span>起拍:</span>
                   <span>{{list.minBuyQty}}</span>
                 </div>
+                <div v-if="!list.minBuyQty">
+                  <span>—</span>
+                </div>
                 <!--<div>-->
                   <!--<span>倍数:</span>-->
                   <!--<span>{{list.minPackQty}}</span>-->
@@ -69,7 +81,8 @@
             <td>
               <a>
                 <div v-for="price in list.prices">
-                  <span>{{price.start}}</span>+
+                  <span v-if="list.prices">{{price.start}}</span>+
+                  <span v-if="!list.prices">—</span>
                 </div>
               </a>
             </td>
@@ -101,6 +114,9 @@
                   <span v-if="list.b2cMaxDelivery && list.b2cMaxDelivery !== list.b2cMinDelivery">-</span>
                   <span v-if="list.b2cMaxDelivery && list.b2cMaxDelivery !== list.b2cMinDelivery">{{list.b2cMaxDelivery}}</span>
                 </div>
+                <div v-if="!list.b2cMinDelivery">
+                  <span>—</span>
+                </div>
               </a>
             </td>
             <td>

+ 2 - 1
nuxt.config.js

@@ -97,7 +97,8 @@ module.exports = {
     src: '~plugins/vue-empty.js',
     ssr: false
   }, {
-    src: '~plugins/element-ui.js'
+    src: '~plugins/element-ui.js',
+    ssr: true
   }, {
     src: '~plugins/filters.js',
     ssr: false