Merge branch 'developerB' of git.caimei365.com:chao/caimei-caimei365-www into developerB

# Conflicts:
#	src/main/resources/static/css/base/base.pc.css

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">
+                        <div class="section_right_item" v-if="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">
+                        <div class="section_right_item" v-if="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">
+                        <div class="section_right_item" v-if="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>
@@ -858,7 +858,7 @@
                             <p>采美正品联盟 质量保证</p>
                         </div>
                         <div class="section_page_bottom">
-                            <a href="supplierWwwLink" class="page_main_li ad_01"><img class="page_main_item_adv" :src="supplierImage" alt=""> </a>
+                            <a :href="supplierWwwLink" class="page_main_li ad_01"><img class="page_main_item_adv" :src="supplierImage" alt=""> </a>
                             <a :href="shop.link" class="page_main_li ad_02" v-for="(shop,index) in supplierList">
                                 <img class="page_main_logo" :src="shop.image" alt="">
                                 <div class="page_main_name">{{ shop.supplierName }}</div>