Merge remote-tracking branch 'remotes/origin/developer' into developerD

src/main/resources/static/css/base/base.h5.css

@@ -2,6 +2,9 @@
 /**
 * 移动端
 */
+/*===================此行代码为申请证书时使用,后续可删除======================*/
+.service_none{display:none !important;}
+/*===================此行代码为申请证书时使用,后续可删除======================*/
 .noneImportant .footTop,
 .noneImportant .footMain{display:none!important;}
 .wechat_qrcode{display: none;}

src/main/resources/static/css/base/base.pc.css

@@ -2,6 +2,10 @@
 /**
 * PC端
 */
+/*===================此行代码为申请证书时使用,后续可删除======================*/
+.service_none{display:none !important;}
+/*===================此行代码为申请证书时使用,后续可删除======================*/
+
 body{min-width:1184px;}
 header{box-shadow: 0 2px 10px #ebecef;}
 .h5Only{display:none!important;}

src/main/resources/static/css/base/floor.css

@@ -39,6 +39,9 @@
 .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{display: none !important;}
+/*===================此行代码为申请证书时使用,后续可删除======================*/
 .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}
@@ -118,6 +121,9 @@
 .section_page .section_page_main.max{height:auto}
 .section_page .page_main_item.ad_01.bottom{margin:2.4vw auto;display:block}
 .section_page .page_main_price .icon:before{width:15.8vw;height:5vw}
+/*===================此行代码为申请证书时使用,后续可删除======================*/
+.section_page .page_main_price .price_grade{display: none !important;}
+/*===================此行代码为申请证书时使用,后续可删除======================*/
 .section_page .page_main_price .price_grade_1:before{background-position:-84vw -69.5vw}
 .section_page .page_main_price .price_grade_2:before{background-position:-84vw -76.5vw}
 .section_page .page_main_price .price_grade_3:before{background-position:-84vw -83.7vw}

src/main/resources/static/js/flea-market/list.js

