二手静态页修改

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

@@ -33,7 +33,7 @@
 .section_page .page_main_price .main_price_unde{width:100%;height:31px;line-height:31px;font-size:14px;color:#4a4f58;text-align:left;float:left}
 .section_page .page_main_price .main_price_show{width:100%;height:30px;line-height:30px;font-size:14px;color:#f94b4b;text-align:left;float:left}
 .section_page .page_main_price .main_price_show.none{color:#999999;text-decoration:line-through}
-.section_page .page_main_price .main_price_login,.section_page .page_main_price .main_price_show.none{display:none}
+.section_page .page_main_price .section_page .page_main_price .main_price_show.none{display:none}
 .section_page .page_main_price .price_text_tag{width:100%;height:22px;box-sizing:border-box;float:left;margin-top:0px}
 .section_page .page_main_price .price_text_tag .listTag{margin:0;float:left}
 .section_page .page_main_price .main_price_none{width:100%;height:24px;box-sizing:border-box;float:left;margin-top:2px}
@@ -85,7 +85,7 @@
 .section_page .page_main_price{width:100%;box-sizing:border-box;padding:0 3.2vw}
 .section_page .page_main_price .price_text_tag{width:100%;box-sizing:border-box;float:left}
 .section_page .page_main_price .main_price_show{color:#f94b4b}
-.section_page .page_main_price .main_price_login,.section_page .page_main_price .main_price_show.none{display:none}
+.section_page .page_main_price .section_page .page_main_price .main_price_show.none{display:none}
 .section_page .page_main_price .main_price_unde{width:100%;height:6.5vw;line-height:6.5vw;font-size:3.4vw;color:#4a4f58;text-align:left;float:left}
 .section_page .page_main_price .price_text_tag .listTag{padding:0 2vw;border:.27vw solid #ffe6dc;background:none;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw}
 .section_page .section_page_main.section_6{height:auto}

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

@@ -91,11 +91,29 @@ var homeData = new Vue({
                 if(response.code == 0){
                     var data = response.data;
                     _self.homePageFloor = data.homePageFloor;
+                    setTimeout(function(){
+                        // 图片懒加载
+                        $("img[data-original]").lazyload();
+                        _self.setAsideNav();
+                        _self.swiperFloor();
+                        // 设置页面查看更多
+                        _self.setReadeMore();
+                    },500);
                 }else{
                     CAIMEI.Alert(response.msg, '确定');
                 }
             });
         },
+        PromotionsFormat:function(promo){//促销活动类型数据处理
+            if(promo!=null){
+                if(promo.type == 1 && promo.mode == 1){
+                    return true
+                }else{
+                    return false
+                }
+            }
+            return false
+        },
         setAsideNav: function(){
             var _self = this;
             if (isPC) {
@@ -265,16 +283,16 @@ var homeData = new Vue({
         var _this = this;
         // 页面主图轮播
         this.swiperBanner();
-        // 设置页面查看更多
-        this.setReadeMore();
-        // 推荐专区商品轮播
-        this.swiperFloor();
-        // 设置右侧导航
-        this.setAsideNav();
         // 获取设置商品价格
         if (GLOBAL_USER_ID) {
             this.GetHomeData();
-            this.setPriceShown();
+        }else{
+            // 设置页面查看更多
+            this.setReadeMore();
+            // 设置右侧导航
+            this.setAsideNav();
+            // 推荐专区商品轮播
+            this.swiperFloor();
         }
         // Dom加载后
         this.$nextTick(function(){

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

@@ -10,12 +10,17 @@
          typeSort:'',
          showflag:false,
          params:{
-            pageId:'',
-            userId:'',
+            pageId:0,
+            userId:0,
             source:1
          },
          isPC:window.isPC
-    },
+     },
+     filters: {
+         NumFormat:function(value) {
+             return Number(value).toFixed(2);
+         }
+     },
      methods:{
         closeup:function(){
             this.showflag = false;
@@ -71,6 +76,34 @@
                 },0)
             },500);
         },
+        GetHomeData: function(){//获取楼层
+             var _self = this;
+            ProductApi.GethomeData(_self.params,function(response){
+                 if(response.code == 0){
+                     var data = response.data;
+                     _self.floorList = data.floorList;
+                     setTimeout(function(){
+                         // 图片懒加载
+                         $("img[data-original]").lazyload();
+                         _self.swiperFloor();
+                         // 设置页面查看更多
+                         _self.setReadeMore();
+                     },500);
+                 }else{
+                     CAIMEI.Alert(response.msg, '确定');
+                 }
+             });
+         },
+         PromotionsFormat:function(promo){//促销活动类型数据处理
+             if(promo!=null){
+                 if(promo.type == 1 && promo.mode == 1){
+                     return true
+                 }else{
+                     return false
+                 }
+             }
+             return false
+         },
         // 设置页面查看更多按钮显示
         setReadeMore: function(){
             $(".section_page_more").each(function(){
@@ -169,13 +202,14 @@
          //this.params.pageId = getUrlParam('id');
          var paramsArr = window.location.pathname.split(".")[0].split("-");
          this.params.pageId =  paramsArr.length>=1 ? paramsArr[1] : '';
-        // 设置页面查看更多
-        this.setReadeMore();
-        // 推荐专区商品轮播
-        this.swiperFloor();
         // 获取设置商品价格
         if (GLOBAL_USER_ID) {
-            this.setPriceShown();
+            this.GetHomeData();
+        }else {
+            // 设置页面查看更多
+            this.setReadeMore();
+            // 推荐专区商品轮播
+            this.swiperFloor();
         }
         // Dom加载后
         this.$nextTick(function(){

src/main/resources/templates/index.html

@@ -101,12 +101,12 @@
                 </div>
             </div>
             <div class="section_left ">
-                <template v-if="userId == 0">
-                    <div class="section_page" v-for="floor in homePageFloor">
+                <template v-if="userId > 0">
+                    <div class="section_page section_page_user" v-for="(floor,index) in homePageFloor">
                         <template v-if="floor.floorContent">
-                            <div class="section_page_title">
-                                <h1 v-text="floor.text"></h1>
-                                <p v-text="floor.detail"></p>
+                            <div class="section_page_title" >
+                                <h1 :data-id="index+1">{{ floor.title }}</h1>
+                                <p>{{ floor.detail }}</p>
                             </div>
                             <div :class="floor.floorContent.templateType == 8 ? 'hotList swiper-container-floor' : ''"
                                  :id="floor.floorContent.templateType == 8 ? 'recommendBox' : ''"
@@ -152,72 +152,71 @@
                                         </a>
                                     </template>
                                     <!-- 商品/图片 列表 -->
-                                    <div  v-for="pros in floor.floorImageList">
-                                        <a :href="pros.link" class="page_main_item ad_04 swiper-slide" target="_blank">
-                                            <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
-                                            <div class="page_main_tag" v-if="pros.listType == 2"><p v-text="pros.label"></p></div>
-                                            <div class="page_main_text">
-                                                <span class="tag" v-if="pros.beautyActFlag == 1">美博会</span>
-                                                <span v-text="pros.name"></span>
-                                            </div>
-                                            <div class="page_main_price" v-if="userId>0 && pros.listType == 1">
-                                                <!-- 商品价格 -->
-                                                <div class=main_price_text">
-                                                    <!-- 正常商品 -->
-                                                    <template v-if="pros.product.productCategory == 1">
-                                                        <div v-if="pros.product.actStatus" class="price_text_tag" >
-                                                            <p class="listTag" v-if="pros.product.actStatus ==1 && pros.product.promotions">
-                                                                <span v-text="pros.product.promotions.name"></span>
-                                                                <template v-if="pros.product.promotions.type ==1 && pros.product.promotions.mode == 1">
-                                                                    <!--单品优惠:优惠价-->
-                                                                    <span class="price_unit" style="display:none;">:￥</span><span class="price_num">{{ pros.product.price }}</span>
-                                                                </template>
-                                                            </p>
-                                                        </div>
-                                                        <div class="main_price_none">
-                                                            <em class="price_grade service_none"><span class="bold">￥</span>
-                                                                <i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
-                                                            </em>
-                                                        </div>
-                                                        <div class="main_price_login">
-                                                            <!--0公开价格 1不公开价格 2仅对会员机构公开-->
-                                                            <em v-if="pros.product.priceFlag ==1" class="price_grade">
-                                                                <span>￥</span>价格未公开
-                                                            </em>
-                                                            <template v-else>
+                                    <a :href="pros.link" class="page_main_item ad_04 swiper-slide" target="_blank" v-for="pros in floor.floorImageList">
+                                        <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
+                                        <div class="page_main_tag" v-if="pros.listType == 2"><p v-text="pros.label"></p></div>
+                                        <div class="page_main_text">
+                                            <span class="tag" v-if="pros.beautyActFlag == 1">美博会</span>
+                                            <span v-text="pros.name"></span>
+                                        </div>
+                                        <div class="page_main_price" v-if="userId>0 && pros.listType == 1">
+                                            <!-- 商品价格 -->
+                                            <div class="main_price_text">
+                                                <!-- 正常商品 -->
+                                                <template v-if="pros.product.productCategory == 1">
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.product.actStatus ==1 && pros.product.promotions">
+                                                            <span v-text="pros.product.promotions.name"></span>
+                                                            <template v-if="PromotionsFormat(pros.product.promotions)">
+                                                                <!--单品优惠:优惠价-->
+                                                                <span class="price_unit">:￥</span><span class="price_num">{{ pros.product.price | NumFormat }}</span>
+                                                            </template>
+                                                        </p>
+                                                    </div>
+                                                    <div class="main_price_login">
+                                                        <!--0公开价格 1不公开价格 2仅对会员机构公开-->
+                                                        <template v-if="pros.product.priceFlag == 1">
+                                                            <em class="price_grade"><span>￥</span>价格未公开</em>
+                                                        </template>
+                                                        <template v-else>
+                                                            <template v-if="PromotionsFormat(pros.product.promotions)">
+                                                                <!--单品优惠时的划线价-->
+                                                                <div class="main_price_show">
+                                                                    ￥<span class="price_o_num">{{ pros.product.originalPrice | NumFormat }}</span>
+                                                                </div>
+                                                            </template>
+                                                            <template v-else-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="main_price_show">￥<span class="price_num">{{ pros.product.price | NumFormat }}</span></div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                                 <em class="price_grade_club">
                                                                     <span>￥</span>会员可见
                                                                 </em>
-                                                                <!--机构价-->
-                                                                <div class="main_price_show">￥<span class="price_num">{{ pros.product.price }}</span></div>
-                                                                <!--单品优惠时的划线价-->
-                                                                <div class="main_price_show none">￥<span class="price_o_num">{{ pros.product.originalPrice }}</span></div>
+                                                            </template>
+                                                            <template v-else>
                                                                 <!--供应商除自己的商品外，也显示价格等级-->
                                                                 <em class="price_grade_shop">
                                                                     <span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
                                                                 </em>
                                                             </template>
+
+                                                        </template>
+                                                    </div>
+                                                </template>
+                                                <!-- 二手商品 -->
+                                                <template v-else>
+                                                    <div class="main_price_login" v-if="userId>0">
+                                                        <div class="price_text_tag"></div>
+                                                        <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">￥价格祥聊</div>
+                                                        <div v-else class="main_price_show">
+                                                            ￥<span class="price_num">{{ pros.product.price | NumFormat }}</span>
                                                         </div>
-                                                    </template>
-                                                    <!-- 二手商品 -->
-                                                    <template v-else>
-                                                        <div class="main_price_none sec">
-                                                            <em class="price_grade service_none">
-                                                                <span>￥</span>登录可见
-                                                            </em>
-                                                        </div>
-                                                        <div class="main_price_login" data-id="3" v-if="userId>0">
-                                                            <div class="price_text_tag"></div>
-                                                            <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">￥价格祥聊</div>
-                                                            <div v-else class="main_price_show">
-                                                                ￥<span class="price_num">{{ pros.product.price }}</span>
-                                                            </div>
-                                                        </div>
-                                                    </template>
-                                                </div>
+                                                    </div>
+                                                </template>
                                             </div>
-                                        </a>
-                                    </div>
+                                        </div>
+                                    </a>
                                     <!-- 广告图 -->
                                     <div v-if="floor.floorContent.templateType == 6">
                                         <a :href="floor.floorContent.adsLink1 ? floor.floorContent.adsLink1 : 'javascript:;'"
@@ -229,9 +228,16 @@
                                         </a>
                                     </div>
                                 </div>
-                                <div v-if="floor.floorContent.templateType == 8" class="swiper-pagination swiper-pagination-floor mfc"></div>
+                                <div v-if="floor.floorContent.templateType == 8"
+                                     class="swiper-pagination swiper-pagination-floor mfc"
+                                     :data-id="floor.floorImageList.length"
+                                >
+                                </div>
                             </div>
-                            <div class="section_page_more">
+                            <div class="section_page_more"
+                                 :data-id="floor.floorContent.templateType"
+                                 :data-size="floor.floorImageList.length"
+                            >
                                 <div class="more" @click="showMoreItem($event)"> <i class="icon mIcon"></i>查看更多</div>
                             </div>
                         </template>

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

@@ -53,109 +53,253 @@
                     </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>
-                    <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}">
+            <template v-if="params.userId > 0">
+                <div class="section_page section_page_user" v-for="(floor,index) in floorList">
+                    <template v-if="floor.floorContent">
+                        <div class="section_page_title" >
+                            <h1 :data-id="index+1">{{ floor.title }}</h1>
+                            <p>{{ floor.detail }}</p>
+                        </div>
+                        <div :class="floor.floorContent.templateType == 8 ? 'hotList swiper-container-floor' : ''"
+                             :id="floor.floorContent.templateType == 8 ? 'recommendBox' : ''"
+                        >
+                            <div :class="floor.floorContent.templateType == 8 ?
+                                'section_page_main type_08 swiper-wrapper recommendBox-wrapper clear mfw section_'+floor.floorContent.templateType :
+                                'section_page_main clear mfw section_'+floor.floorContent.templateType"
+                                 :data-id="floor.floorImageList.length"
+                            >
                                 <!-- 广告图 -->
-                                <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">
+                                <template v-if="floor.floorContent.templateType == 1 ||
+                                                    floor.floorContent.templateType == 2 ||
+                                                    floor.floorContent.templateType == 3 ||
+                                                    floor.floorContent.templateType == 4 ||
+                                                    floor.floorContent.templateType == 5"
+                                >
+                                    <a :href="floor.floorContent.adsLink1 ? floor.floorContent.adsLink1 : 'javascript:;'"
+                                       :target="floor.floorContent.adsLink1 ? '_blank' : '_self'"
+                                       class="page_main_item ad_01"
+                                    >
+                                        <img v-if="isPC" :src="floor.floorContent.pcAdsImage1" alt="" class="page_main_item_adv">
+                                        <img v-else :src="floor.floorContent.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">
+                                </template>
+                                <template v-if="floor.floorContent.templateType == 2 ||
+                                                    floor.floorContent.templateType == 3 ||
+                                                    floor.floorContent.templateType == 4"
+                                >
+                                    <a :href="floor.floorContent.adsLink2 ? floor.floorContent.adsLink2 : 'javascript:;'"
+                                       :target="floor.floorContent.adsLink2 ? '_blank' : '_self'"
+                                       class="page_main_item ad_02"
+                                    >
+                                        <img v-if="isPC" :src="floor.floorContent.pcAdsImage2" alt="" class="page_main_item_adv">
+                                        <img v-else :src="floor.floorContent.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">
+                                </template>
+                                <template v-if="floor.floorContent.templateType == 4">
+                                    <a :href="floor.floorContent.adsLink3 ? floor.floorContent.adsLink3 : 'javascript:;'"
+                                       :target="floor.floorContent.adsLink3 ? '_blank' : '_self'"
+                                       class="page_main_item ad_03"
+                                    >
+                                        <img v-if="isPC" :src="floor.floorContent.pcAdsImage3" alt="" class="page_main_item_adv">
+                                        <img v-else :src="floor.floorContent.appletsAdsImage3" alt="" class="page_main_item_adv">
                                     </a>
-                                </th:block>
+                                </template>
                                 <!-- 商品/图片 列表 -->
-                                <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')}" v-if="userId>0">
-                                                            <p class="listTag" th:if="*{actStatus}==1 and ${pros.get('product').get('promotions')}!=null">
-                                                                <template th:text="*{promotions.name}"></template>
-                                                                <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">
-                                                                    <!--单品优惠:优惠价-->
-                                                                    <span class="price_unit" style="display:none;">:￥</span><span class="price_num"></span>
-                                                                </th:block>
-                                                            </p>
-                                                        </div>
-                                                        <div class="main_price_none">
-                                                            <em class="price_grade service_none"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
-                                                        </div>
-                                                        <div class="main_price_login" th:attr="data-id=*{priceFlag}">
-                                                            <!--0公开价格 1不公开价格 2仅对会员机构公开-->
-                                                            <em th:if="*{priceFlag}==1" class="price_grade"><span>￥</span>价格未公开</em>
-                                                            <th:block th:unless="*{priceFlag}==1">
-                                                                <em class="price_grade_club"><span>￥</span>会员可见</em>
-                                                                <!--机构价-->
-                                                                <div class="main_price_show">￥<span class="price_num"></span></div>
-                                                                <!--单品优惠时的划线价-->
-                                                                <div class="main_price_show none">￥<span class="price_o_num"></span></div>
-                                                                <!--供应商除自己的商品外，也显示价格等级-->
-                                                                <em class="price_grade_shop"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
-                                                            </th:block>
-                                                        </div>
-                                                    </th:block>
-                                                    <!-- 二手商品 -->
-                                                    <th:block th:if="*{productCategory}!=1">
-                                                        <div class="main_price_none sec">
-                                                            <em class="price_grade service_none"><span>￥</span>登录可见</em>
-                                                        </div>
-                                                        <div class="main_price_login" data-id="3" v-if="userId>0">
-                                                            <div class="price_text_tag"></div>
-                                                            <div th:if="*{detailTalkFlag}==2" class="main_price_show">￥价格祥聊</div>
-                                                            <div th:if="*{detailTalkFlag}!=2" class="main_price_show">￥<span class="price_num"></span></div>
-                                                        </div>
-                                                    </th:block>
+                                <a :href="pros.link" class="page_main_item ad_04 swiper-slide" target="_blank" v-for="pros in floor.floorImageList">
+                                    <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
+                                    <div class="page_main_tag" v-if="pros.listType == 2"><p v-text="pros.label"></p></div>
+                                    <div class="page_main_text">
+                                        <span class="tag" v-if="pros.beautyActFlag == 1">美博会</span>
+                                        <span v-text="pros.name"></span>
+                                    </div>
+                                    <div class="page_main_price" v-if="params.userId>0 && pros.listType == 1">
+                                        <!-- 商品价格 -->
+                                        <div class="main_price_text">
+                                        <!-- 正常商品 -->
+                                            <template v-if="pros.product.productCategory == 1">
+                                                <div class="price_text_tag">
+                                                    <p class="listTag" v-if="pros.product.actStatus ==1 && pros.product.promotions">
+                                                        <span v-text="pros.product.promotions.name"></span>
+                                                        <template v-if="PromotionsFormat(pros.product.promotions)">
+                                                            <!--单品优惠:优惠价-->
+                                                            <span class="price_unit">:￥</span><span class="price_num">{{ pros.product.price | NumFormat }}</span>
+                                                        </template>
+                                                    </p>
+                                                </div>
+                                                <div class="main_price_login">
+                                                    <!--0公开价格 1不公开价格 2仅对会员机构公开-->
+                                                    <template v-if="pros.product.priceFlag == 1">
+                                                        <em class="price_grade"><span>￥</span>价格未公开</em>
+                                                    </template>
+                                                    <template v-else>
+                                                        <template v-if="PromotionsFormat(pros.product.promotions)">
+                                                            <!--单品优惠时的划线价-->
+                                                            <div class="main_price_show none">
+                                                                ￥<span class="price_o_num">{{ pros.product.originalPrice | NumFormat }}</span>
+                                                            </div>
+                                                        </template>
+                                                        <template v-else-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="main_price_show">￥<span class="price_num">{{ pros.product.price | NumFormat }}</span></div>
+                                                        </template>
+                                                        <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
+                                                            <em class="price_grade_club">
+                                                                <span>￥</span>会员可见
+                                                            </em>
+                                                        </template>
+                                                        <template v-else>
+                                                            <!--供应商除自己的商品外，也显示价格等级-->
+                                                            <em class="price_grade_shop">
+                                                                <span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
+                                                            </em>
+                                                        </template>
+                                                    </template>
+                                                </div>
+                                            </template>
+                                            <!-- 二手商品 -->
+                                            <template v-else>
+                                                <div class="main_price_login" v-if="params.userId>0">
+                                                    <div class="price_text_tag"></div>
+                                                    <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">￥价格祥聊</div>
+                                                    <div v-else class="main_price_show">
+                                                        ￥<span class="price_num">{{ pros.product.price | NumFormat }}</span>
+                                                    </div>
                                                 </div>
-                                            </th:block>
+                                            </template>
                                         </div>
-                                    </a>
-                                </th:block>
+                                    </div>
+                                </a>
                                 <!-- 广告图 -->
-                                <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">
+                                <div v-if="floor.floorContent.templateType == 6">
+                                    <a :href="floor.floorContent.adsLink1 ? floor.floorContent.adsLink1 : 'javascript:;'"
+                                       :target="floor.floorContent.adsLink1 ? '_blank' : '_self' "
+                                       class="page_main_item ad_01"
+                                    >
+                                        <img v-if="isPC" :src="floor.floorContent.pcAdsImage1" alt="" class="page_main_item_adv">
+                                        <img v-else :src="floor.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                     </a>
-                                </th:block>
+                                </div>
+                            </div>
+                            <div v-if="floor.floorContent.templateType == 8"
+                                 class="swiper-pagination swiper-pagination-floor mfc"
+                                 :data-id="floor.floorImageList.length"
+                            >
                             </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="section_page_more"
+                             :data-id="floor.floorContent.templateType"
+                             :data-size="floor.floorImageList.length"
+                        >
                             <div class="more" @click="showMoreItem($event)"> <i class="icon mIcon"></i>查看更多</div>
                         </div>
+                    </template>
+                </div>
+            </template>
+            <template v-else>
+                <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')}" v-if="params.userId>0">
+                                                                <p class="listTag" th:if="*{actStatus}==1 and ${pros.get('product').get('promotions')}!=null">
+                                                                    <template th:text="*{promotions.name}"></template>
+                                                                    <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">
+                                                                        <!--单品优惠:优惠价-->
+                                                                        <span class="price_unit" style="display:none;">:￥</span><span class="price_num"></span>
+                                                                    </th:block>
+                                                                </p>
+                                                            </div>
+                                                            <div class="main_price_none">
+                                                                <em class="price_grade service_none"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
+                                                            </div>
+                                                            <div class="main_price_login" th:attr="data-id=*{priceFlag}">
+                                                                <!--0公开价格 1不公开价格 2仅对会员机构公开-->
+                                                                <em th:if="*{priceFlag}==1" class="price_grade"><span>￥</span>价格未公开</em>
+                                                                <th:block th:unless="*{priceFlag}==1">
+                                                                    <em class="price_grade_club"><span>￥</span>会员可见</em>
+                                                                    <!--机构价-->
+                                                                    <div class="main_price_show">￥<span class="price_num"></span></div>
+                                                                    <!--单品优惠时的划线价-->
+                                                                    <div class="main_price_show none">￥<span class="price_o_num"></span></div>
+                                                                    <!--供应商除自己的商品外，也显示价格等级-->
+                                                                    <em class="price_grade_shop"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
+                                                                </th:block>
+                                                            </div>
+                                                        </th:block>
+                                                        <!-- 二手商品 -->
+                                                        <th:block th:if="*{productCategory}!=1">
+                                                            <div class="main_price_none sec">
+                                                                <em class="price_grade service_none"><span>￥</span>登录可见</em>
+                                                            </div>
+                                                            <div class="main_price_login" data-id="3" v-if="params.userId>0">
+                                                                <div class="price_text_tag"></div>
+                                                                <div th:if="*{detailTalkFlag}==2" class="main_price_show">￥价格祥聊</div>
+                                                                <div th:if="*{detailTalkFlag}!=2" class="main_price_show">￥<span class="price_num"></span></div>
+                                                            </div>
+                                                        </th:block>
+                                                    </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>
-                </th:block>
-            </div>
+                </div>
+            </template>
         </div>
     </div>
 </div>