Merge remote-tracking branch 'remotes/origin/developerA' into developer

src/main/resources/static/css/index/index_new.pc.css

@@ -95,6 +95,9 @@ li{list-style:none;}
     transition:all 0.4s;
     display: block;
 }
+.section_page  .page_main_item.default{
+    cursor: default;
+}
 .section_page  .page_main_item.ad_04{
     border-radius: 2px;
 }

src/main/resources/static/js/index.js

@@ -53,6 +53,7 @@ var homeData = new Vue({
             PublicApi.GetHomeBanner({},function(response){
                 if(response.code == 0){
                     _self.images = response.data;
+                    _self.listLoading =false;
                     _self.SwiperBanner();
                 }else{
                     CAIMEI.Alert(response.msg, '确定');
@@ -90,7 +91,7 @@ var homeData = new Vue({
                         }
                     });
                 }
-            },500);
+            },300);
         },
         GetHomeFloorData: function(){
             var _self = this;
@@ -103,23 +104,37 @@ var homeData = new Vue({
                     _self.supplierList = data.supplierImage.qualitySupplierList;
                     _self.supplierImage = data.supplierImage.wwwImage;
                     _self.supplierWwwLink = data.supplierImage.wwwLink;
-                    _self.listLoading =false;
                     _self.pageList.forEach(function(page){
-                        if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
-                            if (page.floorImageList.length>7){
-                                page.isPageMore = true;
-                            }
-                        }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4' || page.floorContent.templateType == '7'){
-                            if (page.floorImageList.length>5){
-                                page.isPageMore = true;
+                        if(isPC){
+                            if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
+                                if (page.floorImageList.length>7){
+                                    page.isPageMore = true;
+                                }
+                            }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4' || page.floorContent.templateType == '7'){
+                                if (page.floorImageList.length>5){
+                                    page.isPageMore = true;
+                                }
+                            }else if(page.floorContent.templateType == '5'){
+                                if (page.floorImageList.length>10){
+                                    page.isPageMore = true;
+                                }
                             }
-                        }else if(page.floorContent.templateType == '5'){
-                            if (page.floorImageList.length>10){
-                                page.isPageMore = true;
+                        }else{
+                            if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
+                                if (page.floorImageList.length>3){
+                                    page.isPageMore = true;
+                                }
+                            }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4'){
+                                if (page.floorImageList.length>2){
+                                    page.isPageMore = true;
+                                }
+                            }else if(page.floorContent.templateType == '5'){
+                                if (page.floorImageList.length>4){
+                                    page.isPageMore = true;
+                                }
                             }
                         }
                     });
-                    console.log(_self.pageList);
                     setTimeout(function() {
                         // 设置侧边导航数据
                         _self.SetAsideNav();

src/main/resources/templates/index.html

@@ -41,7 +41,7 @@
             <div class="inner">
                 <div class="section_right">
                     <div class="box swiper-wrapper" >
-                        <div class="section_right_item" v-if="liveList.length>0">
+                        <div class="section_right_item" v-if="liveList && liveList.length>0">
                             <div class="right_item_title">
                                 <p>精彩直播</p>
                                 <a href="https://wx.vzan.com/plug-ins/?v=637429463853329710#/FixupIndex/399803126?shareuid=0" target="_blank" v-if="isPC">更多></a>
@@ -62,7 +62,7 @@
                                 </a>
                             </div>
                         </div>
-                        <div class="section_right_item" v-if="cmImageList.length>0">
+                        <div class="section_right_item" v-if="cmImageList && cmImageList.length>0">
                             <div class="right_item_title">
                                 <p>最新活动</p>
                                 <a href="/promotions.html" target="_blank" v-if="isPC">更多></a>
@@ -78,7 +78,7 @@
                                 </a>
                             </div>
                         </div>
-                        <div class="section_right_item" v-if="infoList.length>0">
+                        <div class="section_right_item" v-if="infoList && infoList.length>0">
                             <div class="right_item_title">
                                 <p>热门文章</p>
                                 <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank" v-if="isPC">更多></a>
@@ -105,7 +105,9 @@
                         </div>
                         <template v-if="page.floorContent.templateType == '1'">
                             <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' " class="page_main_item ad_02" :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
+                                <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
+                                   class="page_main_item ad_02" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
+                                   :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage1" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                 </a>
@@ -198,11 +200,15 @@
                         </template>
                         <template v-if="page.floorContent.templateType == '2'">
                             <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' " class="page_main_item ad_02" :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
+                                <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
+                                    class="page_main_item ad_02" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
+                                    :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage1" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                 </a>
-                                <a :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)'" class="page_main_item ad_03" :target="page.floorContent.adsLink2!='' ? '_blank' : ''">
+                                <a  :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)'"
+                                    class="page_main_item ad_03" :class="page.floorContent.adsLink2!='' ? '' : 'default' "
+                                    :target="page.floorContent.adsLink2!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage2" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage2" alt="" class="page_main_item_adv">
                                 </a>
