测试4

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

@@ -73,10 +73,10 @@
 .section_page .page_main_price .price_grade_4:before{background-position:-84vw -90.7vw}
 .section_page .page_main_price .price_grade_5:before{background-position:-84vw -97.5vw}
 .section_page .page_main_price .main_price_none .listTag{padding:0 2vw;border:.27vw solid #ffe6dc;background:none;font-size:2.8vw;float:right}
-.section_page .page_main_price .price_grade{display:block;height:7vw;line-height:7vw;color:#4A4F58;font-style:normal;float:left}
-.section_page .page_main_price .price_grade .icon{display:inline-block;font-size:0;height:5vw;line-height:5vw;vertical-align:text-bottom}
+.section_page .page_main_price .price_grade,.section_page .page_main_price .price_grade_shop,.section_page .page_main_price .price_grade_club{display:block;height:7vw;line-height:7vw;color:#4A4F58;font-style:normal;float:left}
+.section_page .page_main_price .price_grade .icon,.section_page .page_main_price .price_grade_shop .icon,.section_page .page_main_price .price_grade_club .icon{display:inline-block;font-size:0;height:5vw;line-height:5vw;vertical-align:text-bottom}
 .section_page .page_main_tag{color:#9aa5b5;margin:1vw 3.2vw;border:.27vw solid #e3ebf7;display:inline-block;padding:0 1.3vw;border-radius:.54vw}
-.price_grade .bold{font-weight:bold}
+.section_page .page_main_price .bold{font-weight:bold}
 .section_right .item_banner .statu .icon-live{display:block;width:3vw;height:3vw;float:left;margin:1.6vw 0 0 1.6vw;background:url("/img/live/icon-live.h5.gif");background-size:cover}
 .section_right .item_banner .statu .mIcon.icon-end:before{width:5.3vw;height:4vw;background-position:-63.8vw -69vw}
 .section_right .item_banner .statu .mIcon.icon-wart:before{width:5.3vw;height:4vw;background-position:-59vw -69vw}

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

@@ -60,8 +60,8 @@ li{list-style:none;}
 .section_page .page_main_price .main_price_none{width:100%;height:24px;box-sizing:border-box;float:left;margin-top:2px}
 .section_page .page_main_price .main_price_none.sec{margin-top:25px}
 .section_page .page_main_price .main_price_none .listTag{margin:0}
-.section_page .page_main_price .price_grade{float:left;margin:0;height:22px;line-height:22px;color:#4A4F58;font-style:normal;font-size:14px}
-.section_page .page_main_price .price_grade span{display:inline-block;float:left}
+.section_page .page_main_price .price_grade,.section_page .page_main_price .price_grade_shop,.section_page .page_main_price .price_grade_club{float:left;margin:0;height:22px;line-height:22px;color:#4A4F58;font-style:normal;font-size:14px}
+.section_page .page_main_price .price_grade span,.section_page .page_main_price .price_grade_shop span,.section_page .page_main_price .price_grade_club span{display:inline-block;float:left}
 .section_page .page_main_price .icon:before{width:67px;height:22px}
 .section_page .page_main_price .price_grade_1:before{background-position:0 -714px}
 .section_page .page_main_price .price_grade_2:before{background-position:0 -744px}
@@ -84,7 +84,7 @@ li{list-style:none;}
 .section_page  .page_main_li .page_main_name{width:100%;height:32px;float:left;line-height:32px;text-align:center;font-size:14px;color:#4a4f58;background-color:#f9f9f9}
 /*右边区域*/
 .section_right{width:284px;float:right;box-sizing:border-box;padding-top:103px}
-.section_right .section_right_item{width:100%;height:auto;background-color:#FFFFFF;float:left;margin-bottom:16px;padding:16px;box-sizing:border-box;border-radius:2px}
+.section_right .section_right_item{width:284px;height:auto;background-color:#FFFFFF;float:left;margin-bottom:16px;padding:16px;box-sizing:border-box;border-radius:2px}
 .section_right .section_right_item.fixed{position:fixed;top:200px;width:284px;}
 .section_right .right_item_title{width:100%;height:22px;line-height:22px;float:left;margin-bottom:8px}
 .section_right .right_item_title p{float:left;font-size:16px;font-weight:bold;color:#4a4f58;text-align:left}
@@ -102,7 +102,6 @@ li{list-style:none;}
 .section_right .item_banner .statu p{float:left;width:50px;text-align:center;font-size:12px;line-height:22px;color:#FFF}
 .section_right  .item_text{display:block;width:100%;height:26px;line-height:26px;font-size:14px;color:#4a4f58;margin:3px 0}
 .section_right  .item_text .item_text_name{width:164px;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;padding-left:12px;box-sizing:border-box;float:left;position:relative}
-.section_right  .item_text .item_text_name.info{width:100%}
 .section_right  .item_text .item_text_name:before{content:'';width:4px;height:4px;border-radius:50%;background-color:#cccccc;position:absolute;left:0;top:11px}
 .section_right  .item_text .item_text_time{float:right}
 .section_right  .item_text:hover{color:#E15616;text-decoration:underline}

src/main/resources/static/js/index.js

@@ -220,10 +220,11 @@ var homeData = new Vue({
                         // priceFlag: 0公开价格 1不公开价格 2仅对会员机构公开
                         var parent = $(".main_price_text.product_"+ price.productId);
                         var priceFlag = parent.find(".main_price_login").attr('data-id')*1;
-                        if (priceFlag === 0 || userIdentity===2 || (userIdentity===3 && shopId === price.shopId*1)) {
+                        if (userIdentity===2 || (priceFlag === 0 && userIdentity===4 ) || (userIdentity===3 && shopId === price.shopId*1)) {
                             parent.find(".price_o_num").text(Number(price.originalPrice).toFixed(2));
                             parent.find(".price_num").text(Number(price.price).toFixed(2));
                             if(price.promotions && price.promotions.type*1===1 && price.promotions.mode*1===1){
+                                parent.find(".main_price_show").hide();
                                 parent.find(".main_price_show.none").show();
                             }
                         } else if (userIdentity===4 && priceFlag === 2){

src/main/resources/templates/index.html

@@ -144,7 +144,7 @@
                                                         <!-- 正常商品 -->
                                                         <th:block th:if="*{productCategory}==1">
                                                             <div class="price_text_tag" th:if="${pros.get('product').containsKey('actStatus')}">
-                                                                <p class="listTag" th:if="*{actStatus}==1 and *{promotions}!=null">
+                                                                <p class="listTag" th:if="*{actStatus}==1 and ${pros.get('product').get('promotions')}!=null">
                                                                     <template th:text="*{promotions.name}"></template>
                                                                     <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">
                                                                         <!--单品优惠:优惠价-->