项目仪器页面静态化part3

src/main/resources/static/js/activity/activityTopic.js

@@ -14,7 +14,6 @@ var activity = new Vue({
             userId: '',
             source: 1
         },
-        nav_linkName: '',   //导航名
         isPc: window.isPC
     },
     filters: {
@@ -57,7 +56,7 @@ var activity = new Vue({
             }
         },
         toserch: function (item) {
-            window.location.href = '/product/classify-'+this.typeSort+'-'+item.bigTypeID+'.html?name='+this.nav_linkName
+            window.location.href = '/product/classify-'+this.typeSort+'-'+item.bigTypeID+'.html'
         },
         //查看更多
         showMore: function (page) {
@@ -65,7 +64,6 @@ var activity = new Vue({
         },
         //初始化数据
         init: function () {
-            this.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
             //判断用户是否登录
             var userInfo = localStorage.getItem('userInfo');
             if (userInfo) {

src/main/resources/static/js/base.js

@@ -50,8 +50,7 @@ var globalHead = new Vue({
         userIdentity:'',
         articleType: '',
         isFiexd:false,
-        classifyIndex:1,
-        nav_linkName:''
+        classifyIndex:1
     },
     methods: {
         changeClassify: function(value){
@@ -199,34 +198,24 @@ var globalHead = new Vue({
             })
         }
         console.log('hello')
-        _self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
-        if(!_self.nav_linkName || _self.nav_linkName.length === 0 || _self.nav_linkName == "undefined") {
-             var paramsArr = window.location.pathname.split(".")[0].split("-");
-             if (paramsArr[0].indexOf('/product/type') >= 0) {
-                 var pageId =  paramsArr.length>=1 ? paramsArr[1] : '';
-                 if (pageId*1 === 287) {
-                    _self.nav_linkName = "产品";
-                 } else if (pageId*1 === 286) {
-                    _self.nav_linkName = "仪器";
-                 }
-             } else if (paramsArr[0].indexOf('/info/center') >= 0){
-                _self.nav_linkName = "信息平台";
-             } else if (paramsArr[0].indexOf('/flea-market') >= 0 && (paramsArr.length>=1 && paramsArr[1].indexOf('market') >= 0)){
-                _self.nav_linkName = "二手市场";
-             } else if (paramsArr[0].indexOf('/investment') >= 0){
-                _self.nav_linkName = "品牌招商";
-             } else if (paramsArr[0].indexOf('/repair') >= 0){
-                _self.nav_linkName = "维修";
-             }
-        }
-        // _self.nav_linkName = window.localStorage.getItem('name');
+        // 判断导航菜单高亮-对比url
         setTimeout(function(){
-            $('.navBox li').each(function () {
-                var _thisName = $(this).find('a').text();
-                if(_self.nav_linkName == _thisName){
-                    $(this).find('a').addClass('on')
-                }
-            });
+            var path = window.location.pathname;
+            var paramsArr = path.split(".")[0].split("-");
+            var key = paramsArr[0].split("/")[1];
+            var pageId =  paramsArr.length>=1 ? paramsArr[1] : '';
+            if(key && key.length>0) {
+                $('.navBox li').each(function () {
+                    var href = $(this).find('a').attr("href");
+                    if (href.indexOf(path)>=0){
+                        $(this).find('a').addClass('on');
+                        return false;
+                    } else if (key != 'product' && key != 'info' && href.indexOf('/'+key)>=0) {
+                        $(this).find('a').addClass('on');
+                        return false;
+                    }
+                });
+            }
         },500);
     }
 });

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

@@ -14,7 +14,6 @@
             userId:'',
             source:1
          },
-         nav_linkName:'',
          isPC:window.isPC
     },
      methods:{
@@ -162,7 +161,6 @@
     },
     mounted: function(){
         var _self = this;
-         //_self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
          var userInfo = localStorage.getItem('userInfo');
          if(userInfo){
              this.params.userId = JSON.parse(userInfo).userId;
@@ -170,13 +168,6 @@
          //this.params.pageId = getUrlParam('id');
          var paramsArr = window.location.pathname.split(".")[0].split("-");
          this.params.pageId =  paramsArr.length>=1 ? paramsArr[1] : '';
-         if (this.params.pageId*1 === 287) {
-            _self.nav_linkName = "产品";
-         } else if (this.params.pageId*1 === 286) {
-            _self.nav_linkName = "仪器";
-         }
-         console.log(_self.nav_linkName);
-
         // 设置页面查看更多
         this.setReadeMore();
         // 推荐专区商品轮播

src/main/resources/static/js/product/produce-list.js

@@ -28,7 +28,6 @@ var productList = new Vue({
             pageNum: 1,
             idType:1
         },
-        nav_linkName:'',
         addhtml:'<span class="tag">美博会</span>'
     },
      filters:{
@@ -184,11 +183,6 @@ var productList = new Vue({
     },
     mounted:function () {
         var _self = this;
-        this.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
-        // this.bigTypeId = getUrlParam('bigTypeId');
-        // this.smallTypeId = getUrlParam('smallTypeId');
-        // this.tinyTypeId = getUrlParam('tinyTypeId');
-        // var typeSort =  getUrlParam('typeSort');
         var paramsArr = window.location.pathname.split(".")[0].split("-");
         var typeSort =  paramsArr.length>=1 ? paramsArr[1] : '';
         this.bigTypeId = paramsArr.length>=2 ? paramsArr[2] : '';

src/main/resources/static/js/product/temporary.js

@@ -13,8 +13,7 @@
             pageId:'',
             userId:'',
             source:1
-         },
-         nav_linkName:''
+         }
     },
     filters:{
          NumFormat:function(value) {//处理金额
@@ -49,7 +48,7 @@
             }
         },
         toserch:function(item){
-            window.location.href='/product/classify-'+this.typeSort+'-'+item.bigTypeID+'.html?name='+this.nav_linkName
+            window.location.href='/product/classify-'+this.typeSort+'-'+item.bigTypeID+'.html';
         },
         seeMore:function(page){
              page.isPageMore = !page.isPageMore;
@@ -149,8 +148,6 @@
     },
     mounted: function(){
         var _self = this;
-         _self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
-         console.log(_self.nav_linkName);
          var userInfo = localStorage.getItem('userInfo');
          if(userInfo){
              this.params.userId = JSON.parse(userInfo).userId;

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

@@ -79,7 +79,7 @@
             <div class="list-container">
                 <ul class="clear mfw">
                     <li class="productItem " v-for="p in listData">
-                        <a class="image" :href="'/product-'+p.productId+'.html'+'?name='+ nav_linkName">
+                        <a class="image" :href="'/product-'+p.productId+'.html'">
                             <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
                             <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
                             <p class="name" v-html="p.name" v-else></p>

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

@@ -6,771 +6,161 @@
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/floor.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/product/instruement.css(v=${version})}" rel="stylesheet" type="text/css">
-<!--    <link th:href="@{/css/index/index_new.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">-->
-<!--    <link th:href="@{/css/index/index_new.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">-->
     <template th:replace="components/analysis"></template>
 </head>
 <body>
-    <!-- 引用头部 -->
-    <template th:replace="components/header"></template>
-    <div id="container">
-     <!--loading-->
-        <div id="instrueMent" >
-<!--            <input type="hidden" th:value="${bigTypeJson}">-->
-<!--            <input type="hidden" th:value="${typeFloorJson}">-->
-<!--            <div v-if="listLoading" class="loading">-->
-<!--                <img src="/img/base/loading.gif">-->
-<!--            </div>-->
-<!--            <template v-else>-->
-                <div class="instrue-right" th:if="${typeFloorJson.get('hotSearchList')}!=null and ${typeFloorJson.get('hotSearchList').size}>0">
-                    <div class="wrap_tittle"> 大家都在搜<span class="line"></span></div>
-                    <div v-if="isPC" class="hot-search">
-                        <th:block th:each="hotSearch,stat : ${typeFloorJson.get('hotSearchList')}" th:object="${hotSearch}">
-                            <a class="hot-list" th:href="*{link}">
-                                <i th:class="*{isHot}=='1'?'icon hot':'icon'"></i>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<div id="container">
+    <div id="instrueMent" >
+        <div class="instrue-right" th:if="${typeFloorJson.get('hotSearchList')}!=null and ${typeFloorJson.get('hotSearchList').size}>0">
+            <div class="wrap_tittle"> 大家都在搜<span class="line"></span></div>
+            <div v-if="isPC" class="hot-search">
+                <th:block th:each="hotSearch,stat : ${typeFloorJson.get('hotSearchList')}" th:object="${hotSearch}">
+                    <a class="hot-list" th:href="*{link}">
+                        <i th:class="*{isHot}=='1'?'icon hot':'icon'"></i>
+                        <template th:text="*{name}"></template>
+                    </a>
+                </th:block>
+            </div>
+            <div v-else class="hot-search" :style="showflag?'height:auto':''">
+                <div class="left-box">
+                    <th:block th:each="hotSearch,stat : ${typeFloorJson.get('hotSearchList')}" th:object="${hotSearch}">
+                        <a class="hot-list" th:href="*{link}">
+                        <i th:class="*{isHot}=='1'?'mIcon hot':'mIcon'"></i>
+                        <template th:text="*{name}"></template>
+                        </a>
+                    </th:block>
+                </div>
+                <div class="right-box" @click="showNav">
+                    <span class="mIcon" :class="showflag?'close':'open'"></span>
+                </div>
+            </div>
+            <div :class="showflag?'bg':''" @click="closeup"></div>
+        </div>
+        <div class="instrue-left">
+            <div class="top-category">
+                <ul class="normal-nav clearfix" th:if="${bigTypeJson}!=null and ${bigTypeJson.size}>0">
+                    <th:block th:each="bigType,stat : ${bigTypeJson}" th:object="${bigType}">
+                        <li class="nav-list">
+                            <a th:href="'/product/classify-'+${typeSort}+'-'+*{bigTypeId}+'.html'">
+                                <div class="item_icon">
+                                    <img th:src="*{crmIcon}"/>
+                                </div>
                                 <template th:text="*{name}"></template>
                             </a>
-                        </th:block>
+                        </li>
+                    </th:block>
+                </ul>
+            </div>
+            <div class="section_page" th:each="floor,stat : ${typeFloorJson.get('floorList')}">
+                <th:block th:if="${floor.get('floorContent')}!=null">
+                    <div class="section_page_title">
+                        <h1 th:text="${floor.get('title')}" th:attr="data-id=${stat.index+1}"></h1>
+                        <p th:text="${floor.get('detail')}"></p>
                     </div>
-                    <div v-else class="hot-search" :style="showflag?'height:auto':''">
-                        <div class="left-box">
-                            <th:block th:each="hotSearch,stat : ${typeFloorJson.get('hotSearchList')}" th:object="${hotSearch}">
-                                <a class="hot-list" th:href="*{link}">
-                                <i th:class="*{isHot}=='1'?'mIcon hot':'mIcon'"></i>
-                                <template th:text="*{name}"></template>
-                                </a>
-                            </th:block>
-                        </div>
-                        <div class="right-box" @click="showNav">
-                            <span class="mIcon" :class="showflag?'close':'open'"></span>
-                        </div>
-                    </div>
-                    <div :class="showflag?'bg':''" @click="closeup"></div>
-                </div>
-                <!--<div class="instrue-right">
-                    <div class="wrap_tittle"> 大家都在搜<span class="line"></span></div>
-                    <template v-if="isPC">
-                        <div class="hot-search">
-                             <a class="hot-list" v-for="(item,index) in hotlist" :href="item.link"><i class="icon"  :class="item.isHot==1?'hot':''"></i>{{item.name}}</a>
-                        </div>
-                    </template>
-                    <template  v-else>
-                        <div class="hot-search" :style="showflag?'height:auto':''">
-                           <div class="left-box">
-                               <a class="hot-list" v-for="(item,index) in hotlist"  :href="item.link"><i class="mIcon" :class="item.isHot==1?'hot':''"></i>{{item.name}}</a>
-                           </div>
-                           <div class="right-box" @click="showNav">
-                              <span class="mIcon" :class="showflag?'close':'open'"></span>
-                           </div>
-                        </div>
-                    </template>
-                    <div :class="showflag?'bg':''" @click="closeup"></div>
-               </div>-->
-                <div class="instrue-left">
-                    <div class="top-category">
-                        <ul class="normal-nav clearfix" th:if="${bigTypeJson}!=null and ${bigTypeJson.size}>0">
-                            <th:block th:each="bigType,stat : ${bigTypeJson}" th:object="${bigType}">
-                                <li class="nav-list">
-                                    <a th:href="'/product/classify-'+${typeSort}+'-'+*{bigTypeId}+'.html'">
-                                        <div class="item_icon">
-                                            <img th:src="*{crmIcon}"/>
-                                        </div>
-                                        <template th:text="*{name}"></template>
+                    <th:block th:object="${floor.get('floorContent')}">
+                        <div th:class="*{templateType}==8? 'hotList swiper-container-floor' : ''" th:id="*{templateType}==8? 'recommendBox' : ''">
+                            <div th:class="*{templateType}==8? *{'section_page_main type_08 swiper-wrapper recommendBox-wrapper clear mfw section_'+templateType} : *{'section_page_main clear mfw section_'+templateType}">
+                                <!-- 广告图 -->
+                                <th:block th:if="*{templateType}==1 or *{templateType}==2 or *{templateType}==3 or *{templateType}==4 or *{templateType}==5">
+                                    <a th:href="*{#strings.isEmpty(adsLink1)}? 'javascript:;' : *{adsLink1}" th:attr="target=(*{#strings.isEmpty(adsLink1)} ? '_self' : '_blank')" class="page_main_item ad_01">
+                                        <img v-if="isPC" th:src="*{pcAdsImage1}" alt="" class="page_main_item_adv">
+                                        <img v-else th:src="*{appletsAdsImage1}" alt="" class="page_main_item_adv">
                                     </a>
-                                </li>
-                            </th:block>
-                            <!--<li class="nav-list" v-for="(item,index) in categorylist" @click="toserch(item)"><div class="item_icon"><img :src="item.crmIcon"/></div><a>{{item.name}}</a></li>-->
-                        </ul>
-                    </div>
-
-
-                    <div class="section_page" th:each="floor,stat : ${typeFloorJson.get('floorList')}">
-                        <th:block th:if="${floor.get('floorContent')}!=null">
-                            <div class="section_page_title">
-                                <h1 th:text="${floor.get('title')}" th:attr="data-id=${stat.index+1}"></h1>
-                                <p th:text="${floor.get('detail')}"></p>
-                            </div>
-                            <th:block th:object="${floor.get('floorContent')}">
-                                <div th:class="*{templateType}==8? 'hotList swiper-container-floor' : ''" th:id="*{templateType}==8? 'recommendBox' : ''">
-                                    <div th:class="*{templateType}==8? *{'section_page_main type_08 swiper-wrapper recommendBox-wrapper clear mfw section_'+templateType} : *{'section_page_main clear mfw section_'+templateType}">
-                                        <!-- 广告图 -->
-                                        <th:block th:if="*{templateType}==1 or *{templateType}==2 or *{templateType}==3 or *{templateType}==4 or *{templateType}==5">
-                                            <a th:href="*{#strings.isEmpty(adsLink1)}? 'javascript:;' : *{adsLink1}" th:attr="target=(*{#strings.isEmpty(adsLink1)} ? '_self' : '_blank')" class="page_main_item ad_01">
-                                                <img v-if="isPC" th:src="*{pcAdsImage1}" alt="" class="page_main_item_adv">
-                                                <img v-else th:src="*{appletsAdsImage1}" alt="" class="page_main_item_adv">
-                                            </a>
-                                        </th:block>
-                                        <th:block th:if="*{templateType}==2 or *{templateType}==3 or *{templateType}==4">
-                                            <a th:href="*{#strings.isEmpty(adsLink2)}? 'javascript:;' : *{adsLink2}" th:attr="target=(*{#strings.isEmpty(adsLink2)} ? '_self' : '_blank')" class="page_main_item ad_02">
-                                                <img v-if="isPC" th:src="*{pcAdsImage2}" alt="" class="page_main_item_adv">
-                                                <img v-else th:src="*{appletsAdsImage2}" alt="" class="page_main_item_adv">
-                                            </a>
-                                        </th:block>
-                                        <th:block th:if="*{templateType}==4">
-                                            <a th:href="*{#strings.isEmpty(adsLink3)}? 'javascript:;' : *{adsLink3}" th:attr="target=(*{#strings.isEmpty(adsLink3)} ? '_self' : '_blank')" class="page_main_item ad_03">
-                                                <img v-if="isPC" th:src="*{pcAdsImage3}" alt="" class="page_main_item_adv">
-                                                <img v-else th:src="*{appletsAdsImage3}" alt="" class="page_main_item_adv">
-                                            </a>
-                                        </th:block>
-                                        <!-- 商品/图片 列表 -->
-                                        <th:block th:each="pros : ${floor.get('floorImageList')}"  th:object="${pros}">
-                                            <a th:href="*{link}" class="page_main_item ad_04 swiper-slide" target="_blank">
-                                                <img class="page_main_image" src="/img/base/placeholder.png" th:attr="data-original=*{image}" th:alt="*{name}">
-                                                <div class="page_main_tag" th:if="*{listType}==2"><p th:text="*{label}"></p></div>
-                                                <div class="page_main_text">
-                                                    <th:block th:if="${pros.containsKey('product')}">
-                                                        <span class="tag" th:if="${pros.get('product').containsKey('beautyActFlag')} and ${pros.get('product').get('beautyActFlag')}==1">美博会</span>
-                                                    </th:block>
-                                                    <span th:text="${pros.get('name')}"></span>
-                                                </div>
-                                                <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}">
-                                                            <!-- 正常商品 -->
-                                                            <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 ${pros.get('product').get('promotions')}!=null">
-                                                                        <template th:text="*{promotions.name}"></template>
-                                                                        <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">
-                                                                            <!--单品优惠:优惠价-->
-                                                                            :￥<span class="price_num"></span>
-                                                                        </th:block>
-                                                                    </p>
-                                                                </div>
-                                                                <div class="main_price_none">
-                                                                    <em class="price_grade"><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>
-                                                                </div>
-                                                            </th:block>
-                                                            <!-- 二手商品 -->
-                                                            <th:block th:if="*{productCategory}!=1">
-                                                                <div class="main_price_none sec">
-                                                                    <em class="price_grade"><span>￥</span>登录可见</em>
-                                                                </div>
-                                                                <div class="main_price_login" data-id="3">
-                                                                    <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>
-                                                                </div>
+                                </th:block>
+                                <th:block th:if="*{templateType}==2 or *{templateType}==3 or *{templateType}==4">
+                                    <a th:href="*{#strings.isEmpty(adsLink2)}? 'javascript:;' : *{adsLink2}" th:attr="target=(*{#strings.isEmpty(adsLink2)} ? '_self' : '_blank')" class="page_main_item ad_02">
+                                        <img v-if="isPC" th:src="*{pcAdsImage2}" alt="" class="page_main_item_adv">
+                                        <img v-else th:src="*{appletsAdsImage2}" alt="" class="page_main_item_adv">
+                                    </a>
+                                </th:block>
+                                <th:block th:if="*{templateType}==4">
+                                    <a th:href="*{#strings.isEmpty(adsLink3)}? 'javascript:;' : *{adsLink3}" th:attr="target=(*{#strings.isEmpty(adsLink3)} ? '_self' : '_blank')" class="page_main_item ad_03">
+                                        <img v-if="isPC" th:src="*{pcAdsImage3}" alt="" class="page_main_item_adv">
+                                        <img v-else th:src="*{appletsAdsImage3}" alt="" class="page_main_item_adv">
+                                    </a>
+                                </th:block>
+                                <!-- 商品/图片 列表 -->
+                                <th:block th:each="pros : ${floor.get('floorImageList')}"  th:object="${pros}">
+                                    <a th:href="*{link}" class="page_main_item ad_04 swiper-slide" target="_blank">
+                                        <img class="page_main_image" src="/img/base/placeholder.png" th:attr="data-original=*{image}" th:alt="*{name}">
+                                        <div class="page_main_tag" th:if="*{listType}==2"><p th:text="*{label}"></p></div>
+                                        <div class="page_main_text">
+                                            <th:block th:if="${pros.containsKey('product')}">
+                                                <span class="tag" th:if="${pros.get('product').containsKey('beautyActFlag')} and ${pros.get('product').get('beautyActFlag')}==1">美博会</span>
+                                            </th:block>
+                                            <span th:text="${pros.get('name')}"></span>
+                                        </div>
+                                        <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}">
+                                                    <!-- 正常商品 -->
+                                                    <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 ${pros.get('product').get('promotions')}!=null">
+                                                                <template th:text="*{promotions.name}"></template>
+                                                                <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">
+                                                                    <!--单品优惠:优惠价-->
+                                                                    :￥<span class="price_num"></span>
+                                                                </th:block>
+                                                            </p>
+                                                        </div>
+                                                        <div class="main_price_none">
+                                                            <em class="price_grade"><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>
                                                         </div>
                                                     </th:block>
+                                                    <!-- 二手商品 -->
+                                                    <th:block th:if="*{productCategory}!=1">
+                                                        <div class="main_price_none sec">
+                                                            <em class="price_grade"><span>￥</span>登录可见</em>
+                                                        </div>
+                                                        <div class="main_price_login" data-id="3">
+                                                            <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>
+                                                        </div>
+                                                    </th:block>
                                                 </div>
-                                            </a>
-                                        </th:block>
-                                        <!-- 广告图 -->
-                                        <th:block th:if="*{templateType}==6">
-                                            <a th:href="*{#strings.isEmpty(adsLink1)}? 'javascript:;' : *{adsLink1}" th:attr="target=(*{#strings.isEmpty(adsLink1)} ? '_self' : '_blank')" class="page_main_item ad_01">
-                                                <img v-if="isPC" th:src="*{pcAdsImage1}" alt="" class="page_main_item_adv">
-                                                <img v-else th:src="*{appletsAdsImage1}" alt="" class="page_main_item_adv">
-                                            </a>
-                                        </th:block>
-                                    </div>
-                                    <div th:if="*{templateType}==8" class="swiper-pagination swiper-pagination-floor mfc" th:attr="data-id=${floor.get('floorImageList').size}"></div>
-                                </div>
-                                <div class="section_page_more" th:attr="data-id=*{templateType}, data-size=${floor.get('floorImageList').size}">
-                                    <div class="more" @click="showMoreItem($event)"> <i class="icon mIcon"></i>查看更多</div>
-                                </div>
-                            </th:block>
-                        </th:block>
-                    </div>
-
-
-<!--                    <div class="page-list" v-for="(page,index) in floorList" >-->
-<!--                        <div class="floorTit" v-if="page.floorContent">-->
-<!--                            <h2 :data-id="index+1" v-text="page.title"></h2>-->
-<!--                            <h5 v-text="page.detail"></h5>-->
-<!--                        </div>-->
-<!--                        <template v-if="page.floorContent && page.floorContent.templateType == '1'">-->
-<!--                             <div class="floorCon">-->
-<!--                                 <div class="hotList recommend">-->
-<!--                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">-->
-<!--                                        <a  class="img01 page_main_item" :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"-->
-<!--                                        :class="page.floorContent.adsLink1!='' ? '' : 'default' " >-->
-<!--                                        <img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"/></a>-->
-<!--                                        <a class="productItem" :href="pros.link" v-for="(pros,index) in page.floorImageList" >-->
-<!--                                            <img :src="pros.image ? pros.image : '/img/base/placeholder.png'" :data-original="pros.image" :alt="pros.name">-->
-<!--                                            <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>-->
-<!--                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>-->
-<!--                                             <div class="price" v-if="pros.listType == 1">-->
-<!--                                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">-->
-<!--                                                    &lt;!&ndash;用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构&ndash;&gt;-->
-<!--                                                    <template v-if="pros.product.productCategory==1">-->
-<!--                                                        <template v-if="pros.product.priceFlag==1">-->
-<!--                                                            <div class="price_text_tag">-->
-<!--                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                            </div>-->
-<!--                                                            <div class="main_price_unde">￥价格未公开</div>-->
-<!--                                                        </template>-->
-<!--                                                        <template v-else>-->
-<!--                                                            <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">-->
-<!--                                                               <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">-->
-<!--                                                                        {{pros.product.promotions.name}}-->
-<!--                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>-->
-<!--                                                                    </p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">-->
-<!--                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}-->
-<!--                                                            </div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_unde">￥会员可见</div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else>-->
-<!--                                                                <div class="price_text_tag" >-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                            </template>-->
-<!--                                                        </template>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                          <div class="price_text_tag"></div>-->
-<!--                                                          <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>-->
-<!--                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                                <template v-else>-->
-<!--                                                    <template v-if="pros.product.productCategory == 1">-->
-<!--                                                        <div class="price_text_tag" >-->
-<!--                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                        </div>-->
-<!--                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                            <em class="price_grade sec">￥登录可见</em>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                             </div>-->
-<!--                                        </a>-->
-<!--                                    </div>-->
-<!--                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>-->
-<!--                                 </div>-->
-<!--                             </div>-->
-<!--                       </template>-->
-<!--                        <template v-if="page.floorContent && page.floorContent.templateType == '2'">-->
-<!--                             <div class="floorCon">-->
-<!--                                 <div class="hotList">-->
-<!--                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">-->
-<!--                                        <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"-->
-<!--                                        class="img01 page_main_item" :class="page.floorContent.adsLink1!='' ? '' : 'default' ">-->
-<!--                                        <img  :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1" alt=""> </a>-->
-<!--                                        <a :href="page.floorContent.adsLink2" class="img02 page_main_item"><img  :src="isPC?page.floorContent.pcAdsImage2:page.floorContent.appletsAdsImage2" alt=""> </a>-->
-<!--                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">-->
-<!--                                            <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">-->
-<!--                                            <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>-->
-<!--                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>-->
-<!--                                             <div class="price" v-if="pros.listType == 1">-->
-<!--                                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">-->
-<!--                                                    &lt;!&ndash;用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构&ndash;&gt;-->
-<!--                                                     <template v-if="pros.product.productCategory==1">-->
-<!--                                                        <template v-if="pros.product.priceFlag==1">-->
-<!--                                                            <div class="price_text_tag">-->
-<!--                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                            </div>-->
-<!--                                                            <div class="main_price_unde">￥价格未公开</div>-->
-<!--                                                        </template>-->
-<!--                                                        <template v-else>-->
-<!--                                                            <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">-->
-<!--                                                               <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">-->
-<!--                                                                        {{pros.product.promotions.name}}-->
-<!--                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>-->
-<!--                                                                    </p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">-->
-<!--                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}-->
-<!--                                                            </div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_unde">￥会员可见</div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else>-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag"  v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>-->
-<!--                                                                 </div>-->
-<!--                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                            </template>-->
-<!--                                                        </template>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                          <div class="price_text_tag"></div>-->
-<!--                                                          <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>-->
-<!--                                                          <div class="main_price_show"  v-else>￥{{ pros.product.price | NumFormat  }}</div>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                                <template v-else>-->
-<!--                                                    <template v-if="pros.product.productCategory == 1">-->
-<!--                                                        <div class="price_text_tag">-->
-<!--                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                        </div>-->
-<!--                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                            <em class="price_grade sec">￥登录可见</em>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                             </div>-->
-<!--                                        </a>-->
-<!--                                    </div>-->
-<!--                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>-->
-<!--                                 </div>-->
-<!--                            </div>-->
-<!--                        </template>-->
-<!--                        <template v-if="page.floorContent && page.floorContent.templateType == '3'">-->
-<!--                            <div class="floorCon">-->
-<!--                                <div class="hotList">-->
-<!--                                    <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">-->
-<!--                                        <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"-->
-<!--                                         :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"></a>-->
-<!--                                        <a class="img01 page_main_item" :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink2 : 'javascript:void(0)'"-->
-<!--                                        :class="page.floorContent.adsLink2!='' ? '' : 'default' "><img :src="isPC?page.floorContent.pcAdsImage2:page.floorContent.appletsAdsImage2"/></a>-->
-<!--                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">-->
-<!--                                            <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">-->
-<!--                                            <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>-->
-<!--                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>-->
-<!--                                            <div class="price" v-if="pros.listType == 1">-->
-<!--                                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">-->
-<!--                                                    &lt;!&ndash;用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构&ndash;&gt;-->
-<!--                                                     <template v-if="pros.product.productCategory==1">-->
-<!--                                                        <template v-if="pros.product.priceFlag==1">-->
-<!--                                                            <div class="price_text_tag">-->
-<!--                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                            </div>-->
-<!--                                                            <div class="main_price_unde">￥价格未公开</div>-->
-<!--                                                        </template>-->
-<!--                                                        <template v-else>-->
-<!--                                                            <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">-->
-<!--                                                               <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">-->
-<!--                                                                        {{pros.product.promotions.name}}-->
-<!--                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>-->
-<!--                                                                    </p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">-->
-<!--                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}-->
-<!--                                                            </div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_unde">￥会员可见</div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else>-->
-<!--                                                                <div class="price_text_tag ">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                              <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                            </template>-->
-<!--                                                        </template>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                          <div class="price_text_tag"></div>-->
-<!--                                                          <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>-->
-<!--                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                                <template v-else>-->
-<!--                                                    <template v-if="pros.product.productCategory == 1">-->
-<!--                                                        <div class="price_text_tag ">-->
-<!--                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                        </div>-->
-<!--                                                       <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                            <em class="price_grade sec">￥登录可见</em>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                             </div>-->
-<!--                                        </a>-->
-<!--                                    </div>-->
-<!--                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>-->
-<!--                                </div>-->
-<!--                             </div>-->
-<!--                        </template>-->
-<!--                        <template v-if="page.floorContent && page.floorContent.templateType == '4'">-->
-<!--                            <div class="floorCon">-->
-<!--                                <div class="hotList">-->
-<!--                                    <div class="section_page_main type clear mfw"  :class="page.isPageMore ? '' : 'max'">-->
-<!--                                        <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"-->
-<!--                                         :class="page.floorContent.adsLink1!='' ? '' : 'default' ">-->
-<!--                                         <img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"></a>-->
-<!--                                        <a class="img01 page_main_item" :href="page.floorContent.adsLink2!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"-->
-<!--                                        :class="page.floorContent.adsLink2!='' ? '' : 'default' ">-->
-<!--                                        <img :src="isPC?page.floorContent.pcAdsImage2:page.floorContent.appletsAdsImage2"/></a>-->
-<!--                                        <a class="img02 page_main_item" :href="page.floorContent.adsLink3!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"-->
-<!--                                        :class="page.floorContent.adsLink3!='' ? '' : 'default' ">-->
-<!--                                        <img :src="isPC?page.floorContent.pcAdsImage3:page.floorContent.appletsAdsImage3"/></a>-->
-<!--                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">-->
-<!--                                            <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">-->
-<!--                                            <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>-->
-<!--                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>-->
-<!--                                            <div class="price" v-if="pros.listType == 1">-->
-<!--                                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">-->
-<!--                                                    &lt;!&ndash;用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构&ndash;&gt;-->
-<!--                                                     <template v-if="pros.product.productCategory==1">-->
-<!--                                                        <template v-if="pros.product.priceFlag==1">-->
-<!--                                                            <div class="price_text_tag">-->
-<!--                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                            </div>-->
-<!--                                                            <div class="main_price_unde">￥价格未公开</div>-->
-<!--                                                        </template>-->
-<!--                                                        <template v-else>-->
-<!--                                                            <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">-->
-<!--                                                               <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">-->
-<!--                                                                        {{pros.product.promotions.name}}-->
-<!--                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>-->
-<!--                                                                    </p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">-->
-<!--                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}-->
-<!--                                                            </div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_unde">￥会员可见</div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else>-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                            </template>-->
-<!--                                                        </template>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                          <div class="price_text_tag"></div>-->
-<!--                                                          <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>-->
-<!--                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                                <template v-else>-->
-<!--                                                    <template v-if="pros.product.productCategory == 1">-->
-<!--                                                        <div class="price_text_tag ">-->
-<!--                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                        </div>-->
-<!--                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                            <em class="price_grade sec">￥登录可见</em>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                             </div>-->
-<!--                                        </a>-->
-<!--                                    </div>-->
-<!--                                    <div class="unfold"@click="seeMore(page)" v-if="page.isPageMore" >查看更多 ∨</div>-->
-<!--                                </div>-->
-<!--                            </div>-->
-<!--                        </template>-->
-<!--                        <template v-if="page.floorContent && page.floorContent.templateType == '5'">-->
-<!--                            <div class="floorCon">-->
-<!--                                <div class="hotList">-->
-<!--                                    <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">-->
-<!--                                        <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"-->
-<!--                                        :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"></a>-->
-<!--                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">-->
-<!--                                            <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">-->
-<!--                                            <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>-->
-<!--                                            <div class="name" target="_blank"><span class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>{{pros.name}}</div>-->
-<!--                                            <div class="price" v-if="pros.listType == 1">-->
-<!--                                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">-->
-<!--                                                    &lt;!&ndash;用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构&ndash;&gt;-->
-<!--                                                     <template v-if="pros.product.productCategory==1">-->
-<!--                                                        <template v-if="pros.product.priceFlag==1">-->
-<!--                                                            <div class="price_text_tag">-->
-<!--                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                            </div>-->
-<!--                                                            <div class="main_price_unde">￥价格未公开</div>-->
-<!--                                                        </template>-->
-<!--                                                        <template v-else>-->
-<!--                                                            <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">-->
-<!--                                                               <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">-->
-<!--                                                                        {{pros.product.promotions.name}}-->
-<!--                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>-->
-<!--                                                                    </p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">-->
-<!--                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}-->
-<!--                                                            </div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_unde">￥会员可见</div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else>-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                            </template>-->
-<!--                                                        </template>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                          <div class="price_text_tag"></div>-->
-<!--                                                          <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>-->
-<!--                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                                <template v-else>-->
-<!--                                                    <template v-if="pros.product.productCategory == 1">-->
-<!--                                                        <div class="price_text_tag">-->
-<!--                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                        </div>-->
-<!--                                                       <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                            <em class="price_grade sec">￥登录可见</em>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                             </div>-->
-<!--                                        </a>-->
-<!--                                    </div>-->
-<!--                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>-->
-<!--                                </div>-->
-<!--                             </div>-->
-<!--                        </template>-->
-<!--                        <template v-if="page.floorContent && page.floorContent.templateType == '6'">-->
-<!--                            <div class="floorCon">-->
-<!--                                <div class="hotList">-->
-<!--                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">-->
-<!--                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">-->
-<!--                                            <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">-->
-<!--                                            <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>-->
-<!--                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>-->
-<!--                                            <div class="price" v-if="pros.listType == 1">-->
-<!--                                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">-->
-<!--                                                    &lt;!&ndash;用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构&ndash;&gt;-->
-<!--                                                     <template v-if="pros.product.productCategory==1">-->
-<!--                                                        <template v-if="pros.product.priceFlag==1">-->
-<!--                                                            <div class="price_text_tag">-->
-<!--                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                            </div>-->
-<!--                                                            <div class="main_price_unde">￥价格未公开</div>-->
-<!--                                                        </template>-->
-<!--                                                        <template v-else>-->
-<!--                                                            <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">-->
-<!--                                                               <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">-->
-<!--                                                                        {{pros.product.promotions.name}}-->
-<!--                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>-->
-<!--                                                                    </p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">-->
-<!--                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}-->
-<!--                                                            </div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_unde">￥会员可见</div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else>-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                               <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                            </template>-->
-<!--                                                        </template>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                          <div class="price_text_tag"></div>-->
-<!--                                                          <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>-->
-<!--                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                                <template v-else>-->
-<!--                                                    <template v-if="pros.product.productCategory == 1">-->
-<!--                                                        <div class="price_text_tag">-->
-<!--                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                        </div>-->
-<!--                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                            <em class="price_grade sec">￥登录可见</em>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                             </div>-->
-<!--                                        </a>-->
-<!--                                    </div>-->
-<!--                                     <a class='imgbaner page_main_item' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"-->
-<!--                                     :class="page.floorContent.adsLink1!='' ? '' : 'default' "><img :src="isPC?page.floorContent.pcAdsImage1:page.floorContent.appletsAdsImage1"></a>-->
-<!--                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>-->
-<!--                                </div>-->
-<!--                             </div>-->
-<!--                        </template>-->
-<!--                        <template v-if="page.floorContent && page.floorContent.templateType == '7'">-->
-<!--                            <div class="floorCon">-->
-<!--                                <div class="hotList">-->
-<!--                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">-->
-<!--                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">-->
-<!--                                            <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">-->
-<!--                                            <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>-->
-<!--                                            <div class="name" target="_blank"><span class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</span>{{pros.name}}</div>-->
-<!--                                            <div class="price" v-if="pros.listType == 1">-->
-<!--                                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">-->
-<!--                                                    &lt;!&ndash;用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构&ndash;&gt;-->
-<!--                                                     <template v-if="pros.product.productCategory==1">-->
-<!--                                                        <template v-if="pros.product.priceFlag==1">-->
-<!--                                                            <div class="price_text_tag">-->
-<!--                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                            </div>-->
-<!--                                                            <div class="main_price_unde">￥价格未公开</div>-->
-<!--                                                        </template>-->
-<!--                                                        <template v-else>-->
-<!--                                                            <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">-->
-<!--                                                               <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">-->
-<!--                                                                        {{pros.product.promotions.name}}-->
-<!--                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>-->
-<!--                                                                    </p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">-->
-<!--                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}-->
-<!--                                                            </div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_unde">￥会员可见</div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else>-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                               <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                            </template>-->
-<!--                                                        </template>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                          <div class="price_text_tag"></div>-->
-<!--                                                          <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>-->
-<!--                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                                <template v-else>-->
-<!--                                                    <template v-if="pros.product.productCategory == 1">-->
-<!--                                                        <div class="price_text_tag">-->
-<!--                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                        </div>-->
-<!--                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                            <em class="price_grade sec">￥登录可见</em>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                             </div>-->
-<!--                                        </a>-->
-<!--                                    </div>-->
-<!--                                </div>-->
-<!--                             </div>-->
-<!--                        </template>-->
-<!--                        <template v-if="page.floorContent && page.floorContent.templateType == '8'">-->
-<!--                            <div class="floorCon">-->
-<!--                                <div class="hotList swiper-container" id="recommendBox">-->
-<!--                                    <div class="section_page_main clear mfw swiper-wrapper" :class="page.isPageMore ? '' : 'max'">-->
-<!--                                        <a class="productItem swiper-slide" :href="pros.link"  v-for="(pros,index) in page.floorImageList">-->
-<!--                                            <img :src="pros.image" :alt="pros.name">-->
-<!--                                            <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>-->
-<!--                                            <div class="name" target="_blank"><sapn class="tag" v-if="pros.product!=null && pros.product.beautyActFlag==1">美博会</sapn>{{pros.name}}</div>-->
-<!--                                            <div class="price" v-if="pros.listType == 1">-->
-<!--                                                <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">-->
-<!--                                                    &lt;!&ndash;用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构&ndash;&gt;-->
-<!--                                                     <template v-if="pros.product.productCategory==1">-->
-<!--                                                        <template v-if="pros.product.priceFlag==1">-->
-<!--                                                            <div class="price_text_tag">-->
-<!--                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                            </div>-->
-<!--                                                            <div class="main_price_unde">￥价格未公开</div>-->
-<!--                                                        </template>-->
-<!--                                                        <template v-else>-->
-<!--                                                            <template v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">-->
-<!--                                                               <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">-->
-<!--                                                                        {{pros.product.promotions.name}}-->
-<!--                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>-->
-<!--                                                                    </p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">-->
-<!--                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}-->
-<!--                                                            </div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class="main_price_unde">￥会员可见</div>-->
-<!--                                                            </template>-->
-<!--                                                            <template v-else>-->
-<!--                                                                <div class="price_text_tag">-->
-<!--                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                                </div>-->
-<!--                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                            </template>-->
-<!--                                                        </template>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                          <div class="price_text_tag"></div>-->
-<!--                                                          <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>-->
-<!--                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                                <template v-else>-->
-<!--                                                    <template v-if="pros.product.productCategory == 1">-->
-<!--                                                        <div class="price_text_tag" >-->
-<!--                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>-->
-<!--                                                        </div>-->
-<!--                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>-->
-<!--                                                    </template>-->
-<!--                                                    <template v-else>-->
-<!--                                                            <em class="price_grade sec">￥登录可见</em>-->
-<!--                                                    </template>-->
-<!--                                                </template>-->
-<!--                                             </div>-->
-<!--                                        </a>-->
-<!--                                    </div>-->
-<!--                                   <div class="swiper-pagination mfc"> <span v-if="isPC" v-for="i in  Math.ceil(page.floorImageList.length / 5)"></span></div>-->
-<!--                                </div>-->
-<!--                             </div>-->
-<!--                        </template>-->
-<!--                    </div>-->
-
-
-
-                </div>
-<!--            </template>-->
+                                            </th:block>
+                                        </div>
+                                    </a>
+                                </th:block>
+                                <!-- 广告图 -->
+                                <th:block th:if="*{templateType}==6">
+                                    <a th:href="*{#strings.isEmpty(adsLink1)}? 'javascript:;' : *{adsLink1}" th:attr="target=(*{#strings.isEmpty(adsLink1)} ? '_self' : '_blank')" class="page_main_item ad_01">
+                                        <img v-if="isPC" th:src="*{pcAdsImage1}" alt="" class="page_main_item_adv">
+                                        <img v-else th:src="*{appletsAdsImage1}" alt="" class="page_main_item_adv">
+                                    </a>
+                                </th:block>
+                            </div>
+                            <div th:if="*{templateType}==8" class="swiper-pagination swiper-pagination-floor mfc" th:attr="data-id=${floor.get('floorImageList').size}"></div>
+                        </div>
+                        <div class="section_page_more" th:attr="data-id=*{templateType}, data-size=${floor.get('floorImageList').size}">
+                            <div class="more" @click="showMoreItem($event)"> <i class="icon mIcon"></i>查看更多</div>
+                        </div>
+                    </th:block>
+                </th:block>
+            </div>
         </div>
     </div>
+</div>
 
-    <!-- 引入底部 -->
+<!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>