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

# Conflicts:
#	src/main/resources/templates/product/temporary.html

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

@@ -75,9 +75,14 @@ public class RedirectController {
      */
     @GetMapping("/cmpage/info-5-{id}.html")
     public String classificationDetails(@PathVariable("id") Integer id,String name) {
+        // 美体节活动页
+        if (id == 301) {
+            return "redirect:/product/temporary.html?id=" + id + "&name=" + name;
+        }
         return "redirect:/product/instrument.html?id=" + id+"&name="+name;
     }
 
+
     /**
      * 专题活动列表页【旧】
      */

src/main/java/com/caimei/www/controller/unlimited/ProductController.java

@@ -23,6 +23,7 @@ public class ProductController extends BaseController {
 	private static final String PRODUCT_DETAIL_PATH = "product/detail";
 	private static final String PROMOTIONS_LIST_PATH = "product/promotions";
     private static final String INSTRUMENT_PAGE_PATH = "product/instrument";
+    private static final String TEMPORARY_PAGE_PATH = "product/temporary";
     private static final String INSTRUMENT_LIST_PATH = "product/instruelist";
     private static final String QUALITY_AUTHORRIZE_PATH = "product/qualityauthorize";
     /** 美博会专题页 */
@@ -72,6 +73,14 @@ public class ProductController extends BaseController {
         return INSTRUMENT_PAGE_PATH;
     }
 
+    /**
+     * 美体节活动页
+     */
+    @GetMapping("/product/temporary.html")
+    public String temporary(){
+        return TEMPORARY_PAGE_PATH;
+    }
+
     /**
      * 仪器列表页
      */

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

@@ -50,6 +50,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .footer p a:hover{color:#F52E3E}
 .footer-mobile{display:none}
 .product-params .params.mobile{display:none}
+
 .statementModel{position:fixed;top:0;left:0;z-index:999;width:100%;height:100vh;background:rgba(0,0,0,.4)}
 .statementModel .model{position:fixed;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);-moz-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);width:620px;height:380px;border-radius:4px;background:#fff;overflow:hidden}
 .statementModel .title{padding:15px 20px;background:#f1f1f1;font-size:18px}
@@ -59,7 +60,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .float-zplm{position:fixed;z-index:99;bottom:16%;right:2%;width:90px}
 .float-zplm img{width:100%}
 .close{position:absolute;display:block;width:32px;height:32px;background:url(/img/quality/mb-close.png) no-repeat center;cursor:pointer;z-index:999;background-size:32px;right:0;top:-50px}
-.container-main .sq-book{position:absolute;width:149px;height:112px;bottom:20px;left:30px;z-index:10}
+.container-main .sq-book{position:absolute;width:149px;height:112px;bottom:20px;left:30px;z-index:10;cursor: pointer;}
 .sq-book-modal{width:100%;height:100vh;position:fixed;z-index:997;top:0;left:0;background:rgba(0,0,0,.7);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
 .sq-book-img{width:622px;height:467px;-webkit-box-shadow:0 10px 28px rgba(255,199,30,.26);box-shadow:0 10px 28px rgba(255,199,30,.26);position:fixed;left:0;right:0;margin:0 auto;top:20%;z-index:998}
 .sq-book-img img{width:100%;height:auto}
@@ -87,6 +88,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .product-params .params{margin-top:3vw;border-spacing:0 4vw}
 .product-params .params tr{line-height:6.6vw}
 .product-params .footer{display:none}
+.product-params .params.mobile td{vertical-align: top}
 .footer{display:none}
 .footer-mobile{padding:8vw 0 4vw;line-height:7vw;text-align:center;background:#f5f5f5}
 .footer-mobile p{color:#b2b2b2;font-size:2.4vw}
@@ -100,7 +102,7 @@ ul{margin:0;padding:0;list-style-type:none}
 .float-zplm{position:fixed;z-index:99;bottom:30vw;right:3.4vw;width:15.7vw}
 .float-zplm img{width:100%}
 .close{position:absolute;display:block;width:7.2vw;height:7.2vw;background:url(/img/quality/mb-close.png) no-repeat center;cursor:pointer;z-index:999;background-size:7.2vw;right:0;top:-11.5vw}
-.container-main .sq-book{position:absolute;width:27.2vw;height:20.6vw;bottom:4.1vw;left:4vw;z-index:10}
+.container-main .sq-book{position:absolute;width:27.2vw;height:20.6vw;bottom:4.1vw;left:4vw;z-index:10;cursor: pointer}
 .sq-book-modal{width:100%;height:100vh;position:fixed;z-index:997;top:0;left:0;background:rgba(0,0,0,.7)}
 .sq-book-img{z-index:998;display:block;width:92vw;height:69vw;position:fixed;top:41.2vw;left:0;right:0;margin:0 auto;-webkit-box-shadow:0 10px 28px rgba(255,199,30,.26);box-shadow:0 10px 28px rgba(255,199,30,.26)}
 .sq-book-img img{width:100%}

src/main/resources/static/js/product/produce-list.js

@@ -28,6 +28,7 @@ var productList = new Vue({
             pageNum: 1,
             idType:1
         },
+        nav_linkName:'',
         addhtml:'<span class="tag">美博会</span>'
     },
      filters:{
@@ -173,6 +174,7 @@ var productList = new Vue({
     },
     mounted:function () {
         var _self = this;
+        this.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
         this.bigTypeID = getUrlParam('bigTypeID');
         this.bigTypeID = getUrlParam('bigTypeID');
         this.smallTypeID = getUrlParam('smallTypeID');

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

@@ -0,0 +1,161 @@
+ var instrueMent = new Vue({
+    el:'#instrueMent',
+    data:{
+         listLoading:true,
+         categorylist:[],
+         hotlist:[],
+         recommendPage: 1,
+         floorList: [],
+         userId:0,
+         typeSort:'',
+         showflag:false,
+         params:{
+            pageId:'',
+            userId:'',
+            source:1
+         },
+         nav_linkName:''
+    },
+    filters:{
+         NumFormat:function(value) {//处理金额
+            return Number(value).toFixed(2);
+        },
+    },
+     created: function() {
+
+     },
+     methods:{
+         PromotionsFormat:function(promo){//促销活动类型数据处理
+            if(promo!=null){
+                if(promo.type == 1 && promo.mode == 1){
+                    return true
+                }else{
+                    return false
+                }
+            }
+            return false
+        },
+        closeup:function(){
+            this.showflag = false;
+            document.body.style.overflow='';
+        },
+        showNav:function(){
+        var _this = this;
+        _this.showflag = !_this.showflag;
+            if (_this.showflag){
+                 document.body.style.overflow='hidden';
+            }else {
+                document.body.style.overflow='';
+            }
+        },
+        toserch:function(item){
+            window.location.href='/product/instruelist.html?bigTypeID='+item.bigTypeID+'&typeSort='+this.typeSort+'&name='+this.nav_linkName
+        },
+        seeMore:function(page){
+             page.isPageMore = !page.isPageMore;
+        },
+        GetHomeFloorData: function(){
+            var _self = this;
+            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(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;
+                                     }
+                                 }
+                             }
+                         }
+                    });
+                     _self.SwiperNanner();
+                     _self.getClassify();
+                 }else {
+                     CAIMEI.Alert(res.msg, '确定');
+                 }
+           })
+        },
+         getClassify: function() {
+            var _self = this;
+            PublicApi.GetProductClassify({typeSort:_self.typeSort, source: 'www'}, function (res) {
+                if (res.code == 0) {
+                    _self.categorylist = res.data;
+                } else {
+                    CAIMEI.Alert(res.msg, '确定', false);
+                }
+            })
+        },
+          SwiperNanner: function(){
+           setTimeout(function(){
+                // 图片懒加载
+                $("img[data-original]").lazyload();
+            },500);
+            setTimeout(function(){
+                if (isPC) {
+                    $('.swiper-container').slide({
+                        mainCell:".swiper-wrapper"
+                        ,titCell:".swiper-pagination span"
+                        ,effect: "leftLoop"
+                        ,interTime: 3000
+                        ,autoPlay: true
+                        ,scroll:5
+                        ,vis:5
+                    });
+                } else {
+                     var swiper = new Swiper('.swiper-container', {
+                                slidesPerView: 2,
+                                slidesPerColumn: 2,
+                                spaceBetween:0,
+                                slidesPerGroup: 2,
+                                autoplay: {
+                                    delay: 3000,
+                                    disableOnInteraction: false
+                                },
+                                pagination: {
+                                    el: '.swiper-pagination'
+                                }
+                            });
+
+                }
+            },500);
+        }
+    },
+    mounted: function(){
+        var _self = this;
+         _self.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
+         console.log(_self.nav_linkName);
+         var userInfo = localStorage.getItem('userInfo');
+         if(userInfo){
+             this.params.userId = JSON.parse(userInfo).userId;
+         }
+         this.params.pageId = getUrlParam('id');
+         this.GetHomeFloorData();
+    }
+ })

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

@@ -79,7 +79,7 @@
             <div class="list-container">
                 <ul class="clear mfw">
                     <li class="productItem " v-for="p in listData">
-                        <a class="image" :href="'/product-'+p.id+'.html'">
+                        <a class="image" :href="'/product-'+p.id+'.html'+'?name='+ nav_linkName">
                             <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
                             <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
                             <p class="name" v-html="p.name" v-else></p>

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

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
-<head><title>采美365网--采美正品联盟-正品授权-官方防伪网站</title>
+<head><title>正品联盟</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/product/qualityauthorize.css(v=${version})}" rel="stylesheet" type="text/css">
 </head>
@@ -48,7 +48,7 @@
                             <!-- 弹窗 -->
                             <a href="#" @click.prevent="openStatementDialog(1)" v-else>代理声明<i class="iconfont icon-wenhao"></i></a></div>
                     </div>
-                    <p>该仪器由{{parameters.agentName ? parameters.agentName : parameters.brandName}}授予{{parameters.authParty}}正品拥有</p>
+                    <p>该仪器由{{parameters.agentFlag !== 0 ? parameters.agentName : parameters.brandName}}授予{{parameters.authParty}}正品拥有</p>
                     <div class="pink-box sn-number">
                         <div class="item-row"><span>SN码：{{parameters.snCode | snCode}}</span></div>
                     </div>
@@ -60,7 +60,7 @@
                 <table class="params mobile">
                     <tbody>
                     <tr v-for="(item , index) in parameters.paramList" :key="index">
-                        <td>{{item.name}}</td>
+                        <td style="width: 80px;">{{item.name}}</td>
                         <td>{{item.content}}</td>
                     </tr>
                     </tbody>