新版首页修改

src/main/java/com/caimei/www/controller/unlimitedApi/ShortLinkApi.java

@@ -1,61 +1,61 @@
-package com.caimei.www.controller.unlimitedApi;
-
-import com.caimei.www.service.link.ShortLinkService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.http.server.reactive.ServerHttpResponse;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.server.ServerWebExchange;
-import org.thymeleaf.util.StringUtils;
-
-import java.net.URI;
-import java.util.Objects;
-
-/**
- * Description
- *
- * @author : plf
- * @date : 2021/6/24
- */
-@RestController
-@Slf4j
-public class ShortLinkApi {
-    private ShortLinkService shortLinkService;
-
-    @Autowired
-    public void setShortLinkService(ShortLinkService shortLinkService) {
-        this.shortLinkService = shortLinkService;
-    }
-
-    /**
-     * 短链接跳转
-     *
-     * @param link
-     * @param response
-     */
-    @GetMapping("/t/{link}")
-    public void linkJump(@PathVariable String link, ServerWebExchange serverWebExchange, ServerHttpResponse response) {
-        ServerHttpRequest request = serverWebExchange.getRequest();
-        String ip = "";
-        HttpHeaders headers = request.getHeaders();
-        ip = String.valueOf(headers.get("x-forwarded-for"));
-        if (StringUtils.isEmpty(ip)) {
-            ip = String.valueOf(headers.get("X-Real-IP"));
-        }
-        if (null != ip && "" != ip) {
-            ip = ip.replaceAll("[^\\d.]", "");
-        }
-        log.info("访问短链接Ip--------------------------------------》" + ip + "link------------------------------->" + link);
-        String jumpLink = shortLinkService.linkJump(link, ip);
-        response.setStatusCode(HttpStatus.FOUND);
-        if (StringUtils.isEmpty(jumpLink)) {
-            response.getHeaders().setLocation(URI.create("https://www.caimei365.com/404.html"));
-        }
-        response.getHeaders().setLocation(URI.create(jumpLink));
-    }
-}
+package com.caimei.www.controller.unlimitedApi;
+
+import com.caimei.www.service.link.ShortLinkService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.http.server.reactive.ServerHttpResponse;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ServerWebExchange;
+import org.thymeleaf.util.StringUtils;
+
+import java.net.URI;
+import java.util.Objects;
+
+/**
+ * Description
+ *
+ * @author : plf
+ * @date : 2021/6/24
+ */
+@RestController
+@Slf4j
+public class ShortLinkApi {
+    private ShortLinkService shortLinkService;
+
+    @Autowired
+    public void setShortLinkService(ShortLinkService shortLinkService) {
+        this.shortLinkService = shortLinkService;
+    }
+
+    /**
+     * 短链接跳转
+     *
+     * @param link
+     * @param response
+     */
+    @GetMapping("/t/{link}")
+    public void linkJump(@PathVariable String link, ServerWebExchange serverWebExchange, ServerHttpResponse response) {
+        ServerHttpRequest request = serverWebExchange.getRequest();
+        String ip = "";
+        HttpHeaders headers = request.getHeaders();
+        ip = String.valueOf(headers.get("x-forwarded-for"));
+        if (StringUtils.isEmpty(ip)) {
+            ip = String.valueOf(headers.get("X-Real-IP"));
+        }
+        if (null != ip && "" != ip) {
+            ip = ip.replaceAll("[^\\d.]", "");
+        }
+        log.info("访问短链接Ip--------------------------------------》" + ip + "link------------------------------->" + link);
+        String jumpLink = shortLinkService.linkJump(link, ip);
+        response.setStatusCode(HttpStatus.FOUND);
+        if (StringUtils.isEmpty(jumpLink)) {
+            response.getHeaders().setLocation(URI.create("https://www.caimei365.com/index.html"));
+        }
+        response.getHeaders().setLocation(URI.create(jumpLink));
+    }
+}

src/main/resources/static/css/index/index-pc.css

@@ -28,7 +28,7 @@ li{list-style:none;}
     width: 140px;
     height: 540px;
     border-radius: 25px 0 0 25px;
-    background-color: #ffc600;
+    background-color: #f7f8fc;
     position: absolute;
     left: -130px;
     top: 0;
@@ -142,7 +142,7 @@ li{list-style:none;}
 }
 .right-panel {
     position: absolute;
-    left: 182px;
+    left: 188px;
     top: -34px;
     min-width: 516px;
     min-height: 520px;
@@ -342,7 +342,7 @@ li{list-style:none;}
 .section-content-mains-bottom .section-content-advert .section-content-adv-item{
     width: 236px;
     height: 117px;
-    background-color: #FF5B00;
+    background-color: #f7f8fc;
     margin-right: 8px;
     border-radius: 8px;
     overflow: hidden;
@@ -394,10 +394,12 @@ li{list-style:none;}
     height: 50px;
     border-radius: 50%;
     overflow: hidden;
+    border: 1px solid #E1E1E1;
+    box-sizing: border-box;
 }
 .section-content-usertop .user-column-a .user-column-logo img{
-    width: 50px;
-    height: 50px;
+    width: 49px;
+    height: 49px;
     display: block;
     border-radius: 50%;
 }
@@ -705,9 +707,9 @@ li{list-style:none;}
     justify-content: space-between;
 }
 .section-page-item{
-    width: 592px;
+    width: 595px;
     height: 484px;
-    margin: 0 15px 15px 0;
+    margin: 0 10px 10px 0;
     background-color: #FFFFFF;
     border-radius: 8px;
     overflow: hidden;
@@ -735,11 +737,11 @@ li{list-style:none;}
     align-items: center;
 }
 .section-page-item .section-page-top .section-page-title{
-    width: 64px;
+    width: 67px;
     height: 100%;
-    padding: 16px;
+    padding: 18px;
     font-weight: bold;
-    font-size: 14px;
+    font-size: 13px;
     color: #FFFFFF;
     box-sizing: border-box;
 }