@@ -295,11 +301,15 @@
                         </template>
                         <template v-if="page.floorContent.templateType == '3'">
                             <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' " class="page_main_item ad_01" :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
+                                <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
+                                    class="page_main_item ad_01" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
+                                    :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage1" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                 </a>
-                                <a :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)' " class="page_main_item ad_02" :target="page.floorContent.adsLink2!='' ? '_blank' : ''">
+                                <a  :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)' "
+                                    class="page_main_item ad_02" :class="page.floorContent.adsLink2!='' ? '' : 'default' "
+                                    :target="page.floorContent.adsLink2!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage2" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage2" alt="" class="page_main_item_adv">
                                 </a>
@@ -392,15 +402,21 @@
                         </template>
                         <template v-if="page.floorContent.templateType == '4'">
                             <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' " class="page_main_item ad_01" :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
+                                <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
+                                    class="page_main_item ad_01" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
+                                    :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage1" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                 </a>
-                                <a :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)' " class="page_main_item ad_02" :target="page.floorContent.adsLink2!='' ? '_blank' : ''">
+                                <a  :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)' "
+                                    class="page_main_item ad_02" :class="page.floorContent.adsLink2!='' ? '' : 'default' "
+                                    :target="page.floorContent.adsLink2!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage2" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage2" alt="" class="page_main_item_adv">
                                 </a>
-                                <a :href="page.floorContent.adsLink3!='' ? page.floorContent.adsLink3 : 'javascript:void(0)' " class="page_main_item ad_03" :target="page.floorContent.adsLink3!='' ? '_blank' : ''">
+                                <a  :href="page.floorContent.adsLink3!='' ? page.floorContent.adsLink3 : 'javascript:void(0)' "
+                                    class="page_main_item ad_03" :class="page.floorContent.adsLink3!='' ? '' : 'default' "
+                                    :target="page.floorContent.adsLink3!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage3" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage3" alt="" class="page_main_item_adv">
                                 </a>
@@ -493,7 +509,9 @@
                         </template>
                         <template v-if="page.floorContent.templateType == '5'">
                             <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' " class="page_main_item ad_01" :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
+                                <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
+                                    class="page_main_item ad_01" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
+                                    :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
                                     <img v-if="isPC" :src="page.floorContent.pcAdsImage1" alt="" class="page_main_item_adv">
                                     <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                 </a>
@@ -586,7 +604,7 @@
                         </template>
                         <template v-if="page.floorContent.templateType == '6'">
                             <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
-                                <a :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
+                                <a  :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                     <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
                                     <div class="page_main_text">{{ pros.name }}</div>
@@ -669,7 +687,9 @@
                                     </div>
                                 </a>
                             </div>
-                            <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' " class="page_main_item ad_01" :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
+                            <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
+                                class="page_main_item ad_01" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
+                                :target="page.floorContent.adsLink1!='' ? '_blank' : ''">
                                 <img v-if="isPC" :src="page.floorContent.pcAdsImage1" alt="" class="page_main_item_adv">
                                 <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                             </a>
@@ -765,7 +785,7 @@
                                 <div class="hotList swiper-container-floor" id="recommendBox">
                                     <div class="section_page_main type_08 clear mfw swiper-wrapper recommendBox-wrapper" :class="page.isPageMore ? 'max' : ''">
                                         <a class="page_main_item ad_04 swiper-slide" :href="pros.link"  v-for="(pros,index) in page.floorImageList" target="_blank">
-                                            <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
+                                            <img class="page_main_image" :src="pros.image" :alt="pros.name">
                                             <div class="page_main_tag" v-if="pros.listType == 2">{{ pros.label }}</div>
                                             <div class="page_main_text" target="_blank">{{pros.name}}</div>
                                             <div class="page_main_price" v-if="pros.listType == 1">

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

@@ -550,7 +550,7 @@
                                 <div class="hotList swiper-container" id="recommendBox">
                                     <div class="section_page_main clear mfw swiper-wrapper" :class="page.isPageMore ? '' : 'max'">
                                         <a class="productItem swiper-slide" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
-                                            <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
+                                            <img :src="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>
                                             <div class="price" v-if="pros.listType == 1">