Administrator преди 4 години
родител
ревизия
3ed0921a7b
променени са 2 файла, в които са добавени 35 реда и са изтрити 68 реда
  1. 2 2
      src/main/resources/static/css/product/instruement.css
  2. 33 66
      src/main/resources/templates/product/instrument.html

+ 2 - 2
src/main/resources/static/css/product/instruement.css

@@ -64,8 +64,8 @@
     .brand{color: #9aa5b5;margin: 10px 8px;border: 1px solid #e3ebf7;display: inline-block;padding: 0 10px;border-radius: 2px}
     .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 .bold{font-weight: bold;margin: 0}
+    .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}
 }
 

+ 33 - 66
src/main/resources/templates/product/instrument.html

@@ -79,15 +79,13 @@
                                                             </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>
-                                                                <div class="price_text_tag" >
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -98,10 +96,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag" >
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <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>
@@ -148,32 +144,25 @@
                                                             </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>
-                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
-                                                                 <div class="price_text_tag">
-                                                                    <p class="listTag"  v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
-                                                                 </div>
+                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                           <div class="price_text_tag">
-                                                             <p class="listTag" v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
-                                                           </div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">¥价格详聊</div>
                                                           <div class="main_price_show"  v-else>¥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <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>
@@ -225,10 +214,8 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag ">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                              <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -239,10 +226,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag ">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                       <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <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>
@@ -295,7 +280,7 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
                                                                 <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
@@ -307,10 +292,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag ">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em>¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <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>
@@ -361,10 +344,8 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -375,10 +356,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                       <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <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>
@@ -428,10 +407,8 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                               <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -442,10 +419,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <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>
@@ -496,10 +471,8 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                               <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -510,10 +483,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <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>
@@ -563,10 +534,8 @@
                                                                 <div class="main_price_unde">¥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                                <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -577,10 +546,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag" >
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">¥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">¥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <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>