@@ -1011,7 +1013,7 @@ li{list-style:none;}
     transition: all 0.2s;
 }
 .section-shop-content .section-shop-main .supplier-list-item:hover{
-    border-color: #FF5B00;
+    border-color: #d8d8d8;
 }
 .section-shop-content .section-shop-main .supplier-list-item:last-child{
     margin-right: 0;

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

@@ -381,8 +381,10 @@ const globalFot = new Vue({
         if (globalUserData.token) {
             this.userInfo = globalUserData;
             setTimeout(function () {
-                // 获取头部购物车数据
-                _self.getHeadCart(_self.userInfo.userId);
+                if(this.userInfo.userIdentity!== 3){
+                    // 获取头部购物车数据
+                    _self.getHeadCart(_self.userInfo.userId);
+                }
             }, 1000);
         }
     },

src/main/resources/static/js/document/beauty-archive.js

@@ -1,224 +1,224 @@
-var isPC = $(window).width() > 768;
-var clientWidth = $(window).width() ;
-$(window).on('resize', function () {
-    var change = $(window).width() > 768;
-    clientWidth = $(window).width();
-    if (isPC === change) return;
-    window.location.reload();
-});
-
-function getUrlParam(name) {
-    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-    var r = decodeURIComponent(window.location.search).substr(1).match(reg);
-    if (r != null) {
-        return (r[2])
-    }
-    return null;
-}
-
-//美业资料库列表
-var beautyArchive = new Vue({
-    el: '#beautyArchive',
-    mixins: [cmSysVitaMixins],
-    data: {
-        listLoading: false,
-        total: 0, // 商品总数
-        totalPage: 0,// 分页数
-        jumpPageSize: '',
-        listQuery: {
-            keyword: '', //查询关键词
-            productType: 0, //商品类型 0 全部 1 仪器 2 产品
-            pageNum: 1,
-            pageSize: 10,
-            productFlag: 1, // 是否统计关键词 1 统计 0 不统计
-            linkageFlag: 0 // 关键词来源是否为用户搜索 0 是 1 不是
-        },
-        keyword: '',
-        productList: [],  //商品列表
-        hasNextPage: false,
-        showPageBtn: 6,
-        openSearch: false, //开启搜索
-        currentTab: 0,
-        tabList: [{
-            id: 0,
-            name: '全部'
-        }, {
-            id: 1,
-            name: '产品'
-        }, {
-            id: 2,
-            name: '仪器'
-        }]
-    },
-    watch: {
-        keyword: function (val) {
-            if (val) return;
-            this.openSearch = false;
-            this.listQuery.keyword = '';
-            // this.getList();
-        }
-    },
-    created(){
-        this.keyword = this.listQuery.keyword = getUrlParam('keyword') || ''
-    },
-    mounted() {
-        this.getList();
-        this.initAuthInputComplete();
-    },
-    computed: {
-        loadingText: function () {
-            return this.hasNextPage ? '上滑加载更多' : '没有更多了';
-        },
-        pagination: function () {
-            var index = this.listQuery.pageNum, arr = [];
-            if (this.totalPage <= 6) {
-                for (var i = 1; i <= this.totalPage; i++) {
-                    arr.push(i);
-                }
-                return arr;
-            }
-            if (index <= 3) {
-                return [1, 2, 3, 4, 5, 0, this.totalPage];
-            }
-            if (index >= this.totalPage - 2) {
-                return [1, 0, this.totalPage - 4, this.totalPage - 3, this.totalPage - 2, this.totalPage - 1, this.totalPage];
-            }
-            return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, this.totalPage];
-        }
-    },
-    filters: {
-        productType: function (val) {
-            if (val === 1) {
-                return '产品';
-            }
-            if (val === 2) {
-                return '仪器';
-            }
-            return '未知';
-        }
-    },
-    methods: {
-        // init auto-input complete
-        initAuthInputComplete(){
-            var _self = this;
-            new AutoComplete({
-                el: '.auto-input',
-                setValueFlag: false,
-                callback: async function(keyword){
-                    try {
-                        const res = await PublicApi.fetchQueryKeywordList({keyword: keyword});
-                        if(!res.data) return [];
-                        return res.data.map(item => item.keyword);
-                    } catch (e) {
-                        console.log(e);
-                    }
-                },
-                itemClick: function (keyword) {
-                    _self.keyword = keyword;
-                    _self.handleSearch(keyword, true);
-                }
-            });
-        },
-        //页码跳转
-        toPagination: function (pageNum) {
-            if (pageNum > this.totalPage || pageNum <= 0) {
-                return this.jumpPageSize = '';
-            }
-            this.listQuery.pageNum = parseInt(pageNum);
-            this.getList(); //获取列表
-        },
-        //获取商品列表
-        getList: function () {
-            const _that = this;
-            _that.listLoading = true;
-            BeautyArchiveApi.GetArchiveProduct(this.listQuery, function (res) {
-                if (res.code !== 0) return console.log('请求失败');
-                _that.hasNextPage = res.data.hasNextPage;
-                _that.listQuery.pageNum = res.data.pageNum;
-                _that.listQuery.pageSize = res.data.pageSize;
-                _that.total = res.data.totalRecord;
-                _that.totalPage = res.data.totalPage;
-                if (isPC) {
-                    _that.productList = res.data.results;
-                } else {
-                    _that.productList = _that.productList.concat(res.data.results);
-                }
-                _that.listLoading = false;
-                _that.windowScroll();
-            })
-        },
-        //tab切换
-        tabClick: function (productType, index) {
-            this.currentTab = index;
-            this.listQuery.pageNum = 1;
-            this.listQuery.productType = productType;
-            this.productList = [];
-            this.getList();
-        },
-        // 高亮文字
-        formatTitle: function(val){
-            var reg = new RegExp(this.listQuery.keyword, 'g');
-            var str = '<span>' + this.listQuery.keyword + '</span>';
-            return val.replace(reg, str);
-        },
-        //搜索
-        handleSearch: function (keyword, flag) {
-            this.listQuery.linkageFlag = flag === true ? 1 : 0
-            this.listQuery.keyword = keyword;
-            this.listQuery.pageNum = 1;
-            this.productList = [];
-            this.openSearch = true;
-            // this.getList();
-            open('/document/beauty-archive.html?keyword=' + this.listQuery.keyword, '_self')
-        },
-        //跳转到商品详情
-        handleToDetail: function (product) {
-            var url = '';
-            if(!product.archiveId) {
-                window.location.href = '/404.html'
-            }
-            if (product.redirectType === 1) {
-                const globalUserData = window.globalUserData || null;
-                if(globalUserData){
-                    url = '/product-' + product.productId +'-'+globalUserData.userId+ '.html?open=caimei365';
-                }else{
-                    url = '/product-' + product.productId + '.html?open=caimei365';
-                }
-            } else if (product.redirectType === 2) {
-                url = '/document/archive-detail.html' + '?id=' + product.archiveId;
-            } else {
-                return;
-            }
-            window.open(url, '_blank');
-        },
-        //打开新窗口
-        openWindow: function (url) {
-            window.open(url, '_blank');
-        },
-        //窗口滚动事件
-        windowScroll: function () {
-            if (isPC) return;
-            var _that = this;
-            $(function () {
-                $(window).scroll(function () {
-                    clearTimeout(window.scrollTimer);
-                    window.scrollTimer = setTimeout(function () {
-                        var scorllTop = $(window).scrollTop();
-                        var contentHeight = $('body').height();
-                        var clientHeight = $(window).height();
-                        if (contentHeight - scorllTop - 10 <= clientHeight) {
-                            if(!_that.hasNextPage) return;
-                            _that.listQuery.pageNum ++;
-                            _that.getList();
-                        }
-                    }, 200);
-                });
-            });
-        }
-    }
-});
-
-
-
-
-
+var isPC = $(window).width() > 768;
+var clientWidth = $(window).width() ;
+$(window).on('resize', function () {
+    var change = $(window).width() > 768;
+    clientWidth = $(window).width();
+    if (isPC === change) return;
+    window.location.reload();
+});
+
+function getUrlParam(name) {
+    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+    var r = decodeURIComponent(window.location.search).substr(1).match(reg);
+    if (r != null) {
+        return (r[2])
+    }
+    return null;
+}
+
+//美业资料库列表
+var beautyArchive = new Vue({
+    el: '#beautyArchive',
+    mixins: [cmSysVitaMixins],
+    data: {
+        listLoading: false,
+        total: 0, // 商品总数
+        totalPage: 0,// 分页数
+        jumpPageSize: '',
+        listQuery: {
+            keyword: '', //查询关键词
+            productType: 0, //商品类型 0 全部 1 仪器 2 产品
+            pageNum: 1,
+            pageSize: 10,
+            productFlag: 1, // 是否统计关键词 1 统计 0 不统计
+            linkageFlag: 0 // 关键词来源是否为用户搜索 0 是 1 不是
+        },
+        keyword: '',
+        productList: [],  //商品列表
+        hasNextPage: false,
+        showPageBtn: 6,
+        openSearch: false, //开启搜索
+        currentTab: 0,
+        tabList: [{
+            id: 0,
+            name: '全部'
+        }, {
+            id: 1,
+            name: '产品'
+        }, {
+            id: 2,
+            name: '仪器'
+        }]
+    },
+    watch: {
+        keyword: function (val) {
+            if (val) return;
+            this.openSearch = false;
+            this.listQuery.keyword = '';
+            // this.getList();
+        }
+    },
+    created(){
+        this.keyword = this.listQuery.keyword = getUrlParam('keyword') || ''
+    },
+    mounted() {
+        this.getList();
+        this.initAuthInputComplete();
+    },
+    computed: {
+        loadingText: function () {
+            return this.hasNextPage ? '上滑加载更多' : '没有更多了';
+        },
+        pagination: function () {
+            var index = this.listQuery.pageNum, arr = [];
+            if (this.totalPage <= 6) {
+                for (var i = 1; i <= this.totalPage; i++) {
+                    arr.push(i);
+                }
+                return arr;
+            }
+            if (index <= 3) {
+                return [1, 2, 3, 4, 5, 0, this.totalPage];
+            }
+            if (index >= this.totalPage - 2) {
+                return [1, 0, this.totalPage - 4, this.totalPage - 3, this.totalPage - 2, this.totalPage - 1, this.totalPage];
+            }
+            return [1, 0, index - 2, index - 1, index, index + 1, index + 2, 0, this.totalPage];
+        }
+    },
+    filters: {
+        productType: function (val) {
+            if (val === 1) {
+                return '产品';
+            }
+            if (val === 2) {
+                return '仪器';
+            }
+            return '未知';
+        }
+    },
+    methods: {
+        // init auto-input complete
+        initAuthInputComplete(){
+            var _self = this;
+            new AutoComplete({
+                el: '.auto-input',
+                setValueFlag: false,
+                callback: async function(keyword){
+                    try {
+                        const res = await PublicApi.fetchQueryKeywordList({keyword: keyword});
+                        if(!res.data) return [];
+                        return res.data.map(item => item.keyword);
+                    } catch (e) {
+                        console.log(e);
+                    }
+                },
+                itemClick: function (keyword) {
+                    _self.keyword = keyword;
+                    _self.handleSearch(keyword, true);
+                }
+            });
+        },
+        //页码跳转
+        toPagination: function (pageNum) {
+            if (pageNum > this.totalPage || pageNum <= 0) {
+                return this.jumpPageSize = '';
+            }
+            this.listQuery.pageNum = parseInt(pageNum);
+            this.getList(); //获取列表
+        },
+        //获取商品列表
+        getList: function () {
+            const _that = this;
+            _that.listLoading = true;
+            BeautyArchiveApi.GetArchiveProduct(this.listQuery, function (res) {
+                if (res.code !== 0) return console.log('请求失败');
+                _that.hasNextPage = res.data.hasNextPage;
+                _that.listQuery.pageNum = res.data.pageNum;
+                _that.listQuery.pageSize = res.data.pageSize;
+                _that.total = res.data.totalRecord;
+                _that.totalPage = res.data.totalPage;
+                if (isPC) {
+                    _that.productList = res.data.results;
+                } else {
+                    _that.productList = _that.productList.concat(res.data.results);
+                }
+                _that.listLoading = false;
+                _that.windowScroll();
+            })
+        },
+        //tab切换
+        tabClick: function (productType, index) {
+            this.currentTab = index;
+            this.listQuery.pageNum = 1;
+            this.listQuery.productType = productType;
+            this.productList = [];
+            this.getList();
+        },
+        // 高亮文字
+        formatTitle: function(val){
+            var reg = new RegExp(this.listQuery.keyword, 'g');
+            var str = '<span>' + this.listQuery.keyword + '</span>';
+            return val.replace(reg, str);
+        },
+        //搜索
+        handleSearch: function (keyword, flag) {
+            this.listQuery.linkageFlag = flag === true ? 1 : 0
+            this.listQuery.keyword = keyword;
+            this.listQuery.pageNum = 1;
+            this.productList = [];
+            this.openSearch = true;
+            // this.getList();
+            open('/document/beauty-archive.html?keyword=' + this.listQuery.keyword, '_self')
+        },
+        //跳转到商品详情
+        handleToDetail: function (product) {
+            var url = '';
+            if(!product.archiveId) {
+                window.location.href = '/index.html'
+            }
+            if (product.redirectType === 1) {
+                const globalUserData = window.globalUserData || null;
+                if(globalUserData){
+                    url = '/product-' + product.productId +'-'+globalUserData.userId+ '.html?open=caimei365';
+                }else{
+                    url = '/product-' + product.productId + '.html?open=caimei365';
+                }
+            } else if (product.redirectType === 2) {
+                url = '/document/archive-detail.html' + '?id=' + product.archiveId;
+            } else {
+                return;
+            }
+            window.open(url, '_blank');
+        },
+        //打开新窗口
+        openWindow: function (url) {
+            window.open(url, '_blank');
+        },
+        //窗口滚动事件
+        windowScroll: function () {
+            if (isPC) return;
+            var _that = this;
+            $(function () {
+                $(window).scroll(function () {
+                    clearTimeout(window.scrollTimer);
+                    window.scrollTimer = setTimeout(function () {
+                        var scorllTop = $(window).scrollTop();
+                        var contentHeight = $('body').height();
+                        var clientHeight = $(window).height();
+                        if (contentHeight - scorllTop - 10 <= clientHeight) {
+                            if(!_that.hasNextPage) return;
+                            _that.listQuery.pageNum ++;
+                            _that.getList();
+                        }
+                    }, 200);
+                });
+            });
+        }
+    }
+});
+
+
+
+
+

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

@@ -1,59 +1,59 @@
-var equipmentDetail = new Vue({
-    el: "#equipmentDetail",
-    data: {
-        equipmentId: 0,
-        userId: 6,
-        userIdentity: '',
-        bgClass:'',
-        recommends: {},
-        listLoading:true
-    },
-    computed: {},
-    methods: {
-        getRecommendById: function(){
-            var _self = this;
-            if(this.equipmentId ===0){return;}
-            ProductApi.GetEquipmentDdtailsRecommend({ equipmentId: this.equipmentId,userId:_self.userId},function (response) {
-                if (response.code === 0 && response.data) {
-                    _self.recommends = response.data;
-                    if( _self.recommends.backgroundImageWay == 1){
-                        _self.bgClass = 'bg-repeat';
-                    }else{
-                        _self.bgClass = 'bg-cover';
-                    }
-                    _self.listLoading = false;
-                }else if(response.code === 1){
-                    window.location.href = "/404.html?error=未查询到该项目仪器";
-                }else{
-                    CAIMEI.Alert(response.msg, '确定', true,function(){
-                        window.location.href = "/equipment/list.html";
-                    });
-                }
-            });
-        }
-    },
-    created: function () {
-        var paramsArr = window.location.pathname.split(".")[0].split("-");
-        this.equipmentId =  paramsArr.length>=1 ? paramsArr[1] : '';
-        var userInfo = localStorage.getItem('userInfo');
-        if(userInfo){
-            this.userId = JSON.parse(userInfo).userId*1;
-        }
-        this.getRecommendById();
-    },
-    mounted: function () {
-        $('.detailInfo').slide({
-            mainCell:".tabCon"
-            ,titCell:".tabTit span"
-            ,trigger: "click"
-        });
-    }
-});
-//分项二维码
-$(function () {
-    $('.share .code').qrcode({
-        width: 120,
-        height: 120,
-        text: window.location.href
-    });
-});
+var equipmentDetail = new Vue({
+    el: "#equipmentDetail",
+    data: {
+        equipmentId: 0,
+        userId: 6,
+        userIdentity: '',
+        bgClass:'',
+        recommends: {},
+        listLoading:true
+    },
+    computed: {},
+    methods: {
+        getRecommendById: function(){
+            var _self = this;
+            if(this.equipmentId ===0){return;}
+            ProductApi.GetEquipmentDdtailsRecommend({ equipmentId: this.equipmentId,userId:_self.userId},function (response) {
+                if (response.code === 0 && response.data) {
+                    _self.recommends = response.data;
+                    if( _self.recommends.backgroundImageWay == 1){
+                        _self.bgClass = 'bg-repeat';
+                    }else{
+                        _self.bgClass = 'bg-cover';
+                    }
+                    _self.listLoading = false;
+                }else if(response.code === 1){
+                    window.location.href = "/index.html";
+                }else{
+                    CAIMEI.Alert(response.msg, '确定', true,function(){
+                        window.location.href = "/equipment/list.html";
+                    });
+                }
+            });
+        }
+    },
+    created: function () {
+        var paramsArr = window.location.pathname.split(".")[0].split("-");
+        this.equipmentId =  paramsArr.length>=1 ? paramsArr[1] : '';
+        var userInfo = localStorage.getItem('userInfo');
+        if(userInfo){
+            this.userId = JSON.parse(userInfo).userId*1;
+        }
+        this.getRecommendById();
+    },
+    mounted: function () {
+        $('.detailInfo').slide({
+            mainCell:".tabCon"
+            ,titCell:".tabTit span"
+            ,trigger: "click"
+        });
+    }
+});
+//分项二维码
+$(function () {
+    $('.share .code').qrcode({
+        width: 120,
+        height: 120,
+        text: window.location.href
+    });
+});

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

@@ -112,7 +112,7 @@ var fleaMarket = new Vue({
                      },500);
                }else {
                     _this.isRequest =false;
-                   window.location.href = "/404.html?error=未查询到该商品";
+                   window.location.href = "/index.html";
                }
 
          })

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

