crm系统优化

src/main/resources/static/css/account/register.css

@@ -40,6 +40,14 @@ footer .footTop{display:none;}
 .formLine .form-upload-image .upload-img{width: 128px;height: 90px;display: block;}
 .formLine .form-upload-image .icon{width: 20px;height: 20px;display: block;position: absolute;right: 0;top: 0;cursor: pointer;}
 .formLine .form-upload-image .icon:before{width: 20px;height: 20px;background-position: -114px -140px;}
+.release-from .release-input .release-props{width: 100%;height: 38px;}
+.release-from .release-input .release-props .release-radio{width:150px;height:36px;margin-right:10px;line-height:34px;box-sizing:border-box;font-size:14px;text-align:center;display:inline-block}
+.release-from .release-input .release-props .release-radio.second{width:100px;}
+.release-from .release-input .release-props .release-radio input{display:none}
+.release-from .release-input .release-props .release-radio i{display:block;font-style:normal;cursor:pointer;width:100%;height:100%;position:relative;overflow:hidden;border-radius:2px;background:#FFF;border:1px solid #b8bfca;color:#627386;}
+.release-from .release-input .release-props .release-radio i:before{position:absolute;right:0;bottom:0;display:none;width:20px;height:20px;background-position:-208px -253px}
+.release-from .release-input .release-props .release-radio input:checked + i{border-color:#FF5B00;color:#FF5B00}
+.release-from .release-input .release-props .release-radio input:checked + i:before{display:block}
 
 .signAccount{width:498px;margin:0 auto;min-height: 900px;}
 .signAccount .title{height:42px;line-height:42px;font-weight:bold;font-size:32px;color:#22272e;text-align:center;padding:30px}
@@ -108,6 +116,14 @@ footer{display:none}
 .formLine .business{height:auto;position:relative}
 .formLine .business input[type="text"] {width:66vw;display: block;float: left;margin-right: 3vw;}
 .formLine .business a {display: block;float: left; width:21.4vw;height: 10.5vw;line-height: 10.5vw;font-size:3.4vw;color: #FF5B00;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #FF5B00;text-align: center;}
+.release-from .release-input .release-props{width: 100%;height: 36px;}
+.release-from .release-input .release-props .release-radio{    width: 26.7vw;height: 11.2vw;margin-right: 2.7vw;line-height: 11.2vw;box-sizing: border-box;font-size: 3.4vw;text-align: center;display: inline-block}
+/*.release-from .release-input .release-props .release-radio.second{width:100px;}*/
+.release-from .release-input .release-props .release-radio input{display:none}
+.release-from .release-input .release-props .release-radio i{display:block;font-style:normal;cursor:pointer;width:100%;height:100%;position:relative;overflow:hidden;border-radius:2px;background:#FFF;border:.27vw solid #b8bfca;color:#627386;}
+.release-from .release-input .release-props .release-radio i:before{position:absolute;right:0;bottom:0;display:none;width:5.3vw;height:5.3vw;background-position:-75.7vw -8.5vw}
+.release-from .release-input .release-props .release-radio input:checked + i{border-color:#FF5B00;color:#FF5B00}
+.release-from .release-input .release-props .release-radio input:checked + i:before{display:block}
 
 .advisory .mask{display: none;width: 100%;height: 100%;position: fixed;top: 0;left: 0;background-color: rgba(0,0,0,.5);z-index: 99;}
 .advisory .mask.active{display: block;}

src/main/resources/static/css/supplier-center/message.css

@@ -21,8 +21,12 @@ li{list-style:none}
     .content .section .section-content{width: 100%;height: auto;float: left;box-sizing: border-box;padding: 10px 0;}
     .content .section .section-content .new-list{width: 100%;height:80px;float: left;box-sizing: border-box;padding: 15px 0;}
     .content .section .section-content .new-list .text{line-height: 36px;float: left;}
+    /*消息通知样式修改*/
+    .content .section .section-content .new-list .text .msg-content {display: flex;flex-direction: column;}
+    .content .section .section-content .new-list .text .msg-content p span {margin-left: 100px;}
+
     .content .section .section-content .new-list .icon{width: 16px;height: 16px;display: block;float: left;padding: 10px 15px;line-height: 16px;cursor: pointer;}
-    .content .section .section-content .new-list .text p{width: 700px;height: 48px;line-height: 24px;font-size: 14px;color: #627386;float: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;}
+    .content .section .section-content .new-list .text p{width: 700px;line-height: 24px;font-size: 14px;color: #627386;float: left;text-overflow: ellipsis;display: -webkit-box;word-break: break-all;-webkit-box-orient: vertical;}
     .content .section .section-content .new-list .text p .link{color: #E15621;cursor: pointer;text-decoration: underline;}
     .content .section .section-content .new-list .text p .link:hover{text-decoration: underline;}
     .content .section .section-content .new-list .time{line-height: 36px;font-size: 14px;color: #b8bfca;float: right;}

src/main/resources/static/js/account/register-club.js

@@ -19,7 +19,8 @@ var registerPage = new Vue({
             phone:'',
             code:'',
             password:'',
-            password2:''
+            password2:'',
+            isSp: 1, //是否选择专属客户经理
         },
         clubUpgradeUser: {
             userId:'',
@@ -117,7 +118,8 @@ var registerPage = new Vue({
                         password : _self.clubUser.password,
                         passWordConfirm : _self.clubUser.password2,
                         smsCode : _self.clubUser.code,
-                        isAgreed :  _self.isAgreed
+                        isAgreed :  _self.isAgreed,
+                        isSp: _self.clubUser.isSp
                 };
                 _self.loginLoading = true;
                 UserApi.ClubRegister(params,function (response) {

src/main/resources/static/js/user-center/mixins/noticeMixin.js

@@ -82,7 +82,13 @@ var noticeMixin = function () {// 通知消息
                 return map[cell.couponMessageType]
             },
             noticeServeText(cell){//服务通知文案处理
-                console.log('服务通知文案处理');
+                if (cell.shopTieredType > 4) {
+                    const map = {
+                        5: '采美平台已为您匹配专属客户经理，为您提供专业咨询服务。',
+                        6: '因公司内部人员调整需要，采美平台已为您更换了新客户经理。',
+                    }
+                    return map[cell.shopTieredType]
+                }
             },
             handleOrderClick($event){// 订单点击事件
                 let orderMessageType  = Number($event[0].attributes[0].value);

src/main/resources/templates/account/register-club.html

@@ -52,6 +52,16 @@
                     <span class="errTips icon mIcon" tips="8-16位数字或字母或字符"></span>
                     <i class="icon showPwd" @click="showPassword($event)"></i>
                 </div>
+                <div class="formLine release-from">
+                    <p><em>*</em>是否需要为您匹配专属客户经理：</p>
+                    <p>建议选择“需要”，采美专业的客户经理会为您提供更多支持，帮助您轻松采购！</p>
+                    <div class="release-input">
+                        <div class="release-props">
+                            <label class="release-radio"><input type="radio" name="commodityType" v-model="clubUser.isSp" value="1"><i class="icon mIcon">需要</i></label>
+                            <label class="release-radio"><input type="radio" name="commodityType" v-model="clubUser.isSp" value="2" checked><i class="icon mIcon">不需要</i></label>
+                        </div>
+                    </div>
+                </div>
                 <div class="subLine">
                     <p>
                         <span class="iconfont icon-weigouxuan" :class="isAgree ? 'icon-gouxuan' : 'icon-weigouxuan' " @click="checkedIsAgreeFn"></span>

src/main/resources/templates/index.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
-<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="https://www.thymeleaf.org ">
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.thymeleaf.org ">
+
 <head>
     <title>采美365网-医美采购平台-生美采购平台-美业一站式正品采购平台</title>
     <meta name="keywords" content="美业采购商城，美业信息平台，美业采购顾问，美业采购咨询，美容产品，美容仪器，医美产品，医美器械，二手仪器，美业正品联盟">
     <meta name="description" content="采美365网是一家专注于医美生美的B2B采购平台，拥有各类医疗器械资质和进出口资质，聚集全球众多知名供应商，上架丰富的医美生美产品和仪器，一站式解决美容机构的采购需求">
-    <meta name="baidu-site-verification" content="KbkRJg9357"/>
-    <link rel="canonical" href="https://www.caimei365.com/"/>
+    <meta name="baidu-site-verification" content="KbkRJg9357" />
+    <link rel="canonical" href="https://www.caimei365.com/" />
     <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/index/index_new.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
@@ -15,78 +15,43 @@
     <link rel="stylesheet" href="https://unpkg.zhimg.com/element-ui@2.15.13/lib/theme-chalk/index.css" />
     <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css" />
     <!--vant css-->
-    <link rel="stylesheet" href="/lib/element-ui/index.css"/>
+    <link rel="stylesheet" href="/lib/element-ui/index.css" />
     <template th:replace="components/analysis"></template>
 </head>
+
 <body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-<!-- 首页 -->
-<div id="container" v-cloak>
-    <!--首页图片轮播-->
-    <div id="swiper-container" class="swiper-container">
-        <ul class="swiper-wrapper swiper-wrapper-banner">
-            <li class="swiper-slide mfc" th:each="img: ${bannerList}">
-                <a href="javascript:void(0)" th:attr="data-href=${img.link}" onclick="handleBannerStatistics($(this))"><img th:src="${img.image}" th:alt="${img.title}"></a>
-            </li>
-        </ul>
-        <div class="swiper-pagination swiper-pagination-banner mfc"><span v-if="isPC" th:each="img: ${bannerList}"></span></div>
-        <a class="swiper-button-prev" href="javascript:void(0)"></a>
-        <a class="swiper-button-next" href="javascript:void(0)"></a>
-    </div>
-    <div class="mNavBox h5Only clear">
-        <!--导航菜单-->
-        <a th:each="menu: ${topMenuList}" class="nav" th:href="${menu.link}">
-            <img class="nav-icon" th:src="${menu.icon}" th:alt="${menu.name}">
-            <p th:text="${menu.name}"></p>
-        </a>
-    </div>
-    <div class="quickOperation" v-if="quickoperaList.length > 0 && !isPC" v-cloak>
-        <van-swipe class="my-swipe" :autoplay="false">
-            <van-swipe-item v-for="(item, index) in quickoperaList" :key="item">
-                <div class="carousel-list">
-                    <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
-                        <div class="list-content">
-                            <div class="list-icon">
-                                <van-image style="width: 100%; height: 100%;" :src="i.icon" />
-                            </div>
-                            <div class="list-title">
-                                <div class="title-1">
-                                    <div class="title-1-item">{{i.name}}</div>
-                                    <div class="title-2-item">GO></div>
-                                </div>
-                                <div class="title-2">{{i.remark || ''}}</div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </van-swipe-item>
-        </van-swipe>
-    </div>
-    <div id="new-container" class="section_container" v-if="newsList.length>0">
-        <div class="inner">
-            <div class="new-label">公告：</div>
-            <div class="new-list">
-                <a href="javascript:void(0)" class="new-li" v-for="(list ,index) in newsList" :key="index" @click="hanldDetails(list.id)">
-                    <span class="new-icon"></span>
-                    <p v-text="list.title"></p>
-                </a>
-            </div>
-            <a href="/news.html" class="new-more"> 更多>> </a>
+    <!-- 引用头部 -->
+    <template th:replace="components/header"></template>
+    <!-- 首页 -->
+    <div id="container" v-cloak>
+        <!--首页图片轮播-->
+        <div id="swiper-container" class="swiper-container">
+            <ul class="swiper-wrapper swiper-wrapper-banner">
+                <li class="swiper-slide mfc" th:each="img: ${bannerList}">
+                    <a href="javascript:void(0)" th:attr="data-href=${img.link}" onclick="handleBannerStatistics($(this))"><img th:src="${img.image}" th:alt="${img.title}"></a>
+                </li>
+            </ul>
+            <div class="swiper-pagination swiper-pagination-banner mfc"><span v-if="isPC" th:each="img: ${bannerList}"></span></div>
+            <a class="swiper-button-prev" href="javascript:void(0)"></a>
+            <a class="swiper-button-next" href="javascript:void(0)"></a>
         </div>
-    </div>
-    <!--  快捷运营  -->
-    <div class="quickOperation" v-if="quickoperaList.length > 0 && isPC" v-cloak>
-        <el-carousel :autoplay="false" indicator-position="outside">
-            <el-carousel-item v-for="(item, index) in quickoperaList" :key="item">
-                <div class="carousel-list">
-                    <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
-                        <div class="card">
-                            <div class="card-content">
-                                <div class="card-icon">
-                                    <el-image style="width: 100%; height: 100%;" :src="i.icon"></el-image>
+        <div class="mNavBox h5Only clear">
+            <!--导航菜单-->
+            <a th:each="menu: ${topMenuList}" class="nav" th:href="${menu.link}">
+                <img class="nav-icon" th:src="${menu.icon}" th:alt="${menu.name}">
+                <p th:text="${menu.name}"></p>
+            </a>
+        </div>
+        <div class="quickOperation" v-if="quickoperaList.length > 0 && !isPC" v-cloak>
+            <van-swipe class="my-swipe" :autoplay="false">
+                <van-swipe-item v-for="(item, index) in quickoperaList" :key="item">
+                    <div class="carousel-list">
+                        <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
+                            <div class="list-content">
+                                <div class="list-icon">
+                                    <van-image style="width: 100%; height: 100%;" :src="i.icon" />
                                 </div>
-                                <div class="card-title">
+                                <div class="list-title">
                                     <div class="title-1">
                                         <div class="title-1-item">{{i.name}}</div>
                                         <div class="title-2-item">GO></div>
@@ -96,98 +61,134 @@
                             </div>
                         </div>
                     </div>
+                </van-swipe-item>
+            </van-swipe>
+        </div>
+        <div id="new-container" class="section_container" v-if="newsList.length>0">
+            <div class="inner">
+                <div class="new-label">公告：</div>
+                <div class="new-list">
+                    <a href="javascript:void(0)" class="new-li" v-for="(list ,index) in newsList" :key="index" @click="hanldDetails(list.id)">
+                        <span class="new-icon"></span>
+                        <p v-text="list.title"></p>
+                    </a>
                 </div>
-            </el-carousel-item>
-        </el-carousel>
-    </div>
-    <!--首页楼层主体数据-->
-    <div class="section_container">
-        <div class="inner">
-            <div id="sidebar" class="section_right">
-                <div class="box" >
-                    <div class="section_right_item ross" v-if="isRossShow" :class="isRossShow ? 'show' : 'none'">
-                        <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
-                        <a href="/supplier-1378.html" v-else><img src="/img/ross/ross-image@3x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
-                    </div>
-                    <div class="section_right_item" th:if="${sideJson.get('liveList')}!=null and ${sideJson.get('liveList').size}>0">
-                        <div class="right_item_title">
-                            <p>精彩直播</p>
-                            <a href="https://wx.vzan.com/plug-ins/?v=637429463853329710#/FixupIndex/399803126?shareuid=0" target="_blank"  rel="nofollow" onclick="_czc.push(['_trackEvent','商城首页','精彩直播','点击','','Um_Event_HomeLiveTemplateClick'])">
-                                <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
-                            </a>
-                        </div>
-                        <div class="right_item_main" th:each="live,stat : ${sideJson.get('liveList')}" th:object="${live}">
-                            <a th:if="${stat.index}==0" th:attr="data-href=*{link}" href="javascript:void(0)" onclick="handleRightStatistics($(this),2)" th:title="*{liveTitle}" class="item_banner">
-                                <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{liveTitle}">
-                                <div class="name" th:text="*{liveTitle}"></div>
-                                <div class="statu">
-                                    <template th:if="*{liveStatus}==1"><i class="mIcon icon-wart"></i><p>未开始</p></template>
-                                    <template th:if="*{liveStatus}==2"><i class="mIcon icon-live"></i><p>直播中</p></template>
-                                    <template th:if="*{liveStatus}==3"><i class="mIcon icon-end"></i><p>看回放</p></template>
+                <a href="/news.html" class="new-more"> 更多>> </a>
+            </div>
+        </div>
+        <!--  快捷运营  -->
+        <div class="quickOperation" v-if="quickoperaList.length > 0 && isPC" v-cloak>
+            <el-carousel :autoplay="false" indicator-position="outside">
+                <el-carousel-item v-for="(item, index) in quickoperaList" :key="item">
+                    <div class="carousel-list">
+                        <div class="list" v-for="(i, o) in item" :key="o" @click="goQuickOpera(i)">
+                            <div class="card">
+                                <div class="card-content">
+                                    <div class="card-icon">
+                                        <el-image style="width: 100%; height: 100%;" :src="i.icon"></el-image>
+                                    </div>
+                                    <div class="card-title">
+                                        <div class="title-1">
+                                            <div class="title-1-item">{{i.name}}</div>
+                                            <div class="title-2-item">GO></div>
+                                        </div>
+                                        <div class="title-2">{{i.remark || ''}}</div>
+                                    </div>
                                 </div>
-                            </a>
-                            <a th:if="${stat.index}>0" th:attr="data-href=*{link}" href="javascript:void(0)" onclick="handleRightStatistics($(this),2)" th:title="*{liveTitle}" class="item_text">
-                                <p class="item_text_name" th:text="*{liveTitle}"></p>
-                            </a>
+                            </div>
                         </div>
                     </div>
-                    <div id="fixed-wrap" class="section_right_item" th:if="${sideJson.get('cmImageList')}!=null and ${sideJson.get('cmImageList').size}>0">
-                        <div class="right_item_title">
-                            <p>最新活动</p>
-                            <a href="https://www.caimei365.com/promotions.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','最新活动','点击','','Um_Event_HomeActivityTemplateClick'])">
-                                <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
-                            </a>
-                        </div>
-                        <div class="right_item_main" th:each="image,stat : ${sideJson.get('cmImageList')}" th:object="${image}">
-                            <a th:if="${stat.index}==0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),3)" href="javascript:void(0)" th:title="*{title}" class="item_banner">
-                                <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{title}">
-                                <div class="name" th:text="*{title}"></div>
-                            </a>
-                            <a th:if="${stat.index}>0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),3)" href="javascript:void(0)"  th:title="*{title}" class="item_text">
-                                <p class="item_text_name" th:text="*{title}"></p>
-                            </a>
+                </el-carousel-item>
+            </el-carousel>
+        </div>
+        <!--首页楼层主体数据-->
+        <div class="section_container">
+            <div class="inner">
+                <div id="sidebar" class="section_right">
+                    <div class="box">
+                        <div class="section_right_item ross" v-if="isRossShow" :class="isRossShow ? 'show' : 'none'">
+                            <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
+                            <a href="/supplier-1378.html" v-else><img src="/img/ross/ross-image@3x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
                         </div>
-                    </div>
-                    <div class="section_right_item" th:if="${sideJson.get('infoList')}!=null and ${sideJson.get('infoList').size}>0">
-                        <div class="right_item_title">
-                            <p>热门文章</p>
-                            <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门文章','点击','','Um_Event_HomeArticleTemplateClick'])">
-                                <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
-                            </a>
+                        <div class="section_right_item" th:if="${sideJson.get('liveList')}!=null and ${sideJson.get('liveList').size}>0">
+                            <div class="right_item_title">
+                                <p>精彩直播</p>
+                                <a href="https://wx.vzan.com/plug-ins/?v=637429463853329710#/FixupIndex/399803126?shareuid=0" target="_blank" rel="nofollow" onclick="_czc.push(['_trackEvent','商城首页','精彩直播','点击','','Um_Event_HomeLiveTemplateClick'])">
+                                    <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
+                                </a>
+                            </div>
+                            <div class="right_item_main" th:each="live,stat : ${sideJson.get('liveList')}" th:object="${live}">
+                                <a th:if="${stat.index}==0" th:attr="data-href=*{link}" href="javascript:void(0)" onclick="handleRightStatistics($(this),2)" th:title="*{liveTitle}" class="item_banner">
+                                    <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{liveTitle}">
+                                    <div class="name" th:text="*{liveTitle}"></div>
+                                    <div class="statu">
+                                        <template th:if="*{liveStatus}==1"><i class="mIcon icon-wart"></i><p>未开始</p></template>
+                                        <template th:if="*{liveStatus}==2"><i class="mIcon icon-live"></i><p>直播中</p></template>
+                                        <template th:if="*{liveStatus}==3"><i class="mIcon icon-end"></i><p>看回放</p></template>
+                                    </div>
+                                </a>
+                                <a th:if="${stat.index}>0" th:attr="data-href=*{link}" href="javascript:void(0)" onclick="handleRightStatistics($(this),2)" th:title="*{liveTitle}" class="item_text">
+                                    <p class="item_text_name" th:text="*{liveTitle}"></p>
+                                </a>
+                            </div>
                         </div>
-                        <div class="right_item_main" th:each="info,stat : ${sideJson.get('infoList')}" th:object="${info}">
-                            <a th:if="${stat.index}==0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),4)" href="javascript:void(0)"  th:title="*{title}" class="item_banner">
-                                <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{title}">
-                                <div class="name" th:text="*{title}"></div>
-                            </a>
-                            <a th:if="${stat.index}>0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),4)" href="javascript:void(0)"  th:title="*{title}" class="item_text">
-                                <p class="item_text_name info" th:text="*{title}"></p>
-                                <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p>
-                            </a>
+                        <div id="fixed-wrap" class="section_right_item" th:if="${sideJson.get('cmImageList')}!=null and ${sideJson.get('cmImageList').size}>0">
+                            <div class="right_item_title">
+                                <p>最新活动</p>
+                                <a href="https://www.caimei365.com/promotions.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','最新活动','点击','','Um_Event_HomeActivityTemplateClick'])">
+                                    <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
+                                </a>
+                            </div>
+                            <div class="right_item_main" th:each="image,stat : ${sideJson.get('cmImageList')}" th:object="${image}">
+                                <a th:if="${stat.index}==0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),3)" href="javascript:void(0)" th:title="*{title}" class="item_banner">
+                                    <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{title}">
+                                    <div class="name" th:text="*{title}"></div>
+                                </a>
+                                <a th:if="${stat.index}>0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),3)" href="javascript:void(0)" th:title="*{title}" class="item_text">
+                                    <p class="item_text_name" th:text="*{title}"></p>
+                                </a>
+                            </div>
                         </div>
-                    </div>
-                    <div class="section_right_item" th:if="${sideJson.get('baikeList')}!=null and ${sideJson.get('baikeList').size}>0">
-                        <div class="right_item_title">
-                            <p>热门百科</p>
-                            <a href="/encyclopedia/product.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门百科','点击','','Um_Event_HomeBaikeTemplateClick'])">
-                                <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
-                            </a>
+                        <div class="section_right_item" th:if="${sideJson.get('infoList')}!=null and ${sideJson.get('infoList').size}>0">
+                            <div class="right_item_title">
+                                <p>热门文章</p>
+                                <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门文章','点击','','Um_Event_HomeArticleTemplateClick'])">
+                                    <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
+                                </a>
+                            </div>
+                            <div class="right_item_main" th:each="info,stat : ${sideJson.get('infoList')}" th:object="${info}">
+                                <a th:if="${stat.index}==0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),4)" href="javascript:void(0)" th:title="*{title}" class="item_banner">
+                                    <img src="/img/base/placeholder.png" th:attr="data-original=*{homePageImage}" th:alt="*{title}">
+                                    <div class="name" th:text="*{title}"></div>
+                                </a>
+                                <a th:if="${stat.index}>0" th:attr="data-href=*{link}" onclick="handleRightStatistics($(this),4)" href="javascript:void(0)" th:title="*{title}" class="item_text">
+                                    <p class="item_text_name info" th:text="*{title}"></p>
+                                    <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p>
+                                </a>
+                            </div>
                         </div>
-                        <div class="right_item_main" th:each="info,stat : ${sideJson.get('baikeList')}" th:object="${info}">
-                            <a th:if="${stat.index}==0"  th:href="*{link}"  th:title="*{name}" class="item_banner">
-                                <img src="/img/base/placeholder.png" th:attr="data-original=*{image}" th:alt="*{name}">
-                                <div class="name" th:text="*{name}"></div>
-                            </a>
-                            <a th:if="${stat.index}>0" th:href="*{link}"  th:title="*{name}" class="item_text">
-                                <p class="item_text_name info" th:text="*{name}"></p>
-                                <!-- <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p> -->
-                            </a>
+                        <div class="section_right_item" th:if="${sideJson.get('baikeList')}!=null and ${sideJson.get('baikeList').size}>0">
+                            <div class="right_item_title">
+                                <p>热门百科</p>
+                                <a href="/encyclopedia/product.html" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门百科','点击','','Um_Event_HomeBaikeTemplateClick'])">
+                                    <template v-if="isPC">更多&gt;</template><template v-else>&gt;</template>
+                                </a>
+                            </div>
+                            <div class="right_item_main" th:each="info,stat : ${sideJson.get('baikeList')}" th:object="${info}">
+                                <a th:if="${stat.index}==0" th:href="*{link}" th:title="*{name}" class="item_banner">
+                                    <img src="/img/base/placeholder.png" th:attr="data-original=*{image}" th:alt="*{name}">
+                                    <div class="name" th:text="*{name}"></div>
+                                </a>
+                                <a th:if="${stat.index}>0" th:href="*{link}" th:title="*{name}" class="item_text">
+                                    <p class="item_text_name info" th:text="*{name}"></p>
+                                    <!-- <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p> -->
+                                </a>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </div>
-            <div class="section_left ">
-                <template v-if="userId > 0">
+                <div class="section_left ">
+                    <template v-if="userId > 0">
                     <!--固定楼层-->
                     <div class="section_page section_page_user hot" v-for="(floor,index) in hotListPageFloor">
                         <div class="section_page_title" >
@@ -226,30 +227,30 @@
                                                                         <span v-html="pros.product && pros.product.svipPriceTag"></span>
                                                                     </div>
                                                                 </template>
-                                                            </template>
-                                                        </div>
-                                                    </template>
-                                                    <template v-else>
+                    </template>
+                </div>
+                </template>
+                <template v-else>
                                                         <p class="listTag" v-if="pros.product.actStatus == 1 && pros.product.promotions">
                                                             <span v-text="pros.product.promotions && pros.product.promotions.name"></span>
                                                         </p>
                                                     </template>
-                                                </div>
-                                                <div class="main_price_login">
-                                                    <!--priceFlag 0公开价格 1不公开价格 2仅对会员机构公开-->
-                                                    <template v-if="pros.product && pros.product.priceFlag == 1">
+            </div>
+            <div class="main_price_login">
+                <!--priceFlag 0公开价格 1不公开价格 2仅对会员机构公开-->
+                <template v-if="pros.product && pros.product.priceFlag == 1">
                                                         <em class="price_grade_club"><span>￥</span>价格未公开</em>
                                                     </template>
-                                                    <!--机构价仅会员可见 && 用户是普通机构-->
-                                                    <template v-else-if="pros.product && pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
+                <!--机构价仅会员可见 && 用户是普通机构-->
+                <template v-else-if="pros.product && pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
                                                         <em class="price_grade_club"><span>￥</span>会员可见</em>
                                                     </template>
-                                                    <!--机构价仅医美机构可见-->
-                                                    <template v-else-if="pros.product && pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                <!--机构价仅医美机构可见-->
+                <template v-else-if="pros.product && pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
                                                         <em class="price_grade_club red"><span>￥</span>仅医美机构可见</em>
                                                     </template>
-                                                    <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
-                                                    <template v-else-if="GLOBAL_USER_IDENTITY === 2 ||
+                <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
+                <template v-else-if="GLOBAL_USER_IDENTITY === 2 ||
                                                         (pros.product.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) ||
                                                         (GLOBAL_USER_IDENTITY === 3 && pros.product.shopId==GLOBAL_SHOP_ID) ||
                                                         GLOBAL_VIP_FLAG === 1">
@@ -259,17 +260,17 @@
                                                             <span class="price_num" v-else v-text="filtersFormat(pros.product.price)"></span>
                                                         </div>
                                                     </template>
-                                                    <template v-else>
+                <template v-else>
                                                         <!--供应商除自己的商品外，也显示价格等级-->
                                                         <em class="price_grade_shop">
                                                             <span class="bold">￥</span>
                                                             <i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
                                                         </em>
                                                     </template>
-                                                </div>
-                                            </template>
-                                            <!-- 二手商品 -->
-                                            <template v-else>
+            </div>
+            </template>
+            <!-- 二手商品 -->
+            <template v-else>
                                                 <div class="main_price_login">
                                                     <div class="price_text_tag"></div>
                                                     <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">￥价格祥聊</div>
@@ -278,16 +279,16 @@
                                                     </div>
                                                 </div>
                                             </template>
-                                        </div>
-                                    </div>
-                                </a>
-                            </div>
-                            <div class="swiper-pagination swiper-pagination-floor hot mfc "  :data-id="floor.floorImageList4.length"></div>
-                        </div>
-                    </div>
-                    <!--楼层-->
-                    <div class="section_page section_page_user" v-for="(floor,index) in homePageFloor">
-                        <template v-if="floor.floorContent">
+        </div>
+    </div>
+    </a>
+    </div>
+    <div class="swiper-pagination swiper-pagination-floor hot mfc " :data-id="floor.floorImageList4.length"></div>
+    </div>
+    </div>
+    <!--楼层-->
+    <div class="section_page section_page_user" v-for="(floor,index) in homePageFloor">
+        <template v-if="floor.floorContent">
                             <div class="section_page_title" >
                                 <h1 :data-id="index+1" v-text="floor.title"></h1>
                                 <p v-text="floor.detail"></p>
@@ -314,10 +315,9 @@
                                             <img v-else :src="floor.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                                         </a>
                                     </template>
-                                    <template v-if="floor.floorContent.templateType == 2 ||
+        <template v-if="floor.floorContent.templateType == 2 ||
                                                     floor.floorContent.templateType == 3 ||
-                                                    floor.floorContent.templateType == 4"
-                                    >
+                                                    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"
@@ -326,7 +326,7 @@
                                             <img v-else :src="floor.floorContent.appletsAdsImage2" alt="" class="page_main_item_adv">
                                         </a>
                                     </template>
-                                    <template v-if="floor.floorContent.templateType == 4">
+        <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"
@@ -335,20 +335,22 @@
                                             <img v-else :src="floor.floorContent.appletsAdsImage3" alt="" class="page_main_item_adv">
                                         </a>
                                     </template>
-                                    <!-- 商品/图片 列表 -->
-                                    <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_type" v-if="pros.product && pros.product.productType && pros.product.productType === 2">医疗器械</div>
-                                        <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="pros.listType == 1">
-                                            <!-- 商品价格 -->
-                                            <div class="main_price_text">
-                                                <!-- 正常商品 -->
-                                                <template v-if="pros.product.productCategory == 1">
+        <!-- 商品/图片 列表 -->
+        <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_type" v-if="pros.product && pros.product.productType && pros.product.productType === 2">医疗器械</div>
+            <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="pros.listType == 1">
+                <!-- 商品价格 -->
+                <div class="main_price_text">
+                    <!-- 正常商品 -->
+                    <template v-if="pros.product.productCategory == 1">
                                                     <div class="price_text_tag">
                                                         <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
                                                         <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
@@ -365,30 +367,30 @@
                                                                             <span v-html="pros.product.svipPriceTag"></span>
                                                                         </div>
                                                                     </template>
-                                                                </template>
-                                                            </div>
-                                                        </template>
-                                                        <template v-else>
+                    </template>
+                </div>
+                </template>
+                <template v-else>
                                                             <p class="listTag" v-if="pros.product.actStatus ==1 && pros.product.promotions">
                                                                 <span v-text="pros.product.promotions.name"></span>
                                                             </p>
                                                         </template>
-                                                    </div>
-                                                    <div class="main_price_login">
-                                                        <!--priceFlag 0公开价格 1不公开价格 2仅对会员机构公开-->
-                                                        <template v-if="pros.product.priceFlag == 1">
+            </div>
+            <div class="main_price_login">
+                <!--priceFlag 0公开价格 1不公开价格 2仅对会员机构公开-->
+                <template v-if="pros.product.priceFlag == 1">
                                                             <em class="price_grade_club"><span>￥</span>价格未公开</em>
                                                         </template>
-                                                        <!--机构价仅会员可见 && 用户是普通机构-->
-                                                        <template v-else-if="pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
+                <!--机构价仅会员可见 && 用户是普通机构-->
+                <template v-else-if="pros.product.priceFlag==2 && GLOBAL_USER_IDENTITY === 4 && GLOBAL_VIP_FLAG!=1">
                                                             <em class="price_grade_club"><span>￥</span>会员可见</em>
                                                         </template>
-                                                        <!--机构价仅医美机构可见-->
-                                                        <template v-else-if="pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                <!--机构价仅医美机构可见-->
+                <template v-else-if="pros.product.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
                                                             <em class="price_grade_club red"><span>￥</span>仅医美机构可见</em>
                                                         </template>
-                                                        <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
-                                                        <template v-else-if="GLOBAL_USER_IDENTITY === 2 ||
+                <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
+                <template v-else-if="GLOBAL_USER_IDENTITY === 2 ||
                                                         (pros.product.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) ||
                                                         (GLOBAL_USER_IDENTITY === 3 && pros.product.shopId==GLOBAL_SHOP_ID) ||
                                                         GLOBAL_VIP_FLAG === 1">
@@ -398,16 +400,16 @@
                                                                 <span class="price_num" v-else v-text="filtersFormat(pros.product.price)"></span>
                                                             </div>
                                                         </template>
-                                                        <template v-else>
+                <template v-else>
                                                             <!--供应商除自己的商品外，也显示价格等级-->
                                                             <em class="price_grade_shop">
                                                                 <span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
                                                             </em>
                                                         </template>
-                                                    </div>
-                                                </template>
-                                                <!-- 二手商品 -->
-                                                <template v-else>
+            </div>
+            </template>
+            <!-- 二手商品 -->
+            <template v-else>
                                                     <div class="main_price_login">
                                                         <div class="price_text_tag"></div>
                                                         <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">￥价格祥聊</div>
@@ -416,36 +418,27 @@
                                                         </div>
                                                     </div>
                                                 </template>
-                                            </div>
-                                        </div>
-                                    </a>
-                                    <!-- 广告图 -->
-                                    <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>
-                                    </div>
-                                </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"
-                                 :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>
+    </div>
+    </a>
+    <!-- 广告图 -->
+    <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>
+    </div>
+    </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" :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 section_page_user hot" th:each="floor,stat : ${floorJson.get('pageFloorList')}">
                         <div class="section_page_title">
@@ -486,150 +479,152 @@
                                                             </th:block>
                                                             <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"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
-                                                        </div>
-                                                    </th:block>
-                                                    <!-- 二手商品 -->
-                                                    <th:block th:if="*{productCategory}!=1">
-                                                        <div class="main_price_none sec">
-                                                            <em class="price_grade"><span>￥</span>登录可见</em>
-                                                        </div>
-                                                    </th:block>
-                                                </div>
-                                            </th:block>
-                                        </div>
-                                    </a>
+    <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"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
+    </div>
+    </th:block>
+    <!-- 二手商品 -->
+    <th:block th:if="*{productCategory}!=1">
+        <div class="main_price_none sec">
+            <em class="price_grade"><span>￥</span>登录可见</em>
+        </div>
+    </th:block>
+    </div>
+    </th:block>
+    </div>
+    </a>
+    </th:block>
+    </div>
+    <div class="swiper-pagination swiper-pagination-floor hot mfc" th:attr="data-id=${floor.get('floorImageList4').size}"></div>
+    </div>
+    </div>
+    <!--静态化普通楼层-->
+    <div class="section_page" th:each="floor,stat : ${floorJson.get('homePageFloor')}">
+        <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? 'swiper-container-floor mySwiperSlide' : ''" 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}">
+                                <th:block th:if="${pros.get('product')}!=null" th:object="${pros.get('product')}">
+                                    <div class="page_main_type" th:if="*{productType}==2">医疗器械</div>
                                 </th:block>
-                            </div>
-                            <div class="swiper-pagination swiper-pagination-floor hot mfc" th:attr="data-id=${floor.get('floorImageList4').size}"></div>
-                        </div>
-                    </div>
-                    <!--静态化普通楼层-->
-                    <div class="section_page" th:each="floor,stat : ${floorJson.get('homePageFloor')}">
-                        <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? 'swiper-container-floor mySwiperSlide' : ''" 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}">
-                                                <th:block th:if="${pros.get('product')}!=null" th:object="${pros.get('product')}">
-                                                    <div class="page_main_type" th:if="*{productType}==2">医疗器械</div>
-                                                </th:block>
-                                                <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 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">
+                                                    <p class="couponTag" th:if="*{couponsLogo}">优惠券</p>
+                                                    <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                                    <div class="svip-tag" th:if="*{svipProductFlag}==1">
+                                                        <div class="svip-icon">SVIP</div>
+                                                    </div>
+                                                    <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="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">
-                                                                    <p class="couponTag" th:if="*{couponsLogo}">优惠券</p>
-                                                                    <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                                                    <div class="svip-tag" th:if="*{svipProductFlag}==1">
-                                                                        <div class="svip-icon">SVIP</div>
-                                                                    </div>
-                                                                    <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"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>
-                                                                </div>
-                                                            </th:block>
-                                                            <!-- 二手商品 -->
-                                                            <th:block th:if="*{productCategory}!=1">
-                                                                <div class="main_price_none sec">
-                                                                    <em class="price_grade"><span>￥</span>登录可见</em>
-                                                                </div>
-                                                            </th:block>
-                                                        </div>
-                                                    </th:block>
+                                                <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>
-                                            </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>
+                                            </th:block>
+                                            <!-- 二手商品 -->
+                                            <th:block th:if="*{productCategory}!=1">
+                                                <div class="main_price_none sec">
+                                                    <em class="price_grade"><span>￥</span>登录可见</em>
+                                                </div>
+                                            </th:block>
+                                        </div>
+                                    </th:block>
                                 </div>
-                            </th:block>
+                            </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>
-                </template>
-                <div class="section_page">
-                    <div class="section_page_title">
-                        <h1 data-id="99">优质供应商</h1>
-                        <p>采美正品联盟 质量保证</p>
-                    </div>
-                    <div class="section_page_bottom" th:object="${floorJson.get('supplierImage')}">
-                        <a th:href="*{#strings.isEmpty(wwwLink)}? 'javascript:;' : *{wwwLink}" th:attr="target=(*{#strings.isEmpty(wwwLink)} ? '_self' : '_blank')" class="page_main_li ad_01">
-                            <img th:src="*{wwwImage}" alt="" class="page_main_item_adv">
-                        </a>
-                        <template th:each="shop : ${floorJson.get('supplierImage').get('qualitySupplierList')}"  th:object="${shop}">
+                    <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>
+    </template>
+    <div class="section_page">
+        <div class="section_page_title">
+            <h1 data-id="99">优质供应商</h1>
+            <p>采美正品联盟 质量保证</p>
+        </div>
+        <div class="section_page_bottom" th:object="${floorJson.get('supplierImage')}">
+            <a th:href="*{#strings.isEmpty(wwwLink)}? 'javascript:;' : *{wwwLink}" th:attr="target=(*{#strings.isEmpty(wwwLink)} ? '_self' : '_blank')" class="page_main_li ad_01">
+                <img th:src="*{wwwImage}" alt="" class="page_main_item_adv">
+            </a>
+            <template th:each="shop : ${floorJson.get('supplierImage').get('qualitySupplierList')}" th:object="${shop}">
                             <a th:href="*{link}" target="_blank" class="page_main_li ad_02">
                                 <img class="page_main_logo" src="/img/base/placeholder.png" th:attr="data-original=*{image}" th:alt="*{supplierName}">
                                 <div class="page_main_name" th:text="*{supplierName}"></div>
                             </a>
                         </template>
-                    </div>
-                </div>
-            </div>
         </div>
     </div>
+    </div>
+    </div>
+    </div>
     <!--右侧边栏导航-->
     <div id="sideNav" v-if="isPC">
         <div class="item">
-            <a class="item-sideNav" href="javascript:void(0);" v-for="nav in asideNav" :data-id="nav.id" v-text="nav.value" ></a>
+            <a class="item-sideNav" href="javascript:void(0);" v-for="nav in asideNav" :data-id="nav.id" v-text="nav.value"></a>
             <a class="item-sideNav" href="javascript:void(0);"></a>
         </div>
     </div>
@@ -643,16 +638,16 @@
             </div>
         </div>
     </div>
-</div>
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<!--vant js-->
-<script type="text/javascript" src="/lib/element-ui/vant.min.js"></script>
-<script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmsMixins.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/index.js(v=${version})}"></script>
+    </div>
+    <!-- 引入底部 -->
+    <template th:replace="components/footer"></template>
+    <template th:replace="components/foot-link"></template>
+    <script type="text/javascript" src="/lib/element-ui/vant.min.js"></script>
+    <script type="text/javascript" src="/lib/element-ui/element-ui.min.js"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmsMixins.js(v=${version})}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/mixins/cmSysMixins.js(v=${version})}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/index.js(v=${version})}"></script>
 </body>
-</html>
+
+</html>

src/main/resources/templates/user-center/message/list.html

@@ -48,7 +48,10 @@
                             <div class="new-list" v-for="(item, index) in messagesList" :key="index" :class="item.saved==1?'notclick':''">
                                 <div class="text">
                                     <input type="checkbox"  class="check" v-model="item.check" @change="checkedItemFn(item)" />
-                                    <p v-html="hanldeNoticeText(item)"></p>
+                                    <div class="msg-content" style="display: flex;flex-direction: column;">
+                                        <p v-html="hanldeNoticeText(item)"></p>
+                                        <p v-if="item.shopTieredType > 4">客户经理：{{item.userName}}<span style="margin-left: 100px;">手机号：{{item.mobile}}</span></p>
+                                    </div>
                                 </div>
                                 <div class="time">{{item.time}}</div>
                             </div>