还原申请证书隐藏部分

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

@@ -2,9 +2,6 @@
 /**
 * 移动端
 */
-/*===================此行代码为申请证书时使用,后续可删除======================*/
-.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,10 +2,6 @@
 /**
 * PC端
 */
-/*===================此行代码为申请证书时使用,后续可删除======================*/
-.service_none{display:none !important;}
-/*===================此行代码为申请证书时使用,后续可删除======================*/
-
 body{min-width:1184px;}
 header{box-shadow: 0 2px 10px #ebecef;}
 .h5Only{display:none!important;}
@@ -105,7 +101,7 @@ iframe{width:320px !important;height: 280px !important}
 
 .baseHeadCenter,.baseTopNav{width:100%;background:#FFF}
 .baseHeadCenter .wrap{height: 100px;box-sizing: border-box;padding: 10px 0;}
-.baseHeadCenter .logo{float:left;width:58px;height:44px;margin-right:122px;margin-top: 10px;}
+.baseHeadCenter .logo{float:left;width:178px;height:44px;margin-right:122px;margin-top: 10px;}
 .baseHeadCenter .searchBox{width:668px;float:left}
 .baseHeadCenter .search{width:100%;height:44px;line-height:44px;border:1px solid #FFE6DC;position:relative}
 .baseHeadCenter .search:before{content:'';position:absolute;left:104px;top:16px;height:12px;border-right:2px solid #C0C6D1}

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

@@ -39,9 +39,6 @@
 .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.service_none{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}
@@ -121,9 +118,6 @@
 .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.service_none{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/base.js

@@ -197,22 +197,6 @@ var globalHead = new Vue({
                 }
             })
         }
-        console.log('hello')
-        $('#baseTopNavUl').find('li').each(function() {
-            var _that = $(this);
-            var _textHtml = _that.find('a').text();
-            switch (_textHtml){
-                case '产品':
-                    _that.find('a').text('医疗器械产品');
-                    break;
-                case '仪器':
-                    _that.find('a').text('医疗器械仪器');
-                    break;
-                case '信息平台':
-                    _that.find('a').text('医疗器械信息');
-                    break;
-            }
-        })
         // 判断导航菜单高亮-对比url
         setTimeout(function(){
             var path = window.location.pathname;
@@ -243,12 +227,6 @@ $(function(){
             window.location.reload();
         }
     });
-    //暂定
-    if(GLOBAL_USER_ID == 0){
-        $('.footLink').hide();
-        $('.footContact-code').hide();
-        $('.footTop').hide();
-    }
     // 导航分类
     if(isPC){
         jqClickShow(".baseHeadTop .cTab", ".baseHeadTop .cShow");

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

@@ -450,7 +450,7 @@
                           <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 service_none">
+                          <div class="price">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price"><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -567,7 +567,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -695,7 +695,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -796,7 +796,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -914,7 +914,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1026,7 +1026,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1138,7 +1138,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1245,7 +1245,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1353,7 +1353,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1454,7 +1454,7 @@
                           <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 service_none">
+                          <div class="price  ">
                             <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 service_none"><span>￥登录可见</span></div>
+                          <div class="price  "><span>￥登录可见</span></div>
                         </template>
                       </template>
                     </div>
@@ -1569,7 +1569,7 @@
                                   <span class="tag"
                                     v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                 </div>
-                                <div class="price service_none">
+                                <div class="price  ">
                                   <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 service_none"><span>￥登录可见</span></div>
+                                <div class="price  "><span>￥登录可见</span></div>
                               </template>
                             </template>
                           </div>
@@ -1675,7 +1675,7 @@
                                   <span class="tag"
                                     v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                 </div>
-                                <div class="price service_none">
+                                <div class="price  ">
                                   <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 service_none"><span>￥登录可见</span></div>
+                                <div class="price"><span>￥登录可见</span></div>
                               </template>
                             </template>
                           </div>

src/main/resources/templates/components/header.html

@@ -2,10 +2,10 @@
     <!--顶部导航-->
     <div class="baseHeadTop">
         <div class="wrap clear">
-<!--            <div class="header_top_left">欢迎来到采美采购服务平台</div>-->
+            <div class="header_top_left">欢迎来到采美采购服务平台</div>
             <div class="header_top_left"></div>
             <ul class="header_top_ul">
-                <li class="headCart" v-if="GLOBAL_USER_ID>0">
+                <li class="headCart">
                     <a href="javascript:void(0)" class="addBtn icon" @click="goCartsLinkFn">购物车<em v-text="'('+headCart.cartCount+')'"></em></a>
                     <div class="cartData">
                         <div v-if="headCart.cartCount>0">
@@ -60,8 +60,8 @@
         <div class="wrap clear">
             <a href="javascript:void(0);" class="h5Only mClassBtn mIcon" title="分类"></a>
             <a href="/" class="logo">
-                <img class="pcOnly" src="/img/base/logo@2x.png" alt="采美 生美/医美采购服务平台"/>
-                <img class="h5Only" src="/img/base/logo@2x.png" alt="采美 生美/医美采购服务平台"/>
+                <img class="pcOnly" src="/img/base/logo.png" alt="采美 生美/医美采购服务平台"/>
+                <img class="h5Only" src="/img/base/logo_m.png" alt="采美 生美/医美采购服务平台"/>
             </a>
             <div class="mf h5Only mUserCenter">
                 <a :href="loginStatus?'/shopping/cart.html':'javascript:void(0);'" :class="loginStatus?'mAddCart mIcon':'mAddCart mIcon toLogin'" title="购物车" rel="nofollow"></a>
@@ -113,7 +113,7 @@
                 <a class="classBtn nav on" href="javascript:void(0);">分类展示</a>
                 <a class="home nav" href="/">首页</a>
                 <div class="navBox">
-                    <ul class="clear" id="baseTopNavUl">
+                    <ul class="clear">
                         <!--导航菜单-->
                         <li th:each="menu: ${topMenuList}">
                             <a class="nav" th:href="${menu.link}" th:text="${menu.name}" th:attr="rel=${#strings.contains(menu.link,'caimei365.com')} ? '' : 'nofollow'" target="_blank"></a>

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

@@ -54,10 +54,10 @@
                 </div>
                 <div class="preview-info-main clearfix">
                     <div class="info price" style="width: 100%" >
-                        <span class="label" v-if="userID>0">交&nbsp;&nbsp;易&nbsp;&nbsp;价：</span>
-                        <p v-if="userID>0">
+                        <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 service_none" onclick="_czc.push(['_trackEvent','二手商品详情','登录查看价格','点击','','Um_Event_SecondDetailsLoginButton'])">登录查看价格></a></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 v-else class="fave-text">￥<span class="big">{{detail.price}}</span></span>
                         </p>
@@ -113,7 +113,7 @@
                         <p v-else>非医美</p>
                     </div>
                 </div>
-                <div class="ercode" v-if="ShowImage && userID > 0" ><img :class="ShowImage?'show':''" src="/img/flea-market/er.png"/></div>
+                <div class="ercode" v-if="ShowImage" ><img :class="ShowImage?'show':''" src="/img/flea-market/er.png"/></div>
             </div>
         </div>
             <!--  相关推荐 -->
@@ -146,7 +146,7 @@
         </div>
         <div class="mainContent">
             <div class="mainContentLeft">
-                <div class="Disclaimer service_none">
+                <div class="Disclaimer ">
                     <span >免责声明</span>
                     <p>
                         鉴于本网站提供的二手版块信息包括但不限于公司名称，商品的简介、性能、描述与说明，相关图片、视频等均由卖家自行提供，由卖家对其提供的信息承担相应法律责任。买家应自行甄别商品信息并查验商品性状。本网站对二手版块中买卖双方的交易不提供任何形式的担保与保证，特此声明！

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

@@ -62,15 +62,15 @@
                         <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 service_none" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
+                            <span class="infotag sold " 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" v-if="userId>0">
+                        <div class="targetprice">
                             <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" class="priceparam " @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>

src/main/resources/templates/index.html

@@ -39,7 +39,7 @@
     <!--首页楼层主体数据-->
     <div class="section_container">
         <div class="inner">
-            <div id="sidebar" class="section_right"  v-if="userId>0">
+            <div id="sidebar" class="section_right">
                 <div class="box swiper-wrapper" >
                     <div class="section_right_item" th:if="${sideJson.get('liveList')}!=null and ${sideJson.get('liveList').size}>0">
                         <div class="right_item_title">
@@ -159,7 +159,7 @@
                                             <span class="tag" v-if="pros.beautyActFlag == 1">美博会</span>
                                             <span v-text="pros.name"></span>
                                         </div>
-                                        <div class="page_main_price" v-if="userId>0 && pros.listType == 1">
+                                        <div class="page_main_price" v-if="pros.listType == 1">
                                             <!-- 商品价格 -->
                                             <div class="main_price_text">
                                                 <!-- 正常商品 -->
@@ -206,7 +206,7 @@
                                                 </template>
                                                 <!-- 二手商品 -->
                                                 <template v-else>
-                                                    <div class="main_price_login" v-if="userId>0">
+                                                    <div class="main_price_login">
                                                         <div class="price_text_tag"></div>
                                                         <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">￥价格祥聊</div>
                                                         <div v-else class="main_price_show">
@@ -283,7 +283,7 @@
                                                     </th:block>
                                                     <span th:text="${pros.get('name')}"></span>
                                                 </div>
-                                                <div class="page_main_price" th:if="*{listType}==1" v-if="userId>0">
+                                                <div class="page_main_price" th:if="*{listType}==1">
                                                     <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}">
@@ -299,31 +299,13 @@
                                                                     </p>
                                                                 </div>
                                                                 <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}">
-                                                                    <!--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>
+                                                                    <em class="price_grade"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
                                                                 </div>
                                                             </th:block>
                                                             <!-- 二手商品 -->
                                                             <th:block th:if="*{productCategory}!=1">
                                                                 <div class="main_price_none sec">
-                                                                    <em class="price_grade service_none"><span>￥</span>登录可见</em>
-                                                                </div>
-                                                                <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>
+                                                                    <em class="price_grade"><span>￥</span>登录可见</em>
                                                                 </div>
                                                             </th:block>
                                                         </div>

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

@@ -54,7 +54,6 @@
                         <i class="icon"></i>微信客服
                         <div class="WechatBg"><img src="/img/base/Wecha.png"><p>扫码添加采美微信客服咨询更快捷</p> </div>
                     </div>
-
                     <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,普通机构-->
@@ -141,9 +140,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" 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 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 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 +152,7 @@
                         <input type="hidden" th:value="*{step}">
                     </div>
                     <hr>
-                    <div class="row" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0"><span class="l">服务</span><i>：</i>
+                    <div class="row"><span class="l">服务</span><i>：</i>
                         <em class="ser icon mIcon">无忧退货</em>
                         <em class="ser icon mIcon">快速退款</em>
                         <em class="ser icon mIcon">正品保证</em>
@@ -164,7 +163,7 @@
                     <p class="none-text">此商品已{{disabledText}},请浏览以下推荐商品~</p>
                 </div>
                 <div v-if="!isPC" class="wechatH5 btnBox"><img src="/img/base/wechat.h5.png" style="padding: 2.7vw 0"></div>
-                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                <template>
                     <div  class="btnBox" v-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">
                         <a class="upgrade" href="/user/setting/upgrade.html" onclick="_czc.push(['_trackEvent','商品详情','点击','升级查看价格','','Um_Event_ProductUpgrade'])">升级会员查看价格</a>
                     </div>
@@ -174,7 +173,7 @@
                     </div>
                 </template>
                 <template v-else>
-                    <div  class="btnBox service_none">
+                    <div  class="btnBox">
                         <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 service_none">
+                                     <div class="price_text_tag ">
                                             <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
                                       </div>
-                                      <div class="price_grade service_none"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
+                                      <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>
                             </div>
                         </a>

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

@@ -112,7 +112,7 @@
                                         <span class="tag" v-if="pros.beautyActFlag == 1">美博会</span>
                                         <span v-text="pros.name"></span>
                                     </div>
-                                    <div class="page_main_price" v-if="params.userId>0 && pros.listType == 1">
+                                    <div class="page_main_price" v-if="pros.listType == 1">
                                         <!-- 商品价格 -->
                                         <div class="main_price_text">
                                         <!-- 正常商品 -->
@@ -158,7 +158,7 @@
                                             </template>
                                             <!-- 二手商品 -->
                                             <template v-else>
-                                                <div class="main_price_login" v-if="params.userId>0">
+                                                <div class="main_price_login">
                                                     <div class="price_text_tag"></div>
                                                     <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">￥价格祥聊</div>
                                                     <div v-else class="main_price_show">
@@ -235,7 +235,7 @@
                                                 </th:block>
                                                 <span th:text="${pros.get('name')}"></span>
                                             </div>
-                                            <div class="page_main_price" th:if="*{listType}==1" v-if="params.userId>0">
+                                            <div class="page_main_price" th:if="*{listType}==1">
                                                 <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}">
@@ -251,31 +251,13 @@
                                                                 </p>
                                                             </div>
                                                             <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}">
-                                                                <!--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>
+                                                                <em class="price_grade"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
                                                             </div>
                                                         </th:block>
                                                         <!-- 二手商品 -->
                                                         <th:block th:if="*{productCategory}!=1">
                                                             <div class="main_price_none sec">
-                                                                <em class="price_grade service_none"><span>￥</span>登录可见</em>
-                                                            </div>
-                                                            <div class="main_price_login" data-id="3" v-if="params.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>
+                                                                <em class="price_grade"><span>￥</span>登录可见</em>
                                                             </div>
                                                         </th:block>
                                                     </div>

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

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