zhengjinyi 3 лет назад
Родитель
Сommit
1be18c7034

+ 1 - 1
src/main/resources/static/js/product/instruement.js

@@ -197,7 +197,7 @@
         var _self = this;
          var userInfo = localStorage.getItem('userInfo');
          if(userInfo){
-             this.params.userId = JSON.parse(userInfo).userId;
+             _self.userId = _self.params.userId = JSON.parse(userInfo).userId;
          }
          //this.params.pageId = getUrlParam('id');
          var paramsArr = window.location.pathname.split(".")[0].split("-");

+ 13 - 13
src/main/resources/templates/index.html

@@ -301,19 +301,19 @@
                                                                 <div class="main_price_none">
                                                                     <em class="price_grade service_none"><span class="bold">¥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
                                                                 </div>
-<!--                                                                <div class="main_price_login" th:attr="data-id=*{priceFlag}">-->
-<!--                                                                    &lt;!&ndash;0公开价格 1不公开价格 2仅对会员机构公开&ndash;&gt;-->
-<!--                                                                    <em th:if="*{priceFlag}==1" class="price_grade"><span>¥</span>价格未公开</em>-->
-<!--                                                                    <th:block th:unless="*{priceFlag}==1">-->
-<!--                                                                        <em class="price_grade_club"><span>¥</span>会员可见</em>-->
-<!--                                                                        &lt;!&ndash;机构价&ndash;&gt;-->
-<!--                                                                        <div class="main_price_show">¥<span class="price_num"></span></div>-->
-<!--                                                                        &lt;!&ndash;单品优惠时的划线价&ndash;&gt;-->
-<!--                                                                        <div class="main_price_show none">¥<span class="price_o_num"></span></div>-->
-<!--                                                                        &lt;!&ndash;供应商除自己的商品外,也显示价格等级&ndash;&gt;-->
-<!--                                                                        <em class="price_grade_shop"><span class="bold">¥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>-->
-<!--                                                                    </th:block>-->
-<!--                                                                </div>-->
+                                                                <div class="main_price_login" th:attr="data-id=*{priceFlag}">
+                                                                    <!--0公开价格 1不公开价格 2仅对会员机构公开-->
+                                                                    <em th:if="*{priceFlag}==1" class="price_grade"><span>¥</span>价格未公开</em>
+                                                                    <th:block th:unless="*{priceFlag}==1">
+                                                                        <em class="price_grade_club"><span>¥</span>会员可见</em>
+                                                                        <!--机构价-->
+                                                                        <div class="main_price_show">¥<span class="price_num"></span></div>
+                                                                        <!--单品优惠时的划线价-->
+                                                                        <div class="main_price_show none">¥<span class="price_o_num"></span></div>
+                                                                        <!--供应商除自己的商品外,也显示价格等级-->
+                                                                        <em class="price_grade_shop"><span class="bold">¥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
+                                                                    </th:block>
+                                                                </div>
                                                             </th:block>
                                                             <!-- 二手商品 -->
                                                             <th:block th:if="*{productCategory}!=1">

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

@@ -235,13 +235,13 @@
                                                 </th:block>
                                                 <span th:text="${pros.get('name')}"></span>
                                             </div>
-                                            <div class="page_main_price" th:if="*{listType}==1">
+                                            <div class="page_main_price" th:if="*{listType}==1" v-if="params.userId>0">
                                                 <th:block th:if="${pros.get('product')}!=null" th:object="${pros.get('product')}">
                                                     <!-- 商品价格 -->
                                                     <div th:attr="class=*{'main_price_text product_'+productId}, data-id=*{productId}">
                                                         <!-- 正常商品 -->
                                                         <th:block th:if="*{productCategory}==1">
-                                                            <div class="price_text_tag" th:if="${pros.get('product').containsKey('actStatus')}" v-if="params.userId>0">
+                                                            <div class="price_text_tag" th:if="${pros.get('product').containsKey('actStatus')}">
                                                                 <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">
@@ -253,19 +253,19 @@
                                                             <div class="main_price_none">
                                                                 <em class="price_grade service_none"><span class="bold">¥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
                                                             </div>
-<!--                                                            <div class="main_price_login" th:attr="data-id=*{priceFlag}">-->
-<!--                                                                &lt;!&ndash;0公开价格 1不公开价格 2仅对会员机构公开&ndash;&gt;-->
-<!--                                                                <em th:if="*{priceFlag}==1" class="price_grade"><span>¥</span>价格未公开</em>-->
-<!--                                                                <th:block th:unless="*{priceFlag}==1">-->
-<!--                                                                    <em class="price_grade_club"><span>¥</span>会员可见</em>-->
-<!--                                                                    &lt;!&ndash;机构价&ndash;&gt;-->
-<!--                                                                    <div class="main_price_show">¥<span class="price_num"></span></div>-->
-<!--                                                                    &lt;!&ndash;单品优惠时的划线价&ndash;&gt;-->
-<!--                                                                    <div class="main_price_show none">¥<span class="price_o_num"></span></div>-->
-<!--                                                                    &lt;!&ndash;供应商除自己的商品外,也显示价格等级&ndash;&gt;-->
-<!--                                                                    <em class="price_grade_shop"><span class="bold">¥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>-->
-<!--                                                                </th:block>-->
-<!--                                                            </div>-->
+                                                            <div class="main_price_login" th:attr="data-id=*{priceFlag}">
+                                                                <!--0公开价格 1不公开价格 2仅对会员机构公开-->
+                                                                <em th:if="*{priceFlag}==1" class="price_grade"><span>¥</span>价格未公开</em>
+                                                                <th:block th:unless="*{priceFlag}==1">
+                                                                    <em class="price_grade_club"><span>¥</span>会员可见</em>
+                                                                    <!--机构价-->
+                                                                    <div class="main_price_show">¥<span class="price_num"></span></div>
+                                                                    <!--单品优惠时的划线价-->
+                                                                    <div class="main_price_show none">¥<span class="price_o_num"></span></div>
+                                                                    <!--供应商除自己的商品外,也显示价格等级-->
+                                                                    <em class="price_grade_shop"><span class="bold">¥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
+                                                                </th:block>
+                                                            </div>
                                                         </th:block>
                                                         <!-- 二手商品 -->
                                                         <th:block th:if="*{productCategory}!=1">