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

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

@@ -8,7 +8,7 @@
     .normal-nav{margin-top: 10px}
     .top-category{overflow: hidden;}
     .instrue-left .top-category .normal-nav .nav-list:hover{color:#e15616;transform:translateY(-5px);box-shadow:0 8px 8px rgba(102,102,102,0.05), 0 10px 10px rgba(102,102,102,0.05), 0 12px 12px rgba(102,102,102,0.05);}
-    .instrue-left .top-category .normal-nav .nav-list {border:1px solid #fff;float: left;margin: 0 16px 16px 0;width: 132px;height: 104px;background: #fff;text-align: center;color: #4a4f58;font-size: 16px;cursor: pointer;transition: all 0.4s}
+    .instrue-left .top-category .normal-nav .nav-list {border:1px solid #fff;float: left;margin: 0 16px 16px 0;width: 132px;height: 88px;background: #fff;text-align: center;color: #4a4f58;font-size: 14px;cursor: pointer;transition: all 0.4s}
     .instrue-left .top-category .normal-nav .nav-list a{padding: 0 10px;text-align: center;display: block;line-height: 22px;}
     .instrue-left .top-category .normal-nav .nav-list.active {border: 1px solid #e15616;color: #e15616;}
     .instrue-right {float: right;width: 252px;background: #fff;padding: 16px;margin-top: 10px;min-height: 343px;overflow: auto;}

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

@@ -8,7 +8,7 @@
          floorList: [],
          userId:0,
          typeSort:'',
-         moreflag:true,
+         isPageMore:true,
          showflag:false,
          params:{
             pageId:'',
@@ -52,7 +52,7 @@
             window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeID+'&typeSort='+this.typeSort
         },
         seeMore:function(page){
-            page.isPageMore = true;
+             page.isPageMore = !page.isPageMore;
         },
          GetHomeFloorData: function(){
             var _self = this;
@@ -62,6 +62,21 @@
                      _self.floorList = res.data.floorList;
                      _self.typeSort = res.data.page.typeSort;
                      _self.listLoading =false;
+                     _self.floorList.forEach(function(page){
+                        if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
+                            if (page.floorImageList.length>7){
+                                page.isPageMore = true;
+                            }
+                        }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4' || page.floorContent.templateType == '7'){
+                            if (page.floorImageList.length>5){
+                                page.isPageMore = true;
+                            }
+                        }else if(page.floorContent.templateType == '5'){
+                            if (page.floorImageList.length>10){
+                                page.isPageMore = true;
+                            }
+                        }
+                    });
                      _self.SwiperNanner();
                      _self.getClassify();
                  }else {

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

@@ -49,7 +49,7 @@
                         <template v-if="page.floorContent.templateType == '1'">
                              <div class="floorCon">
                                  <div class="hotList recommend">
-                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a  class="img01" :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'" ><img :src="page.floorContent.pcAdsImage1"/></a>
                                         <a class="productItem" :href="pros.link" v-for="(pros,index) in page.floorImageList" >
                                             <img :src="pros.image ? pros.image : '/img/base/placeholder.png'" :data-original="pros.image" :alt="pros.name">
@@ -111,14 +111,14 @@
                                              </div>
                                         </a>
                                     </div>
-                                    <div class="unfold" @click="seeMore(page)" v-if="!page.isPageMore">查看更多 ∨</div>
+                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>
                                  </div>
                              </div>
                        </template>
                         <template v-if="page.floorContent.templateType == '2'">
                              <div class="floorCon">
                                  <div class="hotList">
-                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'" class="img01"><img  :src="page.floorContent.pcAdsImage1" alt=""> </a>
                                         <a :href="page.floorContent.adsLink2" class="img02"><img  :src="page.floorContent.pcAdsImage2" alt=""> </a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
@@ -181,14 +181,14 @@
                                              </div>
                                         </a>
                                     </div>
-                                    <div class="unfold" @click="seeMore(page)" v-if="!page.isPageMore">查看更多 ∨</div>
+                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>
                                  </div>
                             </div>
                         </template>
                         <template v-if="page.floorContent.templateType == '3'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="section_page_main type clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
                                         <a class="img01" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage2"/></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
@@ -251,14 +251,14 @@
                                              </div>
                                         </a>
                                     </div>
-                                    <div class="unfold" @click="seeMore(page)" v-if="!page.isPageMore">查看更多 ∨</div>
+                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>
                                 </div>
                              </div>
                         </template>
                         <template v-if="page.floorContent.templateType == '4'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="section_page_main type clear mfw"  :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main type clear mfw"  :class="page.isPageMore ? '' : 'max'">
                                         <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
                                         <a class="img01" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage1"/></a>
                                         <a class="img02" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage2"/></a>
@@ -322,14 +322,14 @@
                                              </div>
                                         </a>
                                     </div>
-                                    <div class="unfold"@click="seeMore(page)" v-if="!page.isPageMore" >查看更多 ∨</div>
+                                    <div class="unfold"@click="seeMore(page)" v-if="page.isPageMore" >查看更多 ∨</div>
                                 </div>
                             </div>
                         </template>
                         <template v-if="page.floorContent.templateType == '5'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="section_page_main type clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
@@ -391,14 +391,14 @@
                                              </div>
                                         </a>
                                     </div>
-                                    <div class="unfold" @click="seeMore(page)" v-if="!page.isPageMore">查看更多 ∨</div>
+                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>
                                 </div>
                              </div>
                         </template>
                         <template v-if="page.floorContent.templateType == '6'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -460,14 +460,14 @@
                                         </a>
                                     </div>
                                      <a class='imgbaner' :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)'"><img :src="page.floorContent.pcAdsImage1"></a>
-                                    <div class="unfold" @click="seeMore(page)" v-if="!page.isPageMore">查看更多 ∨</div>
+                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>
                                 </div>
                              </div>
                         </template>
                         <template v-if="page.floorContent.templateType == '7'">
                             <div class="floorCon">
                                 <div class="hotList">
-                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                         <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
@@ -528,14 +528,14 @@
                                              </div>
                                         </a>
                                     </div>
-                                    <div class="unfold" @click="seeMore(page)" v-if="!page.isPageMore">查看更多 ∨</div>
+                                    <div class="unfold" @click="seeMore(page)" v-if="page.isPageMore">查看更多 ∨</div>
                                 </div>
                              </div>
                         </template>
                         <template v-if="page.floorContent.templateType == '8'">
                             <div class="floorCon">
                                 <div class="hotList swiper-container" id="recommendBox">
-                                    <div class="section_page_main clear mfw swiper-wrapper" :class="page.isPageMore ? 'max' : ''">
+                                    <div class="section_page_main clear mfw swiper-wrapper" :class="page.isPageMore ? '' : 'max'">
                                         <a class="productItem swiper-slide" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>