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

src/main/resources/config/dev/application-dev.yml

@@ -53,7 +53,7 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: http://192.168.2.67:8008
+  spiServer: https://spi-b.caimei365.com
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

src/main/resources/templates/index.html

@@ -49,7 +49,7 @@
                             </div>
                             <div class="right_item_main" v-for="(live,index) in liveList">
                                 <a :href="live.link" class="item_banner" v-if="index === 0" target="_blank" :title="live.liveTitle">
-                                    <img :src="live.homePageImage ? live.homePageImage : '/img/base/placeholder.png'" alt="">
+                                    <img src="/img/base/placeholder.png" :data-original="live.homePageImage" :alt="live.liveTitle">
                                     <div class="name" v-text="live.liveTitle"></div>
                                     <div class="statu">
                                         <i :class="live.liveStatus | statusTypeClass" class="mIcon"></i>
@@ -70,7 +70,7 @@
                             </div>
                             <div class="right_item_main" v-for="(cmImage,index) in cmImageList">
                                 <a :href="cmImage.link" class="item_banner" v-if="index === 0" target="_blank" :title="cmImage.title">
-                                    <img :src="cmImage.homePageImage ? cmImage.homePageImage : '/img/base/placeholder.png'" alt="">
+                                    <img src="/img/base/placeholder.png" :data-original="cmImage.homePageImage" :alt="cmImage.title">
                                     <div class="name" v-text="cmImage.title"></div>
                                 </a>
                                 <a :href="cmImage.link" class="item_text" v-if="index > 0" target="_blank" :title="cmImage.title">
@@ -86,7 +86,7 @@
                             </div>
                             <div class="right_item_main" v-for="(info,index) in infoList">
                                 <a :href="info.link" class="item_banner" v-if="index === 0" target="_blank" :title="info.title">
-                                    <img :src="info.homePageImage ? info.homePageImage : '/img/base/placeholder.png'" alt="">
+                                    <img src="/img/base/placeholder.png" :data-original="info.homePageImage" :alt="info.title">
                                     <div class="name" v-text="info.title"></div>
                                 </a>
                                 <a :href="info.link" class="item_text" v-if="index > 0" target="_blank" :title="info.title">
@@ -110,7 +110,7 @@
                                     <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                 </a>
                                 <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="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                    <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>
                                     <div class="page_main_price" v-if="pros.listType == 1">
@@ -207,7 +207,7 @@
                                     <img v-else :src="page.floorContent.appletsAdsImage2" alt="" class="page_main_item_adv">
                                 </a>
                                 <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="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                    <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>
                                     <div class="page_main_price" v-if="pros.listType == 1">
@@ -304,7 +304,7 @@
                                     <img v-else :src="page.floorContent.appletsAdsImage2" alt="" class="page_main_item_adv">
                                 </a>
                                 <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="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                    <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>
                                     <div class="page_main_price" v-if="pros.listType == 1">
@@ -405,7 +405,7 @@
                                     <img v-else :src="page.floorContent.appletsAdsImage3" alt="" class="page_main_item_adv">
                                 </a>
                                 <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="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                    <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>
                                     <div class="page_main_price" v-if="pros.listType == 1">
@@ -498,7 +498,7 @@
                                     <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                 </a>
                                 <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="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                    <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>
                                     <div class="page_main_price" v-if="pros.listType == 1">
@@ -587,7 +587,7 @@
                         <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">
-                                    <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                    <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>
                                     <div class="page_main_price" v-if="pros.listType == 1">
@@ -677,7 +677,7 @@
                         <template v-if="page.floorContent.templateType == '7'">
                             <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">
-                                    <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                    <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>
                                     <div class="page_main_price" v-if="pros.listType == 1">
@@ -860,7 +860,7 @@
                         <div class="section_page_bottom">
                             <a :href="supplierWwwLink!='' ? supplierWwwLink : 'javascript:void(0)' " class="page_main_li ad_01" :target="supplierWwwLink!='' ? '_blank' : ''"><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" target="_blank">
-                                <img class="page_main_logo" :src="shop.image" alt="">
+                                <img class="page_main_logo" src="/img/base/placeholder.png" :data-original="shop.image" :alt="shop.supplierName">
                                 <div class="page_main_name">{{ shop.supplierName }}</div>
                             </a>
                         </div>