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

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -74,8 +74,8 @@ public class RedirectController {
      * 分类详情
      */
     @GetMapping("/cmpage/info-5-{id}.html")
-    public String classificationDetails(@PathVariable("id") Integer id) {
-        return "redirect:/product/instrument.html?id=" + id;
+    public String classificationDetails(@PathVariable("id") Integer id,String name) {
+        return "redirect:/product/instrument.html?id=" + id+"&name="+name;
     }
 
     /**

src/main/resources/static/css/flea-market/list.css

@@ -62,7 +62,7 @@
     .Listitem:nth-of-type(4) {margin-right: 0;}
     .mainTab li {height: 9.6vw;line-height: 9.6vw;text-align: center;color: #627386;cursor: pointer;}
     .active {color: #E15621;}
-    .line{width: 10vw;margin:0 auto;height: .48vw;background-color: #e15616;display: block}
+    .secondTitle .ClassA .line{width: 10vw;margin:0 auto;height: .48vw;background-color: #e15616;display: block}
     .mainTab li.addstyle{color: #e15616;}
     .itemImg{width:31.2vw;height:31.2vw;float: left;background: #000;}
     .activeImg{opacity: 0.5;}

src/main/resources/static/js/base.js

@@ -54,7 +54,8 @@ var globalHead = new Vue({
             {name:'仪器',link:'/product/instrument.html',value:'2'}
         ],
         NavsList:[],
-        currenIndex:1
+        currenIndex:1,
+        nav_linkName:''
     },
     methods: {
         changeline:function(tab){
@@ -215,6 +216,15 @@ var globalHead = new Vue({
                 }
             })
         }
+        _self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
+        setTimeout(function(){
+            $('.navBox li').each(function () {
+                var _thisName = $(this).find('a').text();
+                if(_self.nav_linkName == _thisName){
+                    $(this).find('a').addClass('on')
+                }
+            });
+        },500);
     }
 });
 // 初始化效果

src/main/resources/static/js/flea-market/list.js

@@ -5,7 +5,8 @@ var fleaMarketList = new Vue({
          currentId:1,
          currentID2:0,
          isShow:false,
-         requestFlag: true,
+         listLoading:true,
+         requestFlag:false,
          showflag:false,
          mainflag:false,
          userID:JSON.parse(localStorage.getItem('userInfo')),
@@ -124,10 +125,12 @@ var fleaMarketList = new Vue({
                                    }
                                }
                            }
-                            _this.requestFlag = false;
+                            _this.listLoading = false;
+                            _this.requestFlag = true;
                          }else{
                              CAIMEI.Alert(res.msg, '确定', false);
-                              _this.requestFlag = true;
+                              _this.requestFlag = false;
+                              _this.listLoading = true;
                          }
                 })
           },

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

@@ -19,26 +19,26 @@ var homeData = new Vue({
     filters: {
         statusType:function(value) {
             switch (value) {
-                case '1':
+                case 1:
                     return  '未开始';
                     break;
-                case '2':
+                case 2:
                     return  '直播中';
                     break;
-                case '3':
-                    return  '已结束';
+                case 3:
+                    return  '看回放';
                     break;
             }
         },
         statusTypeClass:function(value) {
             switch (value) {
-                case '1':
+                case 1:
                     return  'icon-wart';
                     break;
-                case '2':
+                case 2:
                     return  'icon-live';
                     break;
-                case '3':
+                case 3:
                     return  'icon-end';
                     break;
             }
@@ -93,6 +93,16 @@ var homeData = new Vue({
                 }
             },300);
         },
+        GetNavigationMenu :function(){//获取顶部导航分类
+            var _self = this;
+            PublicApi.GetNavigationMenu({source:1},function(response){
+                if(response.code == 0){
+                    _self.topMenuList = response.data.topMenuList;
+                }else{
+                    CAIMEI.Alert(response.msg, '确定');
+                }
+            });
+        },
         GetHomeFloorData: function(){
             var _self = this;
             PublicApi.GetHomeData({userId:GLOBAL_USER_ID,soure:1},function(response){
@@ -105,36 +115,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() {
                         // 设置侧边导航数据
@@ -246,6 +260,7 @@ var homeData = new Vue({
             this.userId = JSON.parse(userInfo).userId;
         }
         this.GetBanners();
+        this.GetNavigationMenu();
         this.GetHomeFloorData();
     },
     mounted: 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 {
@@ -154,18 +154,5 @@
          }
          this.params.pageId = getUrlParam('id');
          this.GetHomeFloorData();
-         console.log(this.params.pageId);
-         setTimeout(function(){
-             //本地ID 118-产品  119-仪器
-             //正式ID 287-产品  286-仪器
-             if(_self.params.pageId == '287'){
-                 var obg =  $('.navBox li').eq(0).find('a');
-                 obg.addClass('on');
-             }else if(_self.params.pageId == '286'){
-                 var obg =  $('.navBox li').eq(1).find('a');
-                 obg.addClass('on');
-             }
-         },500)
-
     }
  })

src/main/resources/templates/components/foot-link.html

@@ -8,5 +8,5 @@
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/shopping.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/base.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/utils.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/base.js(v=${version})}"></script>

src/main/resources/templates/flea-market/list.html

@@ -12,7 +12,7 @@
 
 <!-- 二手商品列表 -->
 <div id="fleaMarketList">
-     <div v-if="requestFlag" class="loading">
+     <div v-if="listLoading" class="loading">
             <img src="/img/base/loading.gif">
      </div>
      <template v-else>

src/main/resources/templates/index.html

@@ -31,7 +31,7 @@
         </div>
         <div class="mNavBox h5Only clear">
             <!--导航菜单-->
-            <a class="nav" :href="menu.link" target="_blank" v-for="(menu,index) in topMenuList">
+            <a class="nav" :href="menu.link" v-for="(menu,index) in topMenuList">
                 <img class="nav-icon" :src="menu.icon" :alt="menu.name">
                 <p v-text="menu.name"></p>
             </a>
@@ -57,8 +57,7 @@
                                     </div>
                                 </a>
                                 <a :href="live.link" class="item_text" v-if="index > 0" target="_blank" :title="live.liveTitle">
-                                    <p class="item_text_name" v-text="live.liveTitle"></p>
-                                    <p class="item_text_time" v-if="isPC" v-text="live.beginTime"></p>
+                                    <p class="item_text_name info" v-text="live.liveTitle"></p>
                                 </a>
                             </div>
                         </div>
@@ -99,11 +98,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 +197,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 +298,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 +399,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 +506,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 +601,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 +693,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 +779,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'">

src/main/resources/templates/single-page/topic.html

@@ -22,7 +22,7 @@
         <div class="pageFloor" v-for="floor in floorDatas">
             <div class="title">
                 <span v-text="floor.title"></span>
-                <a class="talk_link" v-if="buttonName!=null" :href="buttonLink" target="_blank">{{ buttonName }}</a>
+                <a class="talk_link" v-if="buttonName!=null && buttonName!=''" :href="buttonLink" target="_blank">{{ buttonName }}</a>
             </div>
             <ul class="content clear">
                 <li v-for="item in floor.floorData">

src/main/resources/templates/supplier-center/shop/release.html

@@ -198,7 +198,7 @@
                             </div>
                             <div class="release-from clear">
                                 <div class="release-label rightTxt">商品编码:</div>
-                                <div class="release-input"><input class="input" v-model="releaseParams.productCode" type="text" placeholder="建议输入品牌关键词"></div>
+                                <div class="release-input"><input class="input" v-model="releaseParams.productCode" type="text" placeholder="建议输入商品编码"></div>
                             </div>
                             <div class="release-from none clear">
                                 <div class="release-label rightTxt">搜索关键词:</div>