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

# Conflicts:
#	target/www-0.0.1-SNAPSHOT.jar

src/main/resources/static/css/base/base.pc.css

@@ -243,7 +243,7 @@ iframe{width:320px !important;height: 280px !important}
 .copyright .item{white-space:nowrap;padding-left:35px;position:relative;float:left;margin-left:50%;transform:translateX(-50%)}
 .copyright .item:before{position:absolute;left:0;width:32px;height:32px;background-position:0 -140px}
 .copyright p span{margin:0 5px}
-.copyright p:nth-of-type(2) span:first-child{margin-right:50px}
+.copyright p:nth-of-type(2) span:first-child{margin-right:10px}
 @keyframes showAmnation {0% {top:-150px;display:none;}100% {top:-135px;display: block;} }
 /*商品Item*/
 .productItem{float:left;width:284px;height:416px;margin:0 8px;}

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

@@ -129,7 +129,7 @@ li{list-style:none;}
     height: 42px;
     float: left;
     box-sizing: border-box;
-    margin-top: 8px;
+    margin-top: 5px;
     padding: 0 8px;
     white-space: normal;
     word-break: break-all;
@@ -200,7 +200,7 @@ li{list-style:none;}
     height: 22px;
     box-sizing: border-box;
     float: left;
-    margin-top: 3px;
+    margin-top: 0px;
 }
 .section_page .page_main_price .price_text_tag .listTag{
     margin:0;
@@ -208,13 +208,13 @@ li{list-style:none;}
 }
 .section_page .page_main_price .main_price_none{
     width: 100%;
-    height: 54px;
+    height: 24px;
     box-sizing: border-box;
     float: left;
-    margin-top: 2px;
+    margin-top: 5px;
 }
 .section_page .page_main_price .main_price_none.sec{
-    margin-top: 20px;
+    margin-top: 25px;
 }
 .section_page .page_main_price .main_price_none .listTag{
     margin:0;
@@ -488,7 +488,6 @@ li{list-style:none;}
 .section_right  .item_text:hover .item_text_name:before{
     background-color: #E15616;
 }
-.price_grade .bold{font-weight: bold}
 #recommendBox .swiper-pagination{
     width:100%;
     padding:10px 0;

src/main/resources/static/css/product/instruement.css

@@ -65,7 +65,7 @@
     .item_icon{ width: 100%;height: 36px;padding: 12px 0 8px 0;}
     .item_icon img{width: 36px;height: 36px;display: block;margin: 0 auto;}
     .productItem .price .price_grade{font-weight: normal;margin: 0;}
-    .productItem .price .price_grade .bold{font-weight: bold;margin: 0}
+    .productItem .price .price_grade .bold{margin: 0}
     .price .right-box{margin:12px 0 0 0}
     .productItem .price .price_grade.sec{display: block;margin-top: 15px}
 }

src/main/resources/templates/index.html

@@ -764,7 +764,7 @@
                             <div class="floorCon">
                                 <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 swiper-slide" :href="pros.link"  v-for="(pros,index) in page.floorImageList" target="_blank">
+                                        <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">
                                             <div class="page_main_tag" v-if="pros.listType == 2">{{ pros.label }}</div>
                                             <div class="page_main_text" target="_blank">{{pros.name}}</div>