@@ -9,7 +9,7 @@ var fleaMarketList = new Vue({
          requestFlag:false,
          showflag:false,
          mainflag:false,
-         userID:JSON.parse(localStorage.getItem('userInfo')),
+         userId:0,
          tabTitleName:'二手仪器',
          tabTitle: [
                     {value:'1',name:'二手仪器'},
@@ -159,7 +159,11 @@ var fleaMarketList = new Vue({
      },
      mounted:function () {
           var _this = this;
-          _this.gettabList();
+          var userInfo = JSON.parse(localStorage.getItem('userInfo'));
+          if(userInfo){
+              _this.userId = userInfo.userId;
+          }
+         _this.gettabList();
          setTimeout(function(){  // 图片懒加载
              $("img[data-original]").lazyload();
          },500);

src/main/resources/static/js/flea-market/secondDetail.js

@@ -5,7 +5,6 @@ var fleaMarket = new Vue({
     el:"#fleaMarket",
     data: {
         tabIndex:0,
-        userId:'',
         shopId:'',
         productId: $("#productId").val(),
         isShow:false,

src/main/resources/templates/activity/activityTopic.html

@@ -447,10 +447,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -458,7 +458,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -564,10 +564,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -575,7 +575,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -692,10 +692,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -703,7 +703,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -793,10 +793,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -804,7 +804,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -911,10 +911,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -922,7 +922,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1023,10 +1023,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -1034,7 +1034,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1135,10 +1135,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -1146,7 +1146,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1242,10 +1242,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -1253,7 +1253,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1350,10 +1350,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -1361,7 +1361,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1451,10 +1451,10 @@
                       <template v-else>
                         <!-- 样式6 -->
                         <template v-if="pros.product.productCategory == 1">
-                          <div class="price-tag">
+                          <div class="price-tag" v-if="params.userId>0">
                             <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                           </div>
-                          <div class="price">
+                          <div class="price service_none">
                             <span>￥</span>
                             <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
@@ -1462,7 +1462,7 @@
                         <!-- 样式7 -->
                         <template v-else>
                           <div class="price-tag"></div>
-                          <div class="price"><span>￥登录可见</span></div>
+                          <div class="price service_none"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1565,11 +1565,11 @@
                             <template v-else>
                               <!-- 样式6 -->
                               <template v-if="pros.product.productCategory == 1">
-                                <div class="price-tag">
+                                <div class="price-tag" v-if="params.userId>0">
                                   <span class="tag"
                                     v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                 </div>
-                                <div class="price">
+                                <div class="price service_none">
                                   <span>￥</span>
                                   <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                                 </div>
@@ -1577,7 +1577,7 @@
                               <!-- 样式7 -->
                               <template v-else>
                                 <div class="price-tag"></div>
-                                <div class="price"><span>￥登录可见</span></div>
+                                <div class="price service_none"><span>￥登录可见</span></div>
                               </template>
                             </template>
                           </div>
@@ -1671,11 +1671,11 @@
                             <template v-else>
                               <!-- 样式6 -->
                               <template v-if="pros.product.productCategory == 1">
-                                <div class="price-tag">
+                                <div class="price-tag" v-if="params.userId>0">
                                   <span class="tag"
                                     v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                 </div>
-                                <div class="price">
+                                <div class="price service_none">
                                   <span>￥</span>
                                   <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                                 </div>
@@ -1683,7 +1683,7 @@
                               <!-- 样式7 -->
                               <template v-else>
                                 <div class="price-tag"></div>
-                                <div class="price"><span>￥登录可见</span></div>
+                                <div class="price service_none"><span>￥登录可见</span></div>
                               </template>
                             </template>
                           </div>

src/main/resources/templates/flea-market/detail.html

@@ -50,29 +50,28 @@
                     </span>
                      <p class="info-p name">{{detail.name}}</p>
                     <div class="brandMain" v-on:mouseover="changeActive($event)" v-on:mouseout="removeActive($event)" v-show="isShow" v-if="detail.brandInfo!=null||detail.brandInfo !=''"><div class="zheng-graphics"></div>{{detail.brandInfo}}</div>
-                    <img src="/img/flea-market/yishou.png" class="yishou_img" v-if="soldImage" :class="soldImage?'show':''">
+                    <img src="/img/flea-market/yishou.png" class="yishou_img" v-if="soldImage && userID>0" :class="soldImage?'show':''">
                 </div>
                 <div class="preview-info-main clearfix">
                     <div class="info price" style="width: 100%" >
-                        <span class="label">交&nbsp;&nbsp;易&nbsp;&nbsp;价：</span>
-                        <p>
-                            <span v-if="detail.detailTalkFlag==2&&userID==0" class="fave-text">价格详聊</span></span>
-                            <span v-else-if="userID==0"><a class="member-detail toLogin loginWithParam" onclick="_czc.push(['_trackEvent','二手商品详情','登录查看价格','点击','','Um_Event_SecondDetailsLoginButton'])">登录查看价格></a></span>
-                            <span v-else-if="userID!=0&&detail.detailTalkFlag==2" class="fave-text">价格详聊</span></span>
+                        <span class="label" v-if="userID>0">交&nbsp;&nbsp;易&nbsp;&nbsp;价：</span>
+                        <p v-if="userID>0">
+                            <span v-if="detail.detailTalkFlag==2&&userID>0" class="fave-text">价格详聊</span></span>
+                            <span v-else-if="userID == 0"><a class="member-detail toLogin loginWithParam service_none" onclick="_czc.push(['_trackEvent','二手商品详情','登录查看价格','点击','','Um_Event_SecondDetailsLoginButton'])">登录查看价格></a></span>
+                            <span v-else-if="userID > 0 && detail.detailTalkFlag==2" class="fave-text">价格详聊</span></span>
                             <span v-else class="fave-text">￥<span class="big">{{detail.price}}</span></span>
                         </p>
                         <div class="tag">
                            <span class="infotag news" v-if="detail.sold==0&&detail.newAdded==1">最新</span>
-                           <span class="infotag brand" v-if="detail.brandName!=null&&detail.brandName!=''&&detail.brandID !=161">{{detail.brandName}}</span>
                            <span class="infotag sold" v-if="detail.sold==1&&detail.newAdded==1||detail.sold==1&&detail.newAdded==0">已售</span>
                            <span class="infotag other" v-if="detail.brandID==161&&detail.brandName!=''&&detail.brandName!=null">{{detail.brandName}}</span>
                          </div>
                     </div>
-                     <div class="info " v-if="HandType">
+                     <div class="info " v-if="HandType && userID > 0">
                         <span class="label">市&nbsp;&nbsp;场&nbsp;&nbsp;价：</span>
                         <p>{{detail.normalPriceStr}}</p>
                     </div>
-                    <div class="info " v-if="HandType">
+                    <div class="info " v-if="HandType && userID > 0">
                        <span class="label" style="width: 90px">采购价/原价：</span>
                         <p>{{detail.originalPriceStr}}</p>
                     </div>
@@ -114,7 +113,7 @@
                         <p v-else>非医美</p>
                     </div>
                 </div>
-                <div class="ercode" v-if="ShowImage" ><img :class="ShowImage?'show':''" src="/img/flea-market/er.png"/></div>
+                <div class="ercode" v-if="ShowImage && userID > 0" ><img :class="ShowImage?'show':''" src="/img/flea-market/er.png"/></div>
             </div>
         </div>
             <!--  相关推荐 -->
@@ -147,7 +146,7 @@
         </div>
         <div class="mainContent">
             <div class="mainContentLeft">
-                <div class="Disclaimer">
+                <div class="Disclaimer service_none">
                     <span >免责声明</span>
                     <p>
                         鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！

src/main/resources/templates/flea-market/list.html

@@ -62,16 +62,16 @@
                         <div class="tag">
                             <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">最新</span>
                             <span class="infotag brand" v-if="item.brandName!=null&&item.brandName!=''&&item.brandID!=161">{{item.brandName}}</span>
-                            <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
+                            <span class="infotag sold service_none" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
                             <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
                         </div>
                         <a class="productname" :href="'/flea-market-'+item.productId+'.html'">
                             {{item.name}}
                         </a>
-                        <div class="targetprice">
-                            <span v-if="item.detailTalkFlag ==2 && userID==null">价格详聊</span>
-                            <span v-else-if="userID==null" class="priceparam" @click="toLogin" onclick="_czc.push(['_trackEvent','二手市场列表','登录查看价格','点击','','Um_Event_SecondListLoginSubmit'])">登录查看价格></span>
-                            <span v-else-if="userID!=null && item.detailTalkFlag==2">价格详聊</span>
+                        <div class="targetprice" v-if="userId>0">
+                            <span v-if="item.detailTalkFlag ==2 && userId>0">价格详聊</span>
+                            <span v-else-if="userId == 0" class="priceparam service_none" @click="toLogin" onclick="_czc.push(['_trackEvent','二手市场列表','登录查看价格','点击','','Um_Event_SecondListLoginSubmit'])">登录查看价格></span>
+                            <span v-else-if="userId>0 && item.detailTalkFlag==2">价格详聊</span>
                             <span v-else>￥{{item.price}}</span>
                         </div>
                         <div class="shijian">

src/main/resources/templates/index.html

@@ -140,7 +140,7 @@
                                                 </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="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}">
@@ -177,7 +177,7 @@
                                                             <div class="main_price_none sec">
                                                                 <em class="price_grade"><span>￥</span>登录可见</em>
                                                             </div>
-                                                            <div class="main_price_login" data-id="3">
+                                                            <div class="main_price_login" data-id="3" v-if="userId>0">
                                                                 <div class="price_text_tag"></div>
                                                                 <div th:if="*{detailTalkFlag}==2" class="main_price_show">￥价格祥聊</div>
                                                                 <div th:if="*{detailTalkFlag}!=2" class="main_price_show">￥<span class="price_num"></span></div>

src/main/resources/templates/product/detail.html

@@ -55,7 +55,7 @@
                         <div class="WechatBg"><img src="/img/base/Wecha.png"><p>扫码添加采美微信客服咨询更快捷</p> </div>
                     </div>
 
-                    <div class="row price"><span class="l">采美价</span><i>：</i>
+                    <div class="row price" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0"><span class="l">采美价</span><i>：</i>
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <em v-if="priceObj.priceFlag==1">￥价格未公开</em>
@@ -75,7 +75,7 @@
                              <em><del v-text="'￥'+priceObj.normalPrice.toFixed(2)"></del></em>
                         </div>
                     </template>
-                    <div class="row actStatus" v-if="priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
+                    <div class="row actStatus" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">
                             <!-- 阶梯价 -->
                             <div v-if="priceObj.ladderPriceFlag==1" class="priceTag">
@@ -141,9 +141,9 @@
                     </div>
                     <div th:if="not${#strings.isEmpty(product.brandName)}" class="row"><span class="l">品牌</span><i>：</i><em th:text="*{brandName}"></em></div>
                     <div class="row" th:if="not${#strings.isEmpty(product.unit)}"><span class="l">包装规格</span><i>：</i><em th:text="*{unit}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.productCode)}"><span class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.stock)}"><span class="l">库存</span><i>：</i><em th:text="*{stock}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.minBuyNumber)}"><span class="l">起订量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
+                    <div class="row" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0" th:if="not${#strings.isEmpty(product.productCode)}"><span class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></div>
+                    <div class="row" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0" th:if="not${#strings.isEmpty(product.stock)}"><span class="l">库存</span><i>：</i><em th:text="*{stock}"></em></div>
+                    <div class="row" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0" th:if="not${#strings.isEmpty(product.minBuyNumber)}"><span class="l">起订量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
                     <div v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0" class="row"><span class="l">采购量</span><i>：</i>
                         <span class="number">
                             <em class="sub" @click="numberSub()">-</em>
@@ -153,7 +153,7 @@
                         <input type="hidden" th:value="*{step}">
                     </div>
                     <hr>
-                    <div class="row"><span class="l">服务</span><i>：</i>
+                    <div class="row" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0"><span class="l">服务</span><i>：</i>
                         <em class="ser icon mIcon">无忧退货</em>
                         <em class="ser icon mIcon">快速退款</em>
                         <em class="ser icon mIcon">正品保证</em>
@@ -174,7 +174,7 @@
                     </div>
                 </template>
                 <template v-else>
-                    <div  class="btnBox">
+                    <div  class="btnBox service_none">
                         <a href="javascript:void(0);" class="upgrade" @click="toLogin" v-if="!isNoneDisabled" onclick="_czc.push(['_trackEvent','商品详情','点击','登录查看价格','','Um_Event_ProductLoginPrice'])">登录查看价格</a>
                     </div>
                 </template>

src/main/resources/templates/product/instruelist.html

@@ -119,10 +119,10 @@
                                     </template>
                                 </template>
                                 <template v-else>
-                                     <div class="price_text_tag">
+                                     <div class="price_text_tag service_none">
                                             <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
                                       </div>
-                                      <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
+                                      <div class="price_grade service_none"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>
                             </div>
                         </a>

src/main/resources/templates/product/instrument.html

@@ -98,7 +98,7 @@
                                                 <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')}">
+                                                        <div class="price_text_tag" th:if="${pros.get('product').containsKey('actStatus')}" v-if="userId>0">
                                                             <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">
@@ -129,7 +129,7 @@
                                                         <div class="main_price_none sec">
                                                             <em class="price_grade"><span>￥</span>登录可见</em>
                                                         </div>
-                                                        <div class="main_price_login" data-id="3">
+                                                        <div class="main_price_login" data-id="3" v-if="userId>0">
                                                             <div class="price_text_tag"></div>
                                                             <div th:if="*{detailTalkFlag}==2" class="main_price_show">￥价格祥聊</div>
                                                             <div th:if="*{detailTalkFlag}!=2" class="main_price_show">￥<span class="price_num"></span></div>

src/main/resources/templates/product/list.html

@@ -138,8 +138,8 @@
                             </template>
                         </template>
                         <template v-else>
-                            <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                            <em class="service_none">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                            <span class="listTag service_none" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                         </template>
                     </div>
                 </div>

src/main/resources/templates/supplier/index.html

@@ -87,8 +87,8 @@
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                        <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                        <em class="service_none">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <span class="listTag service_none" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     </template>
                                 </div>
                             </div>
@@ -131,8 +131,8 @@
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
-                                        <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
+                                        <em class="service_none">￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <span class="listTag service_none" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     </template>
                                 </div>
                             </div>