Administrator 4 years ago
parent
commit
29a79ba547

+ 3 - 4
src/main/resources/static/css/product/instruement.css

@@ -66,6 +66,7 @@
     .item_icon img{width: 36px;height: 36px;display: block;margin: 0 auto;}
     .productItem .price em{font-weight: normal;margin: 0;}
     .productItem .price em.bold{font-weight: bold;margin: 0}
+    .price .right-box{margin:12px 0 0 0}
 }
 
 
@@ -104,7 +105,7 @@
     .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: left;height: 4.2vw;line-height: 4.2vw;}
+    .priceTag .tag, .listTag{padding: .5vw 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 !important;height: 24vw;margin:1.3vw auto 2.6vw;display: block}
     .floorCon .hotList .imgbaner img{width: 100%;height: 100%;}
@@ -118,8 +119,6 @@
     .item_icon img{width: 8.8vw;height: 8.8vw;display: block;margin: 0 auto}
     .bg{position: fixed;background: rgba(34,39,46, 0.3);left: 0;width: 100%;height: 100%;z-index: 1000;transition: 0.5s;}
     .noclick{pointer-events: none}
-    .hotList .section_page_main.swiper-wrapper{
-        height: inherit ;
+    .hotList .section_page_main.swiper-wrapper{height: inherit ;}
 
-    }
 }

+ 26 - 18
src/main/resources/templates/product/instrument.html

@@ -84,14 +84,15 @@
                                                         </template>
                                                         <template v-else>
                                                             <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         </template>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
+                                                        <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -143,14 +144,15 @@
                                                         </template>
                                                         <template v-else>
                                                             <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         </template>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
+                                                        <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -202,14 +204,15 @@
                                                         </template>
                                                         <template v-else>
                                                             <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         </template>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
+                                                        <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -262,14 +265,15 @@
                                                         </template>
                                                         <template v-else>
                                                             <em>¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         </template>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
+                                                        <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         <em>¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -320,14 +324,15 @@
                                                         </template>
                                                         <template v-else>
                                                             <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         </template>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
+                                                        <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -371,20 +376,21 @@
                                                         </template>
                                                         <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
-                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                <p class="listTag " v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class="main_price_unde">¥会员可见</div>
                                                         </template>
                                                         <template v-else>
                                                             <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         </template>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
+                                                        <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -434,15 +440,16 @@
                                                             <div class="main_price_unde">¥会员可见</div>
                                                         </template>
                                                         <template v-else>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         </template>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
                                                         <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>
@@ -468,7 +475,7 @@
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                     <template v-if="pros.product.price1TextFlag==1">
                                                         <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            <p class="listTag " v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_unde">¥价格未公开</div>
                                                     </template>
@@ -492,14 +499,15 @@
                                                         </template>
                                                         <template v-else>
                                                             <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         </template>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
+                                                        <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                         <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                        <span class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">¥登录可见</em>