@@ -14,7 +14,9 @@ var homeData = new Vue({
         centerImage:{},//广告活动弹窗
         topAdvertisement:{},// 专属广告图
         couponEntry:2,// 活动优惠券弹窗显示控制
-        hotListPageFloor:[],// 新品橱窗
+        hotListPageFloor:[
+            { title:'新品橱窗', detail:'美业新品 就上采美' }
+        ],// 新品橱窗
         homePageFloor:[],//楼层
         quickoperaList: [], // 快捷运营入口列表
         supplierList:[],// 优质供应商列表

src/main/resources/static/js/product/alliance-page.js

@@ -1,155 +1,155 @@
-'use strict';
-// loading组件
-var LoadingWrap = {
-    name: 'Loading',
-    render: function render(h) {
-        return h('div', { class: ['loading-wrap'] }, [h('img', { attrs: { src: '/img/alliance-page/loading.gif', alt: 'loading' } })]);
-    }
-};
-
-function remove(el) {
-    el.removeChild(el.instance.$el);
-}
-
-function append(el) {
-    el.appendChild(el.instance.$el);
-}
-
-// 定义 loading 指令
-var loadingDirective = {
-    inserted: function inserted(el, binding) {
-        // 创建 loading 组件构造函数
-        var LoadingCtor = Vue.extend(LoadingWrap);
-        // new 一个 loading组件实例
-        var loadingInstance = new LoadingCtor();
-        // 组件挂载
-        el.instance = loadingInstance.$mount();
-        // 传入值为 true 时才展示
-        if (binding.value) {
-            // 将组件挂载到绑定指令的元素上
-            append(el);
-        }
-    },
-    update: function update(el, binding) {
-        // 值更新时进行操作
-        if (binding.value !== binding.oldValue) {
-            binding.value ? append(el) : remove(el);
-        }
-    }
-};
-
-// vue实例
-var zplm = new Vue({
-    el: '#zplm',
-    directives: {
-        loading: loadingDirective
-    },
-    data: {
-        isPc: $(window).width() > 768,
-        authCardVisible: false,
-        statementVisible: false,
-        showStatementContent: false,
-        wechatVisible: true,
-        showMask: false,
-        isRequest: true,
-        // 产品id
-        productId: '',
-        //产品参数对象
-        productAuthInfo: {},
-        //错误信息
-        errorMessage: '',
-        // 定时器
-        timer: null
-    },
-    computed: {
-        // 封面图 主图
-        coverImage: function coverImage() {
-            return this.isPc ? this.productAuthInfo.pcImage : this.productAuthInfo.appletsImage;
-        },
-
-        // 授权机构
-        authOrigin: function authOrigin() {
-            return this.productAuthInfo.agentFlag !== 0 ? this.productAuthInfo.shopName : this.productAuthInfo.brandName;
-        },
-
-        // 不换行
-        noWarp: function noWarp() {
-            if (this.isPc && this.productAuthInfo.paramList.length > 1) return { 'white-space': 'nowrap' };
-            return '';
-        }
-    },
-    created: function created() {
-        this.getProductId();
-        this.fetchProductAuthInfo();
-    },
-
-    filters: {
-        // 处理sn码
-        snCode: function snCode(code) {
-            if (!code) return '';
-            return code.replace(/^(\w{2})\w+(\w{4})$/, "$1******$2");
-        }
-    },
-    methods: {
-        // 获取商品id
-        getProductId: function getProductId() {
-            var productId = window.location.pathname.split('-')[1].split('.')[0];
-            this.productId = parseInt(productId);
-        },
-
-        // 获取授权信息
-        fetchProductAuthInfo: function fetchProductAuthInfo() {
-            var that = this;
-            var zplmServer = $('#zplmServer').val()
-            var data = {productId:that.productId}
-            $.ajax({
-                url: zplmServer + '/wx/auth/product/details',
-                data: data,
-                xhrFields: {//此处为跨域后台保持session一致,切勿删除!!!
-                    withCredentials: true
-                },
-                type: 'GET',
-                dataType: "json",
-                async: false,
-                // contentType: contentType,
-                contentType: 'application/json;charset=UTF-8',
-            }).then(res => {
-                // 获取授权信息失败
-                if (res.code) {
-                    that.isRequest = false;
-                    return that.errorMessage = res.msg;
-                }
-                // 获取授权信息成功
-                that.productAuthInfo = res.data;
-                that.isRequest = false;
-            })
-            setTimeout(function(){
-                if(that.isRequest){
-                    that.isRequest = false;
-                    location.href = '/404.html'
-                }
-            }, 10000)
-        },
-
-        // 显示授权牌
-        handleShowAuthCard: function handleShowAuthCard() {
-            this.authCardVisible = !this.authCardVisible;
-            this.showMask = !this.showMask;
-        },
-
-        // 显示声明弹窗
-        handleShowStatement: function handleShowStatement() {
-            var that = this;
-            this.statementVisible = !this.statementVisible;
-            this.showMask = !this.showMask;
-            this.timer = setTimeout(function () {
-                that.showStatementContent = !that.showStatementContent;
-            }, 800);
-        },
-
-        // 显示微信二维码
-        handleShowWechat: function handleShowWechat() {
-            this.wechatVisible = !this.wechatVisible;
-        }
-    }
-});
+'use strict';
+// loading组件
+var LoadingWrap = {
+    name: 'Loading',
+    render: function render(h) {
+        return h('div', { class: ['loading-wrap'] }, [h('img', { attrs: { src: '/img/alliance-page/loading.gif', alt: 'loading' } })]);
+    }
+};
+
+function remove(el) {
+    el.removeChild(el.instance.$el);
+}
+
+function append(el) {
+    el.appendChild(el.instance.$el);
+}
+
+// 定义 loading 指令
+var loadingDirective = {
+    inserted: function inserted(el, binding) {
+        // 创建 loading 组件构造函数
+        var LoadingCtor = Vue.extend(LoadingWrap);
+        // new 一个 loading组件实例
+        var loadingInstance = new LoadingCtor();
+        // 组件挂载
+        el.instance = loadingInstance.$mount();
+        // 传入值为 true 时才展示
+        if (binding.value) {
+            // 将组件挂载到绑定指令的元素上
+            append(el);
+        }
+    },
+    update: function update(el, binding) {
+        // 值更新时进行操作
+        if (binding.value !== binding.oldValue) {
+            binding.value ? append(el) : remove(el);
+        }
+    }
+};
+
+// vue实例
+var zplm = new Vue({
+    el: '#zplm',
+    directives: {
+        loading: loadingDirective
+    },
+    data: {
+        isPc: $(window).width() > 768,
+        authCardVisible: false,
+        statementVisible: false,
+        showStatementContent: false,
+        wechatVisible: true,
+        showMask: false,
+        isRequest: true,
+        // 产品id
+        productId: '',
+        //产品参数对象
+        productAuthInfo: {},
+        //错误信息
+        errorMessage: '',
+        // 定时器
+        timer: null
+    },
+    computed: {
+        // 封面图 主图
+        coverImage: function coverImage() {
+            return this.isPc ? this.productAuthInfo.pcImage : this.productAuthInfo.appletsImage;
+        },
+
+        // 授权机构
+        authOrigin: function authOrigin() {
+            return this.productAuthInfo.agentFlag !== 0 ? this.productAuthInfo.shopName : this.productAuthInfo.brandName;
+        },
+
+        // 不换行
+        noWarp: function noWarp() {
+            if (this.isPc && this.productAuthInfo.paramList.length > 1) return { 'white-space': 'nowrap' };
+            return '';
+        }
+    },
+    created: function created() {
+        this.getProductId();
+        this.fetchProductAuthInfo();
+    },
+
+    filters: {
+        // 处理sn码
+        snCode: function snCode(code) {
+            if (!code) return '';
+            return code.replace(/^(\w{2})\w+(\w{4})$/, "$1******$2");
+        }
+    },
+    methods: {
+        // 获取商品id
+        getProductId: function getProductId() {
+            var productId = window.location.pathname.split('-')[1].split('.')[0];
+            this.productId = parseInt(productId);
+        },
+
+        // 获取授权信息
+        fetchProductAuthInfo: function fetchProductAuthInfo() {
+            var that = this;
+            var zplmServer = $('#zplmServer').val()
+            var data = {productId:that.productId}
+            $.ajax({
+                url: zplmServer + '/wx/auth/product/details',
+                data: data,
+                xhrFields: {//此处为跨域后台保持session一致,切勿删除!!!
+                    withCredentials: true
+                },
+                type: 'GET',
+                dataType: "json",
+                async: false,
+                // contentType: contentType,
+                contentType: 'application/json;charset=UTF-8',
+            }).then(res => {
+                // 获取授权信息失败
+                if (res.code) {
+                    that.isRequest = false;
+                    return that.errorMessage = res.msg;
+                }
+                // 获取授权信息成功
+                that.productAuthInfo = res.data;
+                that.isRequest = false;
+            })
+            setTimeout(function(){
+                if(that.isRequest){
+                    that.isRequest = false;
+                    location.href = '/index.html'
+                }
+            }, 10000)
+        },
+
+        // 显示授权牌
+        handleShowAuthCard: function handleShowAuthCard() {
+            this.authCardVisible = !this.authCardVisible;
+            this.showMask = !this.showMask;
+        },
+
+        // 显示声明弹窗
+        handleShowStatement: function handleShowStatement() {
+            var that = this;
+            this.statementVisible = !this.statementVisible;
+            this.showMask = !this.showMask;
+            this.timer = setTimeout(function () {
+                that.showStatementContent = !that.showStatementContent;
+            }, 800);
+        },
+
+        // 显示微信二维码
+        handleShowWechat: function handleShowWechat() {
+            this.wechatVisible = !this.wechatVisible;
+        }
+    }
+});

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

@@ -4,26 +4,26 @@ var supplierHome = new Vue({
     data: {
         requestFlag: true,
         userId: 0,
-        supplierInfo:{},
+        supplierInfo: {},
         supplierBanner: [],
         shopCategory: [],
-        mainProducts:[],
-        choiceIndex:'',
-        handleTabIndex:1,
+        mainProducts: [],
+        choiceIndex: '',
+        handleTabIndex: 1,
         params: {
             size: 12,
             num: 1,
             id: 0,
             keyword: ''
         },
-        listRecord:0,
-        productLists:[],
-        categoryProducts:[],// 类别商品列表
-        isShopAll:true,
-        addhtml:'<span class="tag">美博会</span>'
+        listRecord: 0,
+        productLists: [],
+        categoryProducts: [],// 类别商品列表
+        isShopAll: true,
+        addhtml: '<span class="tag">美博会</span>'
     },
     computed: {
-        floorData: function() {
+        floorData: function () {
             return [
                 {
                     type: 1,
@@ -41,51 +41,53 @@ var supplierHome = new Vue({
         }
     },
     filters: {
-        NumFormat:function(value) {
+        NumFormat: function (value) {
             return Number(value).toFixed(2);
         }
     },
     methods: {
-        handleTabClick(type){
+        handleTabClick(type) {
             this.handleTabIndex = type
         },
         // 是否显示vip标签价格
-        showVipPriceTag(pros){
+        showVipPriceTag(pros) {
             //非会员
             // if(!GLOBAL_VIP_FLAG === 1) return false;
             // 商品所有机构可见
-            if(pros.priceFlag === 0 ) return true;
+            if (pros.priceFlag === 0) return true;
             // 商品价格仅资质机构可见
-            if(pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
+            if (pros.priceFlag === 2 && GLOBAL_USER_IDENTITY === 2) return true;
             // 商品价格仅医美机构可见
-            if(pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 &&  GLOBAL_CLUB_TYPE === 1) return true;
+            if (pros.priceFlag === 3 && GLOBAL_USER_IDENTITY === 2 && GLOBAL_CLUB_TYPE === 1) return true;
             // 其它
             return false;
         },
-        getShopInfo(){
+        getShopInfo() {
             const _self = this;
-            SupplierApi.getShopHomeData({shopId: this.params.id}, function (res) {
+            SupplierApi.getShopHomeData({shopId: this.params.id, userId: this.userId}, function (res) {
                 if (res.code === 0) {
                     const data = res.data
-                    _self.supplierInfo = data;
+                    _self.supplierInfo = data
                     _self.supplierBanner = data.shopHomeImages // 供应商轮播
                     _self.shopCategory = data.shopCategory// 供应商类别
-                    setTimeout(function(){
+                    this.getMainProducts()
+                    this.getProductLists()
+                    setTimeout(function () {
                         if (isPC) {
                             $('#supplierBanner').slide({
-                                mainCell:".swiper-wrapper"
-                                ,titCell:".swiper-pagination span"
-                                ,effect: "leftLoop"
-                                ,prevCell:".swiper-button-prev"
-                                ,nextCell:".swiper-button-next"
-                                ,interTime: 2000
-                                ,autoPlay: true
-                                ,autoPage: false
-                                ,trigger: "mouseover"
+                                mainCell: ".swiper-wrapper"
+                                , titCell: ".swiper-pagination span"
+                                , effect: "leftLoop"
+                                , prevCell: ".swiper-button-prev"
+                                , nextCell: ".swiper-button-next"
+                                , interTime: 2000
+                                , autoPlay: true
+                                , autoPage: false
+                                , trigger: "mouseover"
                             });
                         } else {
-                            var swiper = new Swiper('#supplierBanner', {
-                                loop : true,
+                            const swiper = new Swiper('#supplierBanner', {
+                                loop: true,
                                 autoplay: {
                                     delay: 2000,
                                     disableOnInteraction: false
@@ -96,34 +98,36 @@ var supplierHome = new Vue({
                                 },
                                 pagination: {
                                     el: '.swiper-pagination',
-                                    clickable :true
+                                    clickable: true
                                 }
-                            });
+                            })
                         }
-                    },500);
+                    }, 500);
+                }else if(res.code === -2){
+                    window.location.href = '/index.html'
                 }
             });
         },
         // 点击全部
-        handleChangeAll(){
+        handleChangeAll() {
             this.choiceIndex = ''
             this.isShopAll = true
             this.getMainProducts()
             this.getProductLists(false)
         },
-        handleCategory(category, index){
+        handleCategory(category, index) {
             this.isShopAll = false
             this.choiceIndex = index
-            this.getCategoryProducts({ shopId:this.handleShopId,categoryId:category.id })
+            this.getCategoryProducts({shopId: this.handleShopId, categoryId: category.id})
         },
         // 获取类别商品列表
-        getCategoryProducts(params){
+        getCategoryProducts(params) {
             const _self = this;
             SupplierApi.getCategoryProducts(params, function (res) {
                 if (res.code === 0) {
-                    if(_self.userId && _self.userId>0){
+                    if (_self.userId && _self.userId > 0) {
                         const productIdArr = [];
-                        res.data.map((item) =>{
+                        res.data.map((item) => {
                             // 0公开价格 1不公开价格 2仅对会员机构公开
                             if (item.priceFlag !== 1) {
                                 productIdArr.push(item.productId)
@@ -134,44 +138,39 @@ var supplierHome = new Vue({
                         });
                     }
                     _self.categoryProducts = res.data
-                    setTimeout(function(){
+                    setTimeout(function () {
                         // 图片懒加载
                         $("img[data-original]").lazyload();
-                    },500);
+                    }, 500);
                 }
             });
         },
-        getMainProducts(){
-            var _self = this;
-            SupplierApi.GetShopProductMain(
-                {
-                    shopId: _self.params.id,
-                    identity: IDENTITY
-                },
-                function (res) {
-                    if (res.code === 0 && res.data) {
-                        if(_self.userId && _self.userId>0){
-                            var productIdArr = [];
-                            res.data.map(function (item) {
-                                // 0公开价格 1不公开价格 2仅对会员机构公开
-                                if (item.priceFlag !== 1) {
-                                    productIdArr.push(item.productId)
-                                }
-                            });
-                            setProductPrice(res.data, productIdArr.join(","), _self.userId, function () {
+        getMainProducts() {
+            const _self = this;
+            SupplierApi.GetShopProductMain({ shopId: _self.params.id,identity: IDENTITY },function (res) {
+                if (res.code === 0 && res.data) {
+                    if (_self.userId && _self.userId > 0) {
+                        const productIdArr = [];
+                        res.data.map(function (item) {
+                            // 0公开价格 1不公开价格 2仅对会员机构公开
+                            if (item.priceFlag !== 1) {
+                                productIdArr.push(item.productId)
+                            }
+                        });
+                        setProductPrice(res.data, productIdArr.join(","), _self.userId, function () {
                                 _self.$forceUpdate();
                             });
                         }
                         _self.mainProducts = res.data;
-                        setTimeout(function(){
+                        setTimeout(function () {
                             // 图片懒加载
                             $("img[data-original]").lazyload();
-                        },500);
+                        }, 500);
                     }
                 }
             );
         },
-        getProductLists(flag){
+        getProductLists(flag) {
             const _self = this;
             SupplierApi.GetSearchQueryProductSupplier(
                 {
@@ -179,7 +178,7 @@ var supplierHome = new Vue({
                     pageSize: _self.params.size,
                     pageNum: _self.params.num,
                     identity: IDENTITY,
-                    id:_self.params.id
+                    id: _self.params.id
                 },
                 function (res) {
                     if (res.code === 0 && res.data) {
@@ -192,23 +191,23 @@ var supplierHome = new Vue({
                                 $("img[data-original]").lazyload();
                             }, 500);
                         });
-                        if(flag){
+                        if (flag) {
                             _self.productLists = _self.productLists.concat(resultData);
-                        }else{
+                        } else {
                             _self.productLists = []
                             _self.productLists = resultData
                         }
-                        console.log('productLists',_self.productLists)
+                        console.log('productLists', _self.productLists)
                         _self.requestFlag = true;
                     }
                 }
             );
         },
-        PromotionsFormat(promo){//促销活动类型数据处理
-            if(promo!=null){
-                if(promo.type === 1 && promo.mode === 1){
+        PromotionsFormat(promo) {//促销活动类型数据处理
+            if (promo != null) {
+                if (promo.type === 1 && promo.mode === 1) {
                     return true
-                }else{
+                } else {
                     return false
                 }
             }
@@ -217,17 +216,17 @@ var supplierHome = new Vue({
         keyupSearch(event) {
             // 搜索输入框 按回车键搜索
             var keyCode = event.keyCode || event.which;
-            if(keyCode === 13){
+            if (keyCode === 13) {
                 this.supplierSearch();
             }
         },
-        supplierSearch(){
+        supplierSearch() {
             if (this.params.keyword.length < 2) {
                 $.confirm({
                     useBootstrap: false,
-                    boxWidth: (isPC?'300px':'70%'),
-                    title:'提示',
-                    content:'请至少输入两个关键字！',
+                    boxWidth: (isPC ? '300px' : '70%'),
+                    title: '提示',
+                    content: '请至少输入两个关键字！',
                     closeIcon: true,
                     animation: 'opacity',
                     closeAnimation: 'opacity',
@@ -246,31 +245,28 @@ var supplierHome = new Vue({
             this.productLists = [];
             this.getProductLists(false);
             var floorScroll = $('#supProduct').offset().top;
-            $('html,body').animate({scrollTop: floorScroll},600);
+            $('html,body').animate({scrollTop: floorScroll}, 600);
         },
         upgrade: function () {
-            location.href='/upgrade.html';
+            location.href = '/upgrade.html';
         }
     },
-    created(){
+    created() {
         const paramsArr = window.location.pathname.split(".")[0].split("-");
-        this.params.id = this.cmSysParams.shopId = this.handleShopId =  paramsArr.length>=1 ? paramsArr[1]*1 : 0;
+        this.params.id = this.cmSysParams.shopId = this.handleShopId = paramsArr.length >= 1 ? paramsArr[1] * 1 : 0;
         this.cmSysParams.pageType = 14;
         this.cmSysParams.pageLabel = `供应商主页`;//设置统计数据标签
-    },
-    mounted: function () {
-        const _self = this;
-        const userInfo = localStorage.getItem('userInfo');
-        if(this.params.id !== 0) {
-            this.getShopInfo();
-            this.getMainProducts();
-            this.getProductLists();
+        if (globalUserData) {
+            this.userId = globalUserData.userId;
         }
-        if(userInfo){
-            this.userId = JSON.parse(userInfo).userId;
+        if (this.params.id !== 0) {
+            this.getShopInfo();
         }
+    },
+    mounted: function () {
         //上垃加载更多
-        $(window).on('scroll', function(){
+        const _self = this;
+        $(window).on('scroll', function () {
             const scrollTop = $(this).scrollTop();
             const scrollHeight = $(document).height();
             const windowHeight = window.innerHeight + $("footer").height();
@@ -278,8 +274,8 @@ var supplierHome = new Vue({
                 //此处是滚动条到底部时候触发的事件，在这里写要加载的数据，或者是拉动滚动条的操作
                 const totalPage = Math.ceil(_self.listRecord / _self.params.size) ? Math.ceil(_self.listRecord / _self.params.size) : 1;
                 const next = _self.params.num + 1;
-                if(next <= totalPage){
-                    if (_self.requestFlag){
+                if (next <= totalPage) {
+                    if (_self.requestFlag) {
                         _self.params.num = next;
                         // 获取列表数据
                         _self.getProductLists(true);
@@ -288,7 +284,7 @@ var supplierHome = new Vue({
                 }
             }
         });
-        $('body').on("click", '.showSearch', function(){
+        $('body').on("click", '.showSearch', function () {
             $('.supplierTit .search').show();
         })
     }

src/main/resources/templates/components/footer.html

@@ -94,7 +94,7 @@
             <img class="close" @click="isShowIcon = false" src="https://static.caimei365.com/app/img/supplier-login/close_icon.png">
     </div>
     <div id="scrollTop">
-        <div class="item item-cart" @click="handleClickCart">
+        <div class="item item-cart" @click="handleClickCart" v-if="userInfo.userIdentity!== 3">
             <i class="icon icon-cart"></i>
             <span class="toCart">购物车</span>
             <em class="toNumber" v-if="GLOBAL_USER_ID > 0" v-text="footerCartCount"></em>

src/main/resources/templates/error/404.html

@@ -94,9 +94,9 @@
     const matchInfo = window.location.pathname.indexOf("info") !== -1
     if(!($('#coreServer').val() && $('#coreServer').val().length>0)){
         if (matchInfo) {
-            window.location.href = '/info/404.html'
+            window.location.href = '/info/center-3-1.html'
         } else {
-            window.location.href = '/404.html';
+            window.location.href = '/index.html';
         }
     }
 </script>

src/main/resources/templates/index.html

@@ -27,16 +27,16 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 首页 -->
-<div id="container" v-cloak>
+<div id="container" class="clear">
     <!--首页图片轮播-->
     <div class="section_container">
         <div class="inner">
-                <div class="section-content-image" th:if="${topAdvertisement}">
-                    <a th:href="${topAdvertisement.link}" class="section-image-view" target="_blank">
-                        <img th:src="${topAdvertisement.image}" alt="">
-                    </a>
-                </div>
-            <div class="section-content">
+            <div class="section-content-image" th:if="${topAdvertisement}">
+                <a th:href="${topAdvertisement.link}" class="section-image-view" target="_blank">
+                    <img th:src="${topAdvertisement.image}" alt="">
+                </a>
+            </div>
+            <div class="section-content" v-cloak>
                 <div class="section-content-naves">
                     <div class="category-menu-tabs">
                         <div class="menu-tabs-item" :class="categoryTabIndex === 1 ? 'active': '' "
@@ -139,10 +139,10 @@
                                                                 <div class="title-1-item"></div>
                                                                 <div class="title-2-item">GO></div>
                                                             </div>
-                                                            <div class="title-2">{{i.remark || ''}}</div>
+                                                            <div class="title-2" v-text="i.remark"></div>
                                                         </template>
                                                         <template v-else>
-                                                            <p>{{i.name}}</p>
+                                                            <p v-text="i.name"></p>
                                                         </template>
                                                     </div>
                                                 </div>
@@ -163,7 +163,7 @@
                                                             <el-image style="width: 100%; height: 100%;"
                                                                       :src="i.icon"></el-image>
                                                         </div>
-                                                        <div class="list-title"><p>{{i.name}}</p></div>
+                                                        <div class="list-title"><p v-text="i.name"></p></div>
                                                     </div>
                                                 </div>
                                             </div>
@@ -352,7 +352,7 @@
                         <h1 data-id="0" v-text="floor.title"></h1><span v-text="floor.detail"></span>
                         <a class="section_page_btn" href="/product/hot.html" target="_blank"></a>
                     </div>
-                    <div class="swiper-container-floor hotList mySwiper" id="recommendBox">
+                    <div class="swiper-container-floor hotList mySwiper" id="recommendBox"  v-cloak>
                         <div class="swiper-wrapper section_page_main type_08  recommendBox-wrapperHot clear mfw section_8 max">
                             <!-- 商品/图片 列表 -->
                             <a href="javascript:void(0)" onclick="handleHotStatistics($(this))"
@@ -541,7 +541,7 @@
     <div class="section_container main-content clear">
         <div class="inner">
             <template v-if="userId > 0">
-                <div class="section-page-content">
+                <div class="section-page-content"  v-cloak>
                     <div class="section-page-item" v-for="(floor,flIndex) in homePageFloor">
                         <div class="section-page-top">
                             <div class="section-page-title" :style="{backgroundColor:floor.backColor}">
@@ -781,7 +781,7 @@
         </div>
     </div>
     <!--首页运营供应商-->
-    <div class="section_container main-content clear">
+    <div class="section_container main-content clear" v-cloak>
         <div class="inner">
             <div class="section-shop-content">
                 <div class="section-shop-title">
@@ -851,7 +851,7 @@
                     <h1>为您推荐<span>海量货源,实时推荐</span></h1>
                 </div>
                 <template v-if="userId > 0">
-                    <div class="section-floor-main clear">
+                    <div class="section-floor-main clear" v-cloak>
                         <a :href="'/product-'+pros.productId+'.html'"
                            class="floor-main-item"
                            target="_blank"