商品械字号显隐修改

src/main/resources/static/js/base.js

@@ -630,7 +630,8 @@ function setSearchProductList(list, userId, callback) {//处理搜索
             priceGrade: item.priceGrade,
             actStatus: 0,
             priceLoaded: false,
-            beautyActFlag:item.beautyActFlag
+            beautyActFlag:item.beautyActFlag,
+            productType:item.productType
         });
         // 0公开价格 1不公开价格 2仅对会员机构公开
         if (item.priceFlag !== 1) {

src/main/resources/static/js/product/list.js

@@ -148,6 +148,7 @@ var productList = new Vue({
                     }else{
                         _self.listData = _self.listData.concat(resultData);
                     }
+                    console.log('==>',_self.listData)
                     if( _self.listData.length>0){
                         _self.isListEmpty = false;
                     }else{

src/main/resources/static/js/shopping/cart.js

@@ -570,7 +570,6 @@ var shoppingCart = new Vue({
             _self.isShowPopup = false;
         },
         hanldHrefLink:function (shop) {
-            console.log('shopId',shopId)
             if(shop.shopType == 2){
                 return;
             }

src/main/resources/static/js/supplier/list.js

@@ -78,7 +78,6 @@ var supplierList = new Vue({
             });
         },
         hanldHrefLink:function (shop) {
-            console.log('shopId',shopId)
             if(shop.shopType == 2){
                 return;
             }

src/main/resources/templates/index.html

@@ -184,7 +184,7 @@
                                     <!-- 商品/图片 列表 -->
                                     <a :href="pros.link" class="page_main_item ad_04 swiper-slide" target="_blank" v-for="pros in floor.floorImageList">
                                         <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
-                                        <div class="page_main_type" v-if="pros.productType == 2">医疗器械</div>
+                                        <div class="page_main_type" v-if="pros.product && pros.product.productType && pros.product.productType === 2">医疗器械</div>
                                         <div class="page_main_tag" v-if="pros.listType == 2"><p v-text="pros.label"></p></div>
                                         <div class="page_main_text">
                                             <span class="tag" v-if="pros.beautyActFlag == 1">美博会</span>

src/main/resources/templates/product/instrument.html

@@ -105,9 +105,9 @@
                                     </a>
                                 </template>
                                 <!-- 商品/图片 列表 -->
-                                <a :href="pros.link" class="page_main_item ad_04 swiper-slide" target="_blank" v-for="pros in floor.floorImageList">
+                                <a :href="pros.link" class="page_main_item ad_04 swiper-slide" target="_blank" v-for="pros in floor.floorImageList" v-if="floor.floorImageList.length>0">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
-                                    <div class="page_main_type" v-if="pros.productType == 2">医疗器械</div>
+                                    <div class="page_main_type" v-if="pros.product && pros.product.productType && pros.product.productType === 2">医疗器械</div>
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p v-text="pros.label"></p></div>
                                     <div class="page_main_text">
                                         <span class="tag" v-if="pros.beautyActFlag == 1">美博会</span>