Administrator 4 年之前
父节点
当前提交
39bf75846c

+ 1 - 0
src/main/resources/static/css/index/index_new.h5.css

@@ -74,6 +74,7 @@
         float: left;
         margin: 1.3vw 0 0vw 0;
     }
+    .section_page .page_main_price .main_price_show{color:#f94b4b }
     .section_page .page_main_price .main_price_unde{
         width: 100%;
         height: 6.5vw;

+ 17 - 14
src/main/resources/static/css/product/instruement.css

@@ -24,15 +24,15 @@
     .hotList  a.img02{width: 344px;}
     .hotList .imgbaner{width: 884px;height: 120px;display: block}
     .hotList a img {width: 100%;height: 100%;}
-    .hotList div{height: 568px;overflow: hidden;}
-    .hotList div.type{height: 704px;}
-    .hotList div.max{height: auto;}
-    .hotList div a {width: 164px;height: 268px;float: left;background: #fff;position: relative;margin: 0 16px 16px 0;overflow: hidden;float: left;transition: all 0.4s;}
+    .hotList .section_page_main{height: 568px;overflow: hidden;}
+    .hotList .section_page_main.type{height: 704px;}
+    .hotList .section_page_main.max{height: auto;}
+    .hotList .section_page_main a {width: 164px;height: 268px;float: left;background: #fff;position: relative;margin: 0 16px 16px 0;overflow: hidden;float: left;transition: all 0.4s;}
     .swiper-container a{margin-right: 16px;}
     .swiper-container div{height: auto;}
-    .hotList div a>a{display: block;}
-    .hotList div .productItem img{width: 100%;height: 164px;}
-    .productItem .name {display: block;padding: 0 16px;height: 40px;line-height: 21px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+    .hotList .section_page_main a>a{display: block;}
+    .hotList .section_page_main .productItem img{width: 100%;height: 164px;}
+    .productItem .name {margin-top: 8px;display: block;padding: 0 16px;height: 40px;line-height: 21px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
     .productItem .price{border: 0;box-sizing: border-box;padding: 0 8px;height: 54px;width: 100%;}
     .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
     .productItem .price .price_text_tag .listTag{margin: 0;float: left}
@@ -82,8 +82,11 @@
     .floorCon .hotList div a{width: 45.6vw;height: 68vw;overflow: hidden;margin: 0 1.3vw 2.6vw 1.3vw;background: #fff;text-align: left;}
     .hotList div a.img01 img,.hotList div a.img02 img{height: 100%}
     .hotList div a img {width: 45.6vw;height: 45.6vw}
-    .productItem .name{margin-top: 8px;display: block;padding: 0 3.2vw;height:9.3vw;line-height: 4.8vw;font-size: 3.4vw;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
+    .productItem .name{margin:1vw 0;display: block;padding: 0 3.2vw;height:9.3vw;line-height: 4.8vw;font-size: 3.4vw;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
     .productItem .price em{display: block;height: 7vw;line-height: 7vw;color: #4A4F58;font-style: normal;float: left;}
+    .productItem .price .main_price_unde {width: 100%;height: 6.5vw;line-height: 6.5vw;font-size: 3.4vw;color: #4a4f58;text-align: left;float: left;}
+    .productItem .price .price_text_tag {width: 100%;box-sizing: border-box;}
+    .productItem .price .main_price_show{color: #f94b4b}
     .hotList div.unfold{width: 20vw;height: 6.4vw;margin: 5vw auto;border: .27vw solid #cccccc;color: #909090;font-size: 3vw;line-height: 6.4vw;text-align: center;border-radius: .54vw}
     .productItem .price .mIcon:before{width:15.8vw;height: 5vw}
     .productItem .price .mIcon.i5:before {background-position: -84vw -97.5vw;}
@@ -101,15 +104,15 @@
     #swiper-container .swiper-pagination .swiper-pagination-bullet:before{content:"";display:block;width:100%;height:.6vw;background:#FFF;border-radius:.3vw}
     #swiper-container .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:3.8vw;opacity:1}
 
-    .price {padding: 2.7vw 3.2vw;overflow: hidden;}
+    .price {overflow: hidden;    width: 100%;box-sizing: border-box;padding: 0 3.2vw;}
     .productItem  .price .mIcon {display: inline-block;font-size: 0;height: 5vw;line-height: 5vw;vertical-align: text-bottom;}
     .icon.hot:before{width: 5.3vw;height:4.5vw;background-position: -53.9vw -69.3vw;position: absolute;top: -2.7vw;right: -2.7vw;}
-    .priceTag .tag, .listTag{padding: 0 2vw;border: .27vw solid #ffe6dc;background: none;font-size: 2.8vw;float: right;}
-    .brand{color: #9aa5b5;margin: 2.7vw 3.2vw;border: .27vw solid #e3ebf7;display: inline-block;padding: 0 1.3vw;border-radius: .54vw}
-    .floorCon .hotList .imgbaner{width: 93.6vw;height: 24vw;margin:1.3vw auto}
+    .priceTag .tag, .listTag{padding: 0 2vw;border: .27vw solid #ffe6dc;background: none;font-size: 2.8vw;float: left;height: 4.2vw;line-height: 4.2vw;}
+    .brand{color: #9aa5b5;margin: 1vw 3.2vw;border: .27vw solid #e3ebf7;display: inline-block;padding: 0 1.3vw;border-radius: .54vw}
+    .floorCon .hotList .imgbaner{width: 93.6vw;height: 24vw;margin:1.3vw auto 2.6vw;}
     .floorCon .hotList .imgbaner img{width: 100%;height: 100%;}
-    .hotList div {height: 140vw;overflow: hidden;}
-    .hotList div.type{height: 167vw}
+    .hotList .section_page_main {height: 140vw;overflow: hidden;}
+    .hotList .section_page_main.type{height: 167vw}
     .open.mIcon:before{width: 5.4vw;height: 5.4vw;background-position: -51vw 0px;transition:none}
     .close.mIcon:before{width: 5.4vw;height: 5.4vw;background-position: -42vw 0px;transition:none}
     .instrue-right .hot-search ul{width: 90%;float: left}

+ 5 - 0
src/main/resources/static/js/product/instruement.js

@@ -18,6 +18,11 @@
     },
     computed:{
 
+    },
+    filters:{
+         NumFormat:function(value) {//处理金额
+            return Number(value).toFixed(2);
+        },
     },
     methods:{
          PromotionsFormat:function(promo){//促销活动类型数据处理

+ 8 - 8
src/main/resources/templates/product/instrument.html

@@ -49,7 +49,7 @@
                         <template v-if="page.floorContent.templateType == '1'">
                              <div class="floorCon">
                                  <div class="hotList recommend">
-                                    <div class="clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <a  class="img01" :href="page.floorContent.adsLink1" ><img :src="page.floorContent.pcAdsImage1"/></a>
                                         <a class="productItem" :href="pros.link" v-for="(pros,index) in page.floorImageList" >
                                             <img :src="pros.image ? pros.image : '/img/base/placeholder.png'" :data-original="pros.image" :alt="pros.name">
@@ -107,7 +107,7 @@
                         <template v-if="page.floorContent.templateType == '2'">
                              <div class="floorCon">
                                  <div class="hotList">
-                                    <div class="clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <a :href="page.floorContent.adsLink1" class="img01"><img  :src="page.floorContent.pcAdsImage1" alt=""> </a>
                                         <a :href="page.floorContent.adsLink2" class="img02"><img  :src="page.floorContent.pcAdsImage2" alt=""> </a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
@@ -166,7 +166,7 @@
                         <template v-if="page.floorContent.templateType == '3'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="type clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main type clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <a class='imgbaner' :href="page.floorContent.adsLink1"><img :src="page.floorContent.pcAdsImage1"></a>
                                         <a class="img01" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage2"/></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
@@ -225,7 +225,7 @@
                         <template v-if="page.floorContent.templateType == '4'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="type clear mfw"  :class="page.isPageMore ? 'max' : ''">
+                                    <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>
@@ -285,7 +285,7 @@
                         <template v-if="page.floorContent.templateType == '5'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="type clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main type clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <a class='imgbaner' :href="page.floorContent.adsLink1"><img :src="page.floorContent.pcAdsImage1"></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">
@@ -343,7 +343,7 @@
                         <template v-if="page.floorContent.templateType == '6'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <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>
@@ -401,7 +401,7 @@
                         <template v-if="page.floorContent.templateType == '7'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <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>
@@ -458,7 +458,7 @@
                         <template v-if="page.floorContent.templateType == '8'">
                             <div class="floorCon">
                                 <div class="hotList swiper-container" id="recommendBox">
-                                    <div class="clear mfw swiper-wrapper" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw swiper-wrapper" :class="page.isPageMore ? 'max' : ''">
                                         <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>