首页样式修改

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

@@ -105,36 +105,40 @@ var homeData = new Vue({
                     _self.supplierImage = data.supplierImage.wwwImage;
                     _self.supplierWwwLink = data.supplierImage.wwwLink;
                     _self.pageList.forEach(function(page){
-                        if(isPC){
-                            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;
-                                }
-                            }
-                        }else{
-                            if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
-                                if (page.floorImageList.length>3){
-                                    page.isPageMore = true;
-                                }
-                            }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4'){
-                                if (page.floorImageList.length>2){
-                                    page.isPageMore = true;
+                        if(page.floorContent){
+                            if(isPC){
+
+                                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;
+                                    }
                                 }
-                            }else if(page.floorContent.templateType == '5'){
-                                if (page.floorImageList.length>4){
-                                    page.isPageMore = true;
+                            }else{
+                                if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
+                                    if (page.floorImageList.length>3){
+                                        page.isPageMore = true;
+                                    }
+                                }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4'){
+                                    if (page.floorImageList.length>2){
+                                        page.isPageMore = true;
+                                    }
+                                }else if(page.floorContent.templateType == '5'){
+                                    if (page.floorImageList.length>4){
+                                        page.isPageMore = true;
+                                    }
                                 }
                             }
                         }
                     });
+                    console.log(_self.pageList)
                     _self.GetHomeRightData();
                     setTimeout(function() {
                         // 设置侧边导航数据

src/main/resources/static/js/pay/caimei-paycash.js

@@ -46,7 +46,7 @@ var payContainer = new Vue({
         receiptAmount:'',//已支付金额
         balanceAmount:'',//应付剩余金额
         payAmount:'',//本次支付金额
-        paymentIimit:10000,
+        paymentIimit:5000,
         paymentIimitText:'',
         discernReceiptList:[],//支付记录列表
         tabIndex:0,//支付方式 0 移动支付 1网银支付 2线下转账
@@ -158,10 +158,10 @@ var payContainer = new Vue({
                 if(_self.payAmount > _self.paymentIimit){
                     switch (_self.payInfo.PAY_BANK_NUM) {
                         case 'WEIXIN':
-                            _self.paymentIimitText = '本次支付金额已超出微信支付限额，请输入小于1万的金额进行支付';
+                            _self.paymentIimitText = '本次支付金额已超出微信支付限额，请输入小于5千的金额进行支付';
                             break;
                         case 'ALIPAY':
-                            _self.paymentIimitText = '本次支付金额已超出支付宝限额，请输入小于1万的金额进行支付';
+                            _self.paymentIimitText = '本次支付金额已超出支付宝限额，请输入小于5千的金额进行支付';
                             break;
                     }
                     CAIMEI.Alert(_self.paymentIimitText,'知道了');

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

@@ -53,47 +53,47 @@
         seeMore:function(page){
              page.isPageMore = !page.isPageMore;
         },
-         GetHomeFloorData: function(){
+        GetHomeFloorData: function(){
             var _self = this;
-           ProductApi.GethomeData(_self.params,function (res) {
+            ProductApi.GethomeData(_self.params,function (res) {
                  if (res.code == 0 ) {
                      _self.hotlist = res.data.hotSearchList;
                      _self.floorList = res.data.floorList;
                      _self.typeSort = res.data.page.typeSort;
                      _self.listLoading =false;
                      _self.floorList.forEach(function(page){
-                           if(isPC){
-                               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;
-                                        }
-                                    }
+                         if(page.floorContent) {
+                             if(isPC){
+                                 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;
+                                     }
+                                 }
                              }else {
-                                if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
-                                    if (page.floorImageList.length>3){
-                                        page.isPageMore = true;
-                                    }
-                                }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4'){
-                                    if (page.floorImageList.length>2){
-                                        page.isPageMore = true;
-                                    }
-                                }else if(page.floorContent.templateType == '5'){
-                                    if (page.floorImageList.length>4){
-                                        page.isPageMore = true;
-                                    }
-                                }
+                                 if(page.floorContent.templateType == '1' || page.floorContent.templateType == '3'){
+                                     if (page.floorImageList.length>3){
+                                         page.isPageMore = true;
+                                     }
+                                 }else if(page.floorContent.templateType == '2' || page.floorContent.templateType == '4'){
+                                     if (page.floorImageList.length>2){
+                                         page.isPageMore = true;
+                                     }
+                                 }else if(page.floorContent.templateType == '5'){
+                                     if (page.floorImageList.length>4){
+                                         page.isPageMore = true;
+                                     }
+                                 }
                              }
+                         }
                     });
-
-
                      _self.SwiperNanner();
                      _self.getClassify();
                  }else {

src/main/resources/templates/index.html

@@ -99,11 +99,11 @@
                 </div>
                 <div class="section_left ">
                     <div class="section_page" v-for="(page,index) in pageList">
-                        <div class="section_page_title">
+                        <div class="section_page_title" v-if="page.floorContent">
                             <h1 v-text="page.title" :data-id="index+1"></h1>
                             <p v-text="page.detail"></p>
                         </div>
-                        <template v-if="page.floorContent.templateType == '1'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '1'">
                             <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                 <a :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
                                    class="page_main_item ad_02" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
@@ -198,7 +198,7 @@
                                 <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                             </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '2'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '2'">
                             <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                 <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
                                     class="page_main_item ad_02" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
@@ -299,7 +299,7 @@
                                 <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                             </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '3'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '3'">
                             <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? '' : 'max'">
                                 <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
                                     class="page_main_item ad_01" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
@@ -400,7 +400,7 @@
                                 <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                             </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '4'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '4'">
                             <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? '' : 'max'">
                                 <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
                                     class="page_main_item ad_01" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
@@ -507,7 +507,7 @@
                                 <div class="more" @click="showMorePageFn(page)"><i class="icon mIcon"></i>查看更多</div>
                             </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '5'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '5'">
                             <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? '' : 'max'">
                                 <a  :href="page.floorContent.adsLink1!='' ? page.floorContent.adsLink1 : 'javascript:void(0)' "
                                     class="page_main_item ad_01" :class="page.floorContent.adsLink1!='' ? '' : 'default' "
@@ -602,7 +602,7 @@
                                 <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                             </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '6'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '6'">
                             <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
                                 <a  :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
@@ -694,7 +694,7 @@
                                 <img v-else :src="page.floorContent.appletsAdsImage1" alt="" class="page_main_item_adv">
                             </a>
                         </template>
-                        <template v-if="page.floorContent.templateType == '7'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '7'">
                             <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                                 <a :href="pros.link" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList" target="_blank">
                                     <img class="page_main_image" src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
@@ -780,7 +780,7 @@
                                 </a>
                             </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '8'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '8'">
                             <div class="floorCon">
                                 <div class="hotList swiper-container-floor" id="recommendBox">
                                     <div class="section_page_main type_08 clear mfw swiper-wrapper recommendBox-wrapper" :class="page.isPageMore ? 'max' : ''">

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

@@ -42,11 +42,11 @@
                         </ul>
                     </div>
                     <div class="page-list" v-for="(page,index) in floorList" >
-                        <div class="floorTit">
+                        <div class="floorTit" v-if="page.floorContent">
                             <h2 :data-id="index+1" v-text="page.title"></h2>
                             <h5 v-text="page.detail"></h5>
                         </div>
-                        <template v-if="page.floorContent.templateType == '1'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '1'">
                              <div class="floorCon">
                                  <div class="hotList recommend">
                                     <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
@@ -117,7 +117,7 @@
                                  </div>
                              </div>
                        </template>
-                        <template v-if="page.floorContent.templateType == '2'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '2'">
                              <div class="floorCon">
                                  <div class="hotList">
                                     <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
@@ -189,7 +189,7 @@
                                  </div>
                             </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '3'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '3'">
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">
@@ -261,7 +261,7 @@
                                 </div>
                              </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '4'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '4'">
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw"  :class="page.isPageMore ? '' : 'max'">
@@ -338,7 +338,7 @@
                                 </div>
                             </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '5'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '5'">
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main type clear mfw" :class="page.isPageMore ? '' : 'max'">
@@ -408,7 +408,7 @@
                                 </div>
                              </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '6'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '6'">
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
@@ -478,7 +478,7 @@
                                 </div>
                              </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '7'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '7'">
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="section_page_main clear mfw" :class="page.isPageMore ? '' : 'max'">
@@ -545,7 +545,7 @@
                                 </div>
                              </div>
                         </template>
-                        <template v-if="page.floorContent.templateType == '8'">
+                        <template v-if="page.floorContent && page.floorContent.templateType == '8'">
                             <div class="floorCon">
                                 <div class="hotList swiper-container" id="recommendBox">
                                     <div class="section_page_main clear mfw swiper-wrapper" :class="page.isPageMore ? '' : 'max'">