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

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

@@ -67,6 +67,7 @@
     .productItem .price .price_grade{font-weight: normal;margin: 0;}
     .productItem .price .price_grade .bold{font-weight: 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/product/instrument.html

@@ -590,7 +590,7 @@
                                                         <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
                                                     </template>
                                                     <template v-else>
-                                                            <em class="price_grade">￥登录可见</em>
+                                                            <em class="price_grade sec">￥登录可见</em>
                                                     </template>
                                                 </template>
                                              </div>