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

src/main/resources/static/css/account/login.css

@@ -42,7 +42,7 @@ footer .footTop{display:none;}
  .bg-tittle .icon{width: 25px;height: 25px;position: absolute;right: 10px;top: 10px;cursor: pointer;}
  .bg-tittle .icon:before{ width: 25px;height: 25px;background-position: -313px 0px;}
  .bg .bg-content .text-conten{padding: 16px;}
- .bg .bg-content .text-conten .status{color: #333333;font-size: 16px;line-height: 26px;margin-bottom: 30px}
+ .bg .bg-content .text-conten .status{color: #333333;font-size: 16px;line-height: 26px;margin-bottom: 30px;text-align: center;}
  .bg .bg-content .text-conten .tip-p{text-align: center;color:#e15616;font-size: 14px;line-height: 26px }
  .bg .bg-content .text-conten div{cursor: pointer;text-align: center;background: #e15616;width: 128px;height: 32px;line-height: 32px;color: #fff;margin: auto;border-radius: 2px;margin-top: 20px}
 }
@@ -74,7 +74,7 @@ footer{display:none}
 .bg-tittle .icon{width: 6.4vw;height:6.4vw;position: absolute;right: 2.7vw;top: 2.7vw;cursor: pointer;}
 .bg-tittle .mIcon:before{ width:6.4vw ;height: 6.4vw;background-position: -33.5vw 0px;}
 .bg .bg-content .text-conten{padding: 4vw;border-top: .27vw solid #e2e7ef}
-.bg .bg-content .text-conten .status{color: #333333;font-size: 3.4vw;line-height: 5.4vw;margin-bottom: 5vw}
+.bg .bg-content .text-conten .status{color: #333333;font-size: 3.4vw;line-height: 5.4vw;margin-bottom: 5vw;text-align: center}
 .bg .bg-content .text-conten .tip-p{text-align: center;color:#e15616;font-size: 3vw;line-height: 7vw }
 .bg .bg-content .text-conten div{cursor: pointer;text-align: center;background: #e15616;width: 66.6vw;height: 9.9vw;line-height: 9.9vw;color: #fff;margin: auto;border-radius: .54vw;margin-top: 5vw}
 

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

@@ -259,9 +259,9 @@
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw"  :class="page.isPageMore ? 'max' : ''">
-                                        <a class='imgbaner'><img src="http://m.360buyimg.com/babel/jfs/t1/154859/31/6073/29706/5fb1d2c4E73af2908/9054ba7e4d595637.jpg.webp"></a>
-                                        <a class="img01"><img src="https://img-b.caimei365.com/group1/M00/03/11/Cmgy61_S3bGAKnQdAAEL2eOO3HU338.png"/></a>
-                                        <a class="img02"><img src="https://img-b.caimei365.com/group1/M00/03/11/Cmgy61_S3WSAC5igAAIpbsQkSoo172.png"/></a>
+                                        <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
+                                        <a class="img01" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage1"/></a>
+                                        <a class="img02" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage2"/></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>