Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/css/index/index_new.h5.css

@@ -0,0 +1,287 @@
+ /* 首页导航 */
+.mNavBox{width:100%;margin:0 auto 4vw auto;padding:2.2vw 0;position:relative;background:#FFF}
+.mNavBox ul{width:100vw;margin:0 auto}
+.mNavBox .first{width:25vw;margin:0;transition:height .5s ease}
+.mNavBox .first .nav{display:block;padding:2.2vw 0;text-align:center;color:#4A4F58;font-size:3.4vw;line-height:6.4vw;white-space:nowrap}
+.mNavBox .first .nav span{display:inline-block;border-bottom:1px solid transparent}
+.mNavBox .first .nav:before{display:block;width:10.8vw;height:10.8vw;margin:0 auto}
+.mNavBox .first:nth-of-type(1) .nav:before{background-position:-43vw -27vw}
+.mNavBox .first:nth-of-type(2) .nav:before{background-position:-54vw -27vw}
+.mNavBox .first:nth-of-type(3) .nav:before{background-position:-64vw -27vw}
+.mNavBox .first:nth-of-type(4) .nav:before{background-position:-75vw -27vw}
+.mNavBox .first:nth-of-type(5) .nav:before{background-position:-85vw -27vw}
+.mNavBox .first:nth-of-type(6) .nav:before{background-position:-12vw -27vw}
+.mNavBox .first:nth-of-type(7) .nav:before{background-position:-22vw -27vw}
+.mNavBox .first:nth-of-type(8) .nav:before{background-position:-32.5vw -27vw}
+.mNavBox .first.on .nav{color:#E15621}
+.mNavBox .first.on .nav span{border-color:#E15621}
+.mNavBox .first.on .nav:before{border-radius:5.4vw;background-color:#FFE6DC}
+.mNavBox .navItem{display:none;width:100vw;position:absolute;left:0;background:#F5F5F5}
+.mNavBox .navItem .second{display:block;text-align:center;width:25vw;padding:3.2vw 0;color:#999FAB;font-size:3.2vw;line-height:6.4vw;white-space:nowrap}
+.mNavBox .navItem .second img{display:block;margin:0 auto;width:6.4vw;height:6.4vw}
+ .section_page{
+        width: 100%;
+        height: auto;
+    }
+    .section_page .section_page_title{
+        padding: 4.8vw 0 2.4vw 3.2vw;
+        position: relative
+    }
+    .section_page .section_page_title h1{
+        font-weight: bold;
+        color: #4a4f58;
+        font-size: 4.8vw;
+        line-height: 9.7vw;
+    }
+    .section_page .section_page_title p{
+        font-weight: normal;
+        color: #93979f;
+        font-size: 3.4vw;
+        line-height: 4.3vw;
+    }
+    .section_page .page_main_item{
+        width: 45.6vw;
+        height: 68vw;
+        overflow: hidden;
+        margin: 0 1.3vw 2.6vw 1.3vw;
+        background: #fff;
+        text-align: left;
+    }
+    .section_page .page_main_image{
+        width: 45.6vw;
+        height: 45.6vw;
+    }
+    .section_page .page_main_text{
+        padding: 0 3.2vw;
+        height: 9.3vw;
+        line-height: 4.8vw;
+        font-size: 3.4vw;
+        vertical-align: middle;
+        word-break: break-all;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-inline-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+    }
+    .section_page .page_main_item.ad_02 img,.section_page .page_main_item.ad_03 img,.section_page .page_main_item.ad_01 img{
+        height: 100%;
+    }
+    .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;
+        margin-top:.74vw;
+    }
+    .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 .page_main_item.ad_01,.section_page .page_main_li.ad_01{
+        width: 93.6vw;
+        height: 24vw;
+    }
+    .section_page .section_page_main{
+        margin: auto;
+        width: 97vw;
+        height: 140vw;
+        overflow: hidden;
+    }
+    .section_page .section_page_main.type_03 {
+        height: 167vw;
+    }
+    .section_page .section_page_more .more{
+        width: 20vw;
+        height: 6.4vw;
+        margin: 5vw auto;
+        border: .27vw solid #cccccc;
+        color: #909090;
+        font-size: 3vw;
+        line-height: 6.4vw;
+        border-radius: .54vw;
+        position: relative;
+        text-indent: 2vw;
+    }
+    .section_page .section_page_more .more .icon:before {
+        background-position: -51.5vw 0px;
+        width:5.4vw;
+        height: 6.7vw;
+        right: 0;
+        position: absolute;
+    }
+    .section_page .page_main_li{
+        width: 21.6vw;
+        height: 26.6vw;
+        float: left;
+        margin-right: 2.4vw;
+        margin-bottom: 2.4vw;
+        background-color: #FFFFFF;
+        display: block;
+    }
+    .section_page .page_main_li .page_main_logo{
+        width: 100%;
+        height: 21.6vw;
+        display: block;
+        float: left;
+    }
+    .section_page .page_main_li .page_main_name{
+        width: 100%;
+        height: 5vw;
+        float: left;
+        line-height: 5vw;
+        text-align: center;
+        font-size: 2.6vw;
+        color: #4a4f58;
+        background-color: #f9f9f9;
+    }
+     .section_page_bottom{
+        width:97vw;
+        padding: 3.2vw;
+        overflow: hidden;
+    }
+    .page_main_li.ad_01 img{
+        width: 100%;
+        height: 100%;
+    }
+    .section_right{
+        padding: 3.2vw;
+    }
+    .box {
+        white-space: nowrap;
+        overflow-x: auto;
+    }
+    .section_right .section_right_item{
+        display: inline-block;
+        width: 42.2vw;
+        height: 61.6vw;
+        background: #fff;
+        margin-right: 2.4vw;
+    }
+    .section_right .right_item_title{
+        overflow: hidden;
+        padding: 2.4vw;
+    }
+    .section_right .right_item_title p{
+        float: left;
+        font-size: 3.4vw;
+        font-weight: bold;
+        color: #4a4f58;
+        text-align: left
+    }
+    .section_right .right_item_title a{
+        display: inline-block;
+        float: right;
+        font-size: 12px;
+        color: #909090;
+        text-align: right;
+    }
+    .section_right .right_item_main{
+        height: auto;
+        padding: .54vw 2.4vw;
+    }
+    .section_right .item_banner{
+        width: 37.4vw;
+        height: 37.4vw;
+        display: block;
+        position: relative;
+        margin-bottom: 10px;
+    }
+   .section_right .item_banner img{
+       width: 100%;
+       height: 100%;
+   }
+   .section_right .item_banner .name{
+        width: 100%;
+        height: 6.4vw;
+        position: absolute;
+        bottom: 0;
+        background: rgba(0,0,0,0.4);
+        line-height: 6.4vw;
+        font-size: 3.2vw;
+        color: #ffffff;
+        text-align: left;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        padding: 0 2.7vw;
+        box-sizing: border-box;
+   }
+   .section_right .item_banner .statu{
+        height: 5.8vw;
+        border-radius: 2.4vw;
+        background: rgba(0,0,0,0.4);
+        position: absolute;
+        left:2vw;
+        top: 2vw;
+   }
+   .section_right .item_banner .statu p{
+        float: left;
+        width: 50px;
+        text-align: center;
+        font-size:2.6vw;
+        line-height: 5.8vw;
+        color: #FFF;
+   }
+   .section_right .item_banner .statu .icon-live{
+        background: url(/img/live/icon-liveing.gif);
+        background-size: cover;
+   }
+   .section_right .item_banner .statu i {
+        display: block;
+        width: 14px;
+        height: 14px;
+        float: left;
+        margin:4px 2px 0 2px;
+    }
+    .section_right .item_text .item_text_name{
+        text-align: left;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        box-sizing: border-box;
+        position: relative;
+        color: #4a4f58;
+        font-size: 3.2vw;
+        padding-left: 2.7vw;
+    }
+    .section_right  .item_text .item_text_name:before{
+        content: '';
+        width: 1.1vw;
+        height: 1.1vw;
+        border-radius: 50%;
+        background-color: #cccccc;
+        position: absolute;
+        left: 0;
+        top: 1.7vw
+    }
+    .section_page .section_page_main.max{
+        height:auto;
+    }
+    .section_page .page_main_item.ad_01.bottom {
+        margin: 2.4vw auto;
+        display: block;
+    }
+
+
+
+
+

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

@@ -64,7 +64,7 @@
 .instrue-right{position: absolute;top: 27vw;width: 100%;background: #fff;padding: 3.2vw 0;}
 .instrue-right .wrap_tittle{padding: 0 3.2vw;}
 .instrue-right .hot-search{padding: 2.7vw;overflow: hidden;height: 3vw}
-.instrue-right .hot-search ul .hot-list{display: inline-block;background: #f7f7f7;color: #4a4f58;font-size: 3.2vw;padding: .7vw 2vw;margin: 0 2vw 2vw 0;position: relative;}
+.instrue-right .hot-search ul .hot-list{display: inline-block;background: #f7f7f7;color: #4a4f58;font-size: 3.2vw;padding: .7vw 2vw;margin: 0 2.4vw 2vw 0;position: relative;}
 .instrue-left{margin-top: 23vw;}
 .top-category{background: #fff}
 .top-category .nav-list{display: inline-block;width: 25%;height: 24vw;line-height: 32.8vw;text-align: center;}

src/main/resources/static/css/product/produce.css

@@ -447,7 +447,7 @@
         position: relative;
     }
     .search_hotlist_content {
-        width: 90%;
+        width: 87%;
         float: left;
     }
     .search_hotlist_item .icon:before {
@@ -460,13 +460,162 @@
     }
     .search_hotlist_main .open{
         float: right;
-        width: 10%;
-        text-align: center;
+        width: 13%;
+        text-align: left;
     }
     .search_hotlist_main .open .mIcon:before {
-    width: 5.4vw;
-    height: 5.4vw;
-    background-position: -51vw 0px;
+        width: 5.4vw;
+        height: 5.4vw;
+        background-position: -51vw 0px;
 }
+    .section_container_left{
+        margin-top: 31vw;
+    }
+    .section_container_nav{
+        background: #fff;
+    }
+    .container_nav_item{
+        display: inline-block;
+        width: 25%;
+        height: 21vw;
+        text-align: center
+    }
+    .container_nav_item .item_icon{
+        width: 100%;
+        position: relative;
+        top: 4vw;
+        height: 8.8vw;
+    }
+    .container_nav_item .item_icon img{
+        width: 8.8vw;
+        height: 8.8vw;
+        display: block;
+        margin: 0 auto;
+    }
+    .container_nav_item .item_text{
+        width: 100%;
+        height: 4.5vw;
+        margin-top: 1.3vw;
+        text-align: center;
+        font-size: 3.4vw;
+        line-height: 12.5vw;
+        color: #4a4f58;
+    }
+    .section_page{
+        width: 100%;
+        height: auto;
+    }
+    .section_page .section_page_title{
+        padding: 4.8vw 0 2.4vw 3.2vw;
+        position: relative
+    }
+    .section_page .section_page_title h1{
+        font-weight: bold;
+        color: #4a4f58;
+        font-size: 4.8vw;
+        line-height: 9.7vw;
+    }
+    .section_page .section_page_title p{
+        font-weight: normal;
+        color: #93979f;
+        font-size: 3.4vw;
+        line-height: 4.3vw;
+    }
+    .section_page .page_main_item{
+        width: 45.6vw;
+        height: 68vw;
+        overflow: hidden;
+        margin: 0 1.3vw 2.6vw 1.3vw;
+        background: #fff;
+        text-align: left;
+    }
+    .section_page .page_main_image{
+        width: 45.6vw;
+        height: 45.6vw;
+    }
+    .section_page .page_main_text{
+        padding: 0 3.2vw;
+        height: 9.3vw;
+        line-height: 4.8vw;
+        font-size: 3.4vw;
+        vertical-align: middle;
+        word-break: break-all;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-inline-box;
+        -webkit-line-clamp: 2;
+        -webkit-box-orient: vertical;
+    }
+    .section_page .page_main_item.ad_02 img,.section_page .page_main_item.ad_03 img,.section_page .page_main_item.ad_01 img{
+        height: 100%;
+    }
+    .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;
+        margin-top:.74vw;
+    }
+    .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 .page_main_item.ad_01{
+        width: 93.6vw;
+        height: 24vw;
+    }
+    .section_page .page_main_item.ad_01.bottom{
+        margin: 2.4vw auto;
+        display: block;
+    }
+    .section_page .section_page_main{
+        margin: auto;
+        width: 97vw;
+        height: 140vw;
+        overflow: hidden;
+    }
+     .section_page .section_page_main.type_03{
+        height: 167vw;
+     }
+    .section_page .section_page_more .more{
+        width: 20vw;
+        height: 6.4vw;
+        margin: 5vw auto;
+        border: .27vw solid #cccccc;
+        color: #909090;
+        font-size: 3vw;
+        line-height: 6.4vw;
+        border-radius: .54vw;
+        position: relative;
+        text-indent: 2vw;
+    }
+    .section_page .section_page_more .more .icon:before {
+        background-position: -51.5vw 0px;
+        width:5.4vw;
+        height: 6.7vw;
+        right: 0;
+        position: absolute;
+    }
+    .section_page .section_page_main.max{
+        height:auto;
+    }
 
 }

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

@@ -1514,6 +1514,7 @@ var homeData = new Vue({
         $('#advertising').on('click','.close',function () {
             $(this).parents('.item').hide();
         })
+             
     }
 });
 

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

@@ -257,7 +257,10 @@ var productDetail = new Vue({
         // visibility：3:所有人可见，2:普通机构可见，1:会员机构可见
         var visible = $("#productVisibility").val()*1;
         var identity = GLOBAL_USER_IDENTITY;
-        this.showProduct = (identity === 1 || identity === 2) || (identity === 4 && (visible === 2 || visible === 3)) || (visible === 3);
+        this.showProduct = visible === 3 || identity === 1 || identity === 2 || (identity === 4 && visible === 2);
+        if(!this.showProduct) {
+            window.location.href = "/404.html?error=未查询到该商品";
+        }
     },
     mounted: function () {
         this.userId = GLOBAL_USER_ID;

src/main/resources/templates/index.html

@@ -5,7 +5,7 @@
     <title>采美365网--医疗美容生活美容正品采购平台</title>
     <meta name="baidu-site-verification" content="KbkRJg9357"/>
     <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/index/index.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/index/index_new.h5.css(v=${version})}" media="screen and (max-width:768px)" rel="stylesheet" type="text/css">
     <link th:href="@{/css/index/index_new.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
 </head>
 <body>
@@ -23,18 +23,94 @@
         <div class="swiper-pagination mfc"><span v-if="isPC" v-for="i in images.length"></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">
+        <ul class="mfw">
+            <!--导航菜单-->
+            <li class="first" th:each="menu: ${topMenuList}">
+                <a th:if="${menu.link}" class="nav mIcon" th:href="${menu.link}"><span th:text="${menu.name}"></span></a>
+                <a th:unless="${menu.link}" class="nav mIcon" href="javascript:void(0);" @click="showSubNav($event)">
+                    <span th:text="${menu.name}"></span>
+                </a>
+                <div class="navItem" th:if="${not #lists.isEmpty(menu.subMenus)}">
+                    <div class="mfw">
+                        <a class="second" th:each="sub: ${menu.subMenus}" th:href="${sub.link}">
+                            <img th:src="${sub.image}">
+                            <span th:text="${sub.name}"></span>
+                        </a>
+                    </div>
+                </div>
+            </li>
+            <li class="first"><a class="nav mIcon" href="/repair.html"><span>维修</span></a></li>
+        </ul>
     </div>
     <!--首页楼层主体数据-->
     <div class="section_container">
         <div class="inner">
-            <div class="section_left clear">
+             <div class="section_right swiper-container">
+                <div class="box swiper-wrapper" >
+                    <div class="section_right_item">
+                        <div class="right_item_title">
+                            <p>精彩直播</p>
+                            <a href="" target="_blank">更多></a>
+                        </div>
+                        <div class="right_item_main" v-for="(live,index) in liveList">
+                            <a href="" class="item_banner" v-if="index === 0" target="_blank">
+                                <img :src="live.banner" alt="">
+                                <div class="name">{{ live.title }}</div>
+                                <div class="statu">
+                                    <i :class="live.status | statusTypeClass"></i>
+                                    <p>{{ live.status | statusType }}</p>
+                                </div>
+                            </a>
+                            <a href="" class="item_text" v-if="index > 0" target="_blank">
+                                <p class="item_text_name">{{ live.title }}</p>
+                                <p class="item_text_time" v-if="isPC">{{ live.time }}</p>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="section_right_item">
+                        <div class="right_item_title">
+                            <p>热门文章</p>
+                            <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank">更多></a>
+                        </div>
+                        <div class="right_item_main" v-for="(live,index) in liveList">
+                            <a href="" class="item_banner" v-if="index === 0" target="_blank">
+                                <img :src="live.banner" alt="">
+                                <div class="name">{{ live.title }}</div>
+                            </a>
+                            <a href="" class="item_text" v-if="index > 0" target="_blank">
+                                <p class="item_text_name">{{ live.title }}</p>
+                                <p class="item_text_time" v-if="isPC">{{ live.time }}</p>
+                            </a>
+                        </div>
+                    </div>
+                    <div class="section_right_item">
+                        <div class="right_item_title">
+                            <p>最新活动</p>
+                            <a href="/promotions.html" target="_blank">更多></a>
+                        </div>
+                        <div class="right_item_main" v-for="(live,index) in liveList">
+                            <a href="" class="item_banner" v-if="index === 0" target="_blank">
+                                <img :src="live.banner" alt="">
+                                <div class="name">{{ live.title }}</div>
+                            </a>
+                            <a href="" class="item_text" v-if="index > 0" target="_blank">
+                                <p class="item_text_name">{{ live.title }}</p>
+                                <p class="item_text_time" v-if="isPC">{{ live.time }}</p>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="section_left ">
                 <div class="section_page" v-for="(page,index) in pageList">
                     <div class="section_page_title">
                         <h1 :data-id="index+1">{{ page.title }}</h1>
                         <p>{{ page.content }}</p>
                     </div>
                     <template v-if="page.type == 1">
-                        <div class="section_page_main" :class="page.isPageMore ? 'max' : ''">
+                        <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_02"><img :src="page.advertisement" alt=""></a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
@@ -98,7 +174,7 @@
                          </div>
                     </template>
                     <template v-if="page.type == 2">
-                        <div class="section_page_main" :class="page.isPageMore ? 'max' : ''">
+                        <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
                             <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
@@ -163,7 +239,7 @@
                         </div>
                     </template>
                     <template v-if="page.type == 3">
-                        <div class="section_page_main type_03" :class="page.isPageMore ? 'max' : ''">
+                        <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                             <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
@@ -228,7 +304,7 @@
                         </div>
                     </template>
                     <template v-if="page.type == 4">
-                        <div class="section_page_main type_03" :class="page.isPageMore ? 'max' : ''">
+                        <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                             <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
                             <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
@@ -294,7 +370,7 @@
                         </div>
                     </template>
                     <template v-if="page.type == 5">
-                        <div class="section_page_main type_03" :class="page.isPageMore ? 'max' : ''">
+                        <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
@@ -358,7 +434,7 @@
                         </div>
                     </template>
                     <template v-if="page.type == 6">
-                        <div class="section_page_main type_03" :class="page.isPageMore ? 'max' : ''">
+                        <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -415,11 +491,11 @@
                                     </template>
                                 </div>
                             </a>
-                            <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                         </div>
+                        <a href="" class="page_main_item ad_01 bottom"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                     </template>
                     <template v-if="page.type == 7">
-                        <div class="section_page_main" :class="page.isPageMore ? 'max' : ''">
+                        <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -493,64 +569,10 @@
                     </div>
                 </div>
             </div>
-            <div class="section_right">
-                <div class="section_right_item">
-                    <div class="right_item_title">
-                        <p>精彩直播</p>
-                        <a href="" target="_blank">更多></a>
-                    </div>
-                    <div class="right_item_main" v-for="(live,index) in liveList">
-                        <a href="" class="item_banner" v-if="index === 0" target="_blank">
-                            <img :src="live.banner" alt="">
-                            <div class="name">{{ live.title }}</div>
-                            <div class="statu">
-                                <i :class="live.status | statusTypeClass"></i>
-                                <p>{{ live.status | statusType }}</p>
-                            </div>
-                        </a>
-                        <a href="" class="item_text" v-if="index > 0" target="_blank">
-                            <p class="item_text_name">{{ live.title }}</p>
-                            <p class="item_text_time">{{ live.time }}</p>
-                        </a>
-                    </div>
-                </div>
-                <div class="section_right_item">
-                    <div class="right_item_title">
-                        <p>热门文章</p>
-                        <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank">更多></a>
-                    </div>
-                    <div class="right_item_main" v-for="(live,index) in liveList">
-                        <a href="" class="item_banner" v-if="index === 0" target="_blank">
-                            <img :src="live.banner" alt="">
-                            <div class="name">{{ live.title }}</div>
-                        </a>
-                        <a href="" class="item_text" v-if="index > 0" target="_blank">
-                            <p class="item_text_name">{{ live.title }}</p>
-                            <p class="item_text_time">{{ live.time }}</p>
-                        </a>
-                    </div>
-                </div>
-                <div class="section_right_item">
-                    <div class="right_item_title">
-                        <p>最新活动</p>
-                        <a href="/promotions.html" target="_blank">更多></a>
-                    </div>
-                    <div class="right_item_main" v-for="(live,index) in liveList">
-                        <a href="" class="item_banner" v-if="index === 0" target="_blank">
-                            <img :src="live.banner" alt="">
-                            <div class="name">{{ live.title }}</div>
-                        </a>
-                        <a href="" class="item_text" v-if="index > 0" target="_blank">
-                            <p class="item_text_name">{{ live.title }}</p>
-                            <p class="item_text_time">{{ live.time }}</p>
-                        </a>
-                    </div>
-                </div>
-            </div>
         </div>
     </div>
     <!--右侧边栏导航-->
-    <div id="sideNav">
+    <div id="sideNav" v-if="isPC">
         <div class="item">
             <a v-for="nav in asideNav" :data-id="nav.id" v-text="nav.value" href="javascript:void(0);"></a>
         </div>
@@ -561,4 +583,4 @@
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/index.js(v=${version})}"></script>
 </body>
-</html>
+</html>

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

@@ -24,7 +24,7 @@
                     <p>{{ page.content }}</p>
                 </div>
                 <template v-if="page.type == 1">
-                    <div class="section_page_main" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_02"><img :src="page.advertisement" alt=""></a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
@@ -88,7 +88,7 @@
                     </div>
                 </template>
                 <template v-if="page.type == 2">
-                    <div class="section_page_main" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
                         <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
@@ -153,7 +153,7 @@
                     </div>
                 </template>
                 <template v-if="page.type == 3">
-                    <div class="section_page_main type_03" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main clear mfw type_03" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                         <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
@@ -218,7 +218,7 @@
                     </div>
                 </template>
                 <template v-if="page.type == 4">
-                    <div class="section_page_main type_03" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                         <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
                         <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
@@ -284,7 +284,7 @@
                     </div>
                 </template>
                 <template v-if="page.type == 5">
-                    <div class="section_page_main type_03" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
@@ -348,7 +348,7 @@
                     </div>
                 </template>
                 <template v-if="page.type == 6">
-                    <div class="section_page_main type_03" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -405,11 +405,11 @@
                                 </template>
                             </div>
                         </a>
-                        <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                     </div>
+                    <a href="" class="page_main_item ad_01 bottom"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                 </template>
                 <template v-if="page.type == 7">
-                    <div class="section_page_main" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>