Merge branch 'developer' of http://git.caimei365.com/caimei365/caimei365-www into developerB

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

@@ -206,6 +206,8 @@ public class ArticleController extends BaseController {
         String subReferer = "";
         if (referer.length() > 200) {
             subReferer = referer.substring(0, 190);
+        } else {
+            subReferer = referer;
         }
         source = source(referer);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -338,26 +340,34 @@ public class ArticleController extends BaseController {
     private String source(String link) {
         if (link.contains("baidu.com")) {
             return "1";
-        } else if (link.contains("www.so.com")) {
+        }
+        if (link.contains("www.so.com")) {
             return "2";
-        } else if (link.contains("google")) {
+        }
+        if (link.contains("google")) {
             return "3";
-        } else if (link.contains("m.sm.cn")) {
+        }
+        if (link.contains("m.sm.cn")) {
             return "4";
-        } else if (link.contains("toutiao.com")) {
+        }
+        if (link.contains("toutiao.com")) {
             return "5";
-        } else if (link.contains("sogou.com")) {
+        }
+        if (link.contains("sogou.com")) {
             return "6";
-        } else if (link.contains("servicewechat.com")) {
+        }
+        if (link.contains("servicewechat.com")) {
             return "7";
-        } else if (link.contains("weibo.com")) {
+        }
+        if (link.contains("weibo.com")) {
             return "8";
-        } else if (link.contains("caimei365.com")) {
-            return "0";
-        } else if (link.contains("zzjtest.gz.aeert.com")) {
+        }
+        if (link.contains("caimei365.com")) {
             return "0";
-        } else {
+        }
+        if (link.contains("zzjtest.gz.aeert.com")) {
             return "0";
         }
+        return null;
     }
 }

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

@@ -68,6 +68,8 @@ public class HomeController extends BaseController {
         String subReferer = "";
         if (referer.length() > 200) {
             subReferer = referer.substring(0, 190);
+        } else {
+            subReferer = referer;
         }
         source = source(referer);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -119,26 +121,34 @@ public class HomeController extends BaseController {
     private String source(String link) {
         if (link.contains("baidu.com")) {
             return "1";
-        } else if (link.contains("so.com")) {
+        }
+        if (link.contains("www.so.com")) {
             return "2";
-        } else if (link.contains("google.cn")) {
+        }
+        if (link.contains("google")) {
             return "3";
-        } else if (link.contains("m.sm.cn")) {
+        }
+        if (link.contains("m.sm.cn")) {
             return "4";
-        } else if (link.contains("toutiao.com")) {
+        }
+        if (link.contains("toutiao.com")) {
             return "5";
-        } else if (link.contains("sogou.com")) {
+        }
+        if (link.contains("sogou.com")) {
             return "6";
-        } else if (link.contains("servicewechat.com")) {
+        }
+        if (link.contains("servicewechat.com")) {
             return "7";
-        } else if (link.contains("weibo.com")) {
+        }
+        if (link.contains("weibo.com")) {
             return "8";
-        } else if (link.contains("caimei365.com")) {
-            return "0";
-        } else if (link.contains("zzjtest.gz.aeert.com")) {
+        }
+        if (link.contains("caimei365.com")) {
             return "0";
-        } else {
+        }
+        if (link.contains("zzjtest.gz.aeert.com")) {
             return "0";
         }
+        return null;
     }
 }

src/main/resources/static/css/encyclopedia/detail.css

@@ -1,8 +1,8 @@
 .scapegoat{color: #F57C40 !important;}
 @media screen and (min-width:768px){main{background:#FAFAFA}
     img.scapegoat{vertical-align: -4px;margin:0 2px; cursor: pointer;}
-    .bk-banner{height:320px;position:relative;z-index:10;overflow:hidden}
-    .bk-banner img{display:block;height:320px;position:absolute;left:50%;top:0;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);width: 100%;object-fit: cover;}
+    .bk-banner{height:400px;position:relative;z-index:10;overflow:hidden}
+    .bk-banner img{display:block;height:400px;position:absolute;left:50%;top:0;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);width: 100%;object-fit: cover;}
     .bk-banner .bk-container{position:relative}
     .bk-banner .bk-name{position:absolute;font-size:32px;color:#756863;font-weight:bold;left:0;top:40px}
     .bk-detail{position:relative;z-index:20;background:#fff;-webkit-box-sizing:border-box;box-sizing:border-box;padding:40px 32px;-webkit-transform:translateY(-100px);-ms-transform:translateY(-100px);transform:translateY(-100px);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:14px;color:#333}
@@ -62,9 +62,9 @@
     .video-popup .close {position: absolute;right: 15px;top: 15px; width: 36px;height: 36px;background: url(/img/activity/pc_close.png);background-size: 36px;cursor: pointer;}
 }
 
-@media screen and (max-width:768px){.bk-banner{height:3.4rem;position:relative;z-index:10;overflow:hidden}
+@media screen and (max-width:768px){.bk-banner{height:4.1rem;position:relative;z-index:10;overflow:hidden}
     img.scapegoat{vertical-align: -4px;margin:0 2px; cursor: pointer;}
-    .bk-banner img{display:block;height:3.4rem;position:absolute;left:50%;top:0;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);width: 100%;object-fit: cover;}
+    .bk-banner img{display:block;height:4.1rem;position:absolute;left:50%;top:0;-webkit-transform:translateX(-50%);-ms-transform:translateX(-50%);transform:translateX(-50%);width: 100%;object-fit: cover;}
     .bk-detail{-webkit-box-sizing:border-box;box-sizing:border-box;font-size:0.28rem;line-height:0.48rem;background:#F5F5F5}
     .bk-entry-name{padding:0.4rem 0.32rem 0.32rem;background:#fff}
     .bk-entry-name .bk-name{font-size:0.36rem;font-weight:bold}

src/main/resources/static/css/supplier-center/encyclopedia/chart.css

@@ -7,16 +7,46 @@
   .baseHeadCenter .logo.none{border-right: none;}
   .baseHeadCenter.account .wrap{padding-top: 25px;}
   .baseHeadCenter.account{border-bottom: none;}
-  .header-title{float: left;}
-  .header-title p{line-height: 76px;font-size: 24px;color: #333333;font-weight: bold;}
-  .header-title span{line-height: 76px;font-size: 16px;color: #333333;font-weight: normal;}
+  .header-title{float: left;margin-left: 136px;}
+  .header-title p{line-height: 50px;font-size: 24px;color: #333333;font-weight: bold;}
+  .header-title span{line-height: 50px;font-size: 16px;color: #333333;font-weight: normal;}
   .chart-content{width: 1200px;margin: 0 auto;}
   .chart-content .chart-title{ width: 100%;float: left; line-height: 80px;font-size: 24px;color: #333333;font-weight: bold;}
   .chart-content .chart-title span{line-height: 80px;font-size: 16px;color: #333333;font-weight: normal;}
   .chart-content-text{ min-height: 100px;width: 100%;box-sizing: border-box;padding: 24px;background: #FFFFFF;float: left;margin-bottom: 16px; }
   .chart-content-text h1,.chart-content-text p{font-size: 14px;color: #666666;line-height: 28px;}
   .chart-content-main{width: 100%;height: auto;float: left;margin-bottom: 16px;}
-  .chart-main-top{width: 100%;height: auto; margin-top: 16px;}
+  .chart-main-top{width: 100%;height: 520px; margin-top: 16px;box-sizing: border-box;padding: 57px;background: #FFFFFF;}
+  .chart-main-top-title{ width: 100%;line-height: 40px;font-size: 24px;font-weight: bold;color: #333333;text-align: center;margin-bottom:30px;}
+  .chart-main-top-main{ width: 100%;height: 324px; }
+  .chart-main-top-left{width: 340px;height: 100%; float: left;}
+  .chart-main-top-left-li{ width: 100%;height: 63px;float: left;box-sizing: border-box;border-left: 3px solid #FFFFFF;margin-bottom: 2px;}
+  .chart-main-top-left-li .li-title{ float: left;line-height: 63px;font-size: 18px;font-weight: bold;color: #333333;box-sizing: border-box;padding: 0 10px;margin-right: 14px;text-align: center;}
+  .chart-main-top-left-li .li-texts{ width: 182px;box-sizing: border-box;height: 63px;padding: 10px 0;float: left;}
+  .chart-main-top-left-li .li-texts p{ line-height: 22px;font-size: 14px;color: #666666;}
+  .chart-main-top-left-li.a{border-color: #73C0DE;background: linear-gradient(89deg, #E1F6FE 0%, #FFFFFF 100%);}
+  .chart-main-top-left-li.b{border-color: #EE6666;background: linear-gradient(88deg, #FFECEC 0%, #FFFFFF 100%);}
+  .chart-main-top-left-li.c{border-color: #5470C6;background: linear-gradient(87deg, #E6ECFF 0%, #FFFFFF 100%);}
+  .chart-main-top-left-li.d{border-color: #91CC75;background: linear-gradient(87deg, #EEFEE7 0%, #FFFFFF 100%);}
+  .chart-main-top-left-li.e{border-color: #FAC858;background: linear-gradient(88deg, #FFF5DF 0%, #FFFFFF 100%);}
+  .chart-main-top-mids{width: 400px;height: 100%;float: left; }
+  .chart-main-top-mids-li{width: 100%;height: 64px;margin-bottom: 2px;}
+  .chart-main-top-mids-ch{margin: 0 auto; height: 100%;line-height: 64px;display: block;font-size: 16px;color: #ffffff;text-align: center;position: relative;transition:all 0.5s;}
+  .chart-main-top-mids-li:hover .chart-main-top-mids-ch{transform: scale(1.1);-ms-transform: scale(1.1);-webkit-transform: scale(1.1);color: #FFFFFF;}
+  .chart-main-top-mids-ch.a{ background: url("/img/encyclopedia/chart/chart_a@2x.png");}
+  .chart-main-top-mids-ch.b{width: 320px; background: url("/img/encyclopedia/chart/chart_b@2x.png");}
+  .chart-main-top-mids-ch.c{width: 240px; background: url("/img/encyclopedia/chart/chart_c@2x.png");}
+  .chart-main-top-mids-ch.d{width: 160px; background: url("/img/encyclopedia/chart/chart_d@2x.png");}
+  .chart-main-top-mids-ch.e{width: 80px; background: url("/img/encyclopedia/chart/chart_e@2x.png");}
+  .chart-main-top-right{width: 312px;height: 100%;float: left;margin-left: 34px; }
+  .chart-main-top-right-li{ width: 100%; height: 110px;box-sizing: border-box;padding: 22px 0 14px 0;border-bottom: 1px solid #E1E1E1; float: left;}
+  .chart-main-top-right-tips {width: 100%;height: 36px;margin-bottom: 10px; }
+  .chart-main-top-right-tips .tips{ display: inline-block;border-radius: 4px; box-sizing: border-box;padding: 0 10px;font-size: 18px;line-height: 36px;color: #333333;text-align: center;font-weight: bold;}
+  .chart-main-top-right-tips .tips.a{ background: #73C0DE; }
+  .chart-main-top-right-tips .tips.b{ background: #5470C6; }
+  .chart-main-top-right-tips .tips.c{ background: #91CC75; }
+  .chart-main-top-right-li p{ font-size: 14px;line-height: 22px;color: #666666; }
+
   .chart-main-bot{width: 100%;height: auto;}
   .chart-main-top img{width: 100%;height: auto;}
   .chart-main-bot img{width: 100%;height: auto;}
@@ -26,7 +56,8 @@
   .chart-main-min{width: 592px;height: 320px;background: #FFFFFF;box-sizing: border-box;padding: 24px;}
   .chart-main-min-title{width: 100%;line-height: 28px;font-size: 18px;font-weight: bold;color: #666666;margin-bottom: 20px;}
   .chart-main-max{width: 100%;height: 485px;background: #FFFFFF;box-sizing: border-box;padding: 24px;}
-  .chart-main-max.table{min-height: 1000px;}
+  .chart-main-max.table{min-height: 620px;}
+  .chart-main-max.min{height: 480px;}
   .chart-main-min.le{float: left;}
   .chart-main-min.ri{float: right;}
   .chart-main-468{width: 468px;height: 360px;background: #FFFFFF;box-sizing: border-box;padding: 24px;float: left;}
@@ -36,6 +67,10 @@
   .chart-main-400{width: 400px;height: 360px;background: #FFFFFF;box-sizing: border-box;padding: 24px;float: right;margin-left: 16px;}
   .chart-main-390{width: 390px;height: 360px;background: #FFFFFF;box-sizing: border-box;padding: 24px;float: left;margin-right: 15px;}
   .chart-main-390.none{margin-right: 0;}
+  footer{width: 100%;float: left;}
+  #scrollTop .item .phone{ display: none; }
+  #scrollTop .item .Iphone{ display: none; }
+
 }
 
 /*移动端**/

src/main/resources/static/js/account/register-club.js

@@ -21,6 +21,8 @@ var registerPage = new Vue({
             password:'',
             password2:'',
             isSp: 1, //是否选择专属客户经理
+            insideFLag:0, //内外部协销标记 0内部协销,1外部协销
+            spId: '', // 协销分享的id
         },
         clubUpgradeUser: {
             userId:'',
@@ -107,7 +109,7 @@ var registerPage = new Vue({
                     _self.isShowAgree = true;
                     return;
                 }
-                if(_self.clubUser.password2!=_self.clubUser.password){
+                if(_self.clubUser.password2!==_self.clubUser.password){
                     CAIMEI.dialog('两次密码输入不一致',false,function () {});
                     return;
                 }
@@ -119,7 +121,9 @@ var registerPage = new Vue({
                         passWordConfirm : _self.clubUser.password2,
                         smsCode : _self.clubUser.code,
                         isAgreed :  _self.isAgreed,
-                        isSp: _self.clubUser.isSp
+                        isSp: _self.clubUser.isSp,
+                        insideFLag:0, //内外部协销标记 0内部协销,1外部协销
+                        spId: '', // 协销分享的id
                 };
                 _self.loginLoading = true;
                 UserApi.ClubRegister(params,function (response) {

src/main/resources/static/js/supplier-center/encyclopedia/chart.js

@@ -8,8 +8,8 @@ const chartContent = new Vue({
         shopId:0,
         volumeList:[],
         bannerList:[],
-        chartLogo:'',
-        chartBanner:'',
+        keywordList:[],
+        shopInfo:{},
         summarize:'',
         summarize1:'',
         summarize2:'',
@@ -39,12 +39,12 @@ const chartContent = new Vue({
             console.log('shopId',shopId)
             this.volumeList = this.chartData[shopId].volumeList
             this.bannerList = this.chartData[shopId].bannerList
-            this.chartLogo = this.chartData[shopId].chartLogo
-            this.chartBanner = this.chartData[shopId].chartBanner
+            this.shopInfo = this.chartData[shopId].shopInfo
             this.summarize = this.chartData[shopId].summarize
             this.summarize1 = this.chartData[shopId].summarize1
             this.summarize2 = this.chartData[shopId].summarize2
-            this.chartWordCloud(this.chartData[shopId].keywords)
+            this.keywordList = this.chartData[shopId].keywordList
+            // this.chartWordCloud(this.chartData[shopId].keywords)
             this.chartWechats(this.chartData[shopId].wechats)
             this.chartIntention(this.chartData[shopId].intention)
             this.chartAllVisits(this.chartData[shopId].allVisits)
@@ -56,6 +56,14 @@ const chartContent = new Vue({
             this.chartUrbanize(this.chartData[shopId].urbanize)
             this.chartUserIdentity(this.chartData[shopId].userIdentity)
             this.chartIntentions(this.chartData[shopId].intentions)
+            $('.chart-main-top-mids-li').find('a').on('click', function () {
+                const id = '#' + $(this).attr('data-id');
+                const scrollTop = innerWidth > 768 ? $(id).offset().top : $(id).offset().top ;
+                $("html, body").animate({
+                    scrollTop: scrollTop
+                }, {duration: 500, easing: "swing"});
+                return false;
+            })
         }
     },
     created: function () {

src/main/resources/static/js/supplier-center/encyclopedia/mixins/chartMixin.js

@@ -124,7 +124,7 @@ const chartMixin = function () {// 通知消息
                         textStyle: {
                             fontSize: 12,
                         },
-                        data: ['官网', '公众号', '微博', '小红书','其他渠道']
+                        data: ['公众号', '微博', '小红书','其他渠道']
                     },
                     grid: {
                         left: '3%',
@@ -140,20 +140,6 @@ const chartMixin = function () {// 通知消息
                         type: 'value',
                     },
                     series: [
-                        {
-                            name: '官网',
-                            type: 'bar',
-                            stack: 'total',
-                            label: {
-                                show: false
-                            },
-                            emphasis: {
-                                focus: 'series'
-                            },
-                            barGap:'60%',
-                            barCategoryGap:'60%',
-                            data: data.yAxis.website
-                        },
                         {
                             name: '公众号',
                             type: 'bar',
@@ -237,7 +223,7 @@ const chartMixin = function () {// 通知消息
                         textStyle: {
                             fontSize: 12,
                         },
-                        data: ['信息中心', '公众号', '微博', '小红书','其他渠道']
+                        data: ['公众号', '微博', '小红书','其他渠道']
                     },
                     grid: {
                         left: '3%',
@@ -253,20 +239,6 @@ const chartMixin = function () {// 通知消息
                         type: 'value',
                     },
                     series: [
-                        {
-                            name: '信息中心',
-                            type: 'bar',
-                            stack: 'total',
-                            label: {
-                                show: false
-                            },
-                            emphasis: {
-                                focus: 'series'
-                            },
-                            barGap:'60%',
-                            barCategoryGap:'60%',
-                            data: data.yAxis.website
-                        },
                         {
                             name: '公众号',
                             type: 'bar',
@@ -547,12 +519,12 @@ const chartMixin = function () {// 通知消息
                 };
                 myChart.setOption(option);  // 将选项应用到图表实例上，生成图表
             },
-            // 线索用户月度分布
+            // 咨询用户月度分布
             chartLeadUserMonthly(data){
                 let myChart = echarts.init(document.getElementById('myChart7'))
                 let option = {
                     title: {
-                        text: '线索用户月度分布(单位：个)'
+                        text: '咨询用户月度分布(单位：个)'
                     },
                     tooltip: {
                         trigger: 'axis',
@@ -570,7 +542,7 @@ const chartMixin = function () {// 通知消息
                         textStyle: {
                             fontSize: 12,
                         },
-                        data: ['6月', '7月', '8月', '9月']
+                        data: ['6月', '7月', '8月', '9月','10月']
                     },
                     grid: {
                         left: '3%',
@@ -587,7 +559,7 @@ const chartMixin = function () {// 通知消息
                     },
                     series: [
                         {
-                            name: '线索用户月度分布',
+                            name: '咨询用户月度分布',
                             type: 'bar',
                             stack: 'total',
                             label: {
@@ -605,11 +577,11 @@ const chartMixin = function () {// 通知消息
                 };
                 myChart.setOption(option);  // 将选项应用到图表实例上，生成图表
             },
-            chartChannels(data){// 线索用户地狱分布
+            chartChannels(data){// 咨询用户地狱分布
                 let myChart = echarts.init(document.getElementById('myChart8'))
                 let option = {
                     title: {
-                        text: '线索用户地域分布'
+                        text: '咨询用户地域分布'
                     },
                     tooltip: {
                         trigger: 'item'

src/main/resources/static/js/supplier-center/encyclopedia/mixins/jsonMixin.js

@@ -5,10 +5,17 @@ const jsonMixin = function () {// 通知消息
             return{
                 chartData:{
                     1378: {
-                        // 顶部logo
-                        chartLogo:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/ross-logo.png',
-                        // 顶部图
-                        chartBanner:'https://img.caimei365.com/group1/M00/04/A0/rB-lGGVcQ2eAOl_lAAFD4qvhKP4215.png',
+                        shopInfo:{
+                            number:14658,
+                            number1:4545,
+                            number2:1247,
+                            number3:4545,
+                            number4:254,
+                            // 供应商名称
+                            shopName:'ROSS',
+                            // 顶部logo
+                            chartLogo:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/ross-logo.png',
+                        },
                         // 第一阶段总结
                         summarize:'ROSS在9月份的体用户访问数量相对不高，因此意向客户数量偏少。对此有以下点因素综合影响：①缺少专业内容在公域进行传播；②部分渠道无法发送短内容，或传播营销内容；',
                         // 第二阶段总结
@@ -32,83 +39,92 @@ const jsonMixin = function () {// 通知消息
                         volumeList:[
                             {
                                 name:'供应商动态',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-06-10',
                                 keyWord:'ROSS云智能体疗/ROSS发烧之星/ROSS BODY',
                                 wechatNumber:'480',
                                 touchNumber:'12663',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247586737&idx=4&sn=6780ffc924a1f86a2cde60733d80ee8e&chksm=cfdb5828f8acd13e93b4d555d6ad3052e4e6f8bfad126f6af7c86997638be0064ef97133ddc2&token=155469033&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'供应商动态',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-06-14',
                                 keyWord:'西班牙ROSS',
                                 wechatNumber:'610',
                                 touchNumber:'12677',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247590560&idx=4&sn=7b9ba34d576352edc43237865cd9e4a5&chksm=cfdba939f8ac202fff6f117ba56a77892b159edb1487e00017e6d56f823a9ddc4348e53c182c&token=155469033&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'科普推荐',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-07-06',
                                 keyWord:'ROSS云智能体疗/ROSS肌肉疗法/ROSS私密疗法',
                                 wechatNumber:'1139',
                                 touchNumber:'12587',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247592081&idx=3&sn=aebe8cbe52da5f56d05336fba423fbe0&chksm=cfdba308f8ac2a1e29c4505cf7a8e4551f92a7ba34e6132506c40de73b3ab97e931f325b8ee2&token=155469033&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'科普推荐',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-07-14',
                                 keyWord:'ROSS BODY',
                                 wechatNumber:'1513',
                                 touchNumber:'12766',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247592420&idx=1&sn=071b5d98b8a971d0e3361ca3e2dc145b&chksm=cfdba27df8ac2b6b3da4ed1364b7760362ace0b2ba2fa77c26609df3a862215c41730be11956&token=155469033&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'专题报道',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-07-28',
                                 keyWord:'西班牙ROSS',
                                 wechatNumber:'987',
                                 touchNumber:'12806',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247593072&idx=2&sn=46b40a860c9ef8b7acd1ac43e1dcecd7&chksm=cfdba7e9f8ac2eff26d49d8133d2258060495c515daa8a71bbda224e8b934fdd9a1248dca2d8&token=155469033&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'品牌推荐',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-08-04',
                                 keyWord:'西班牙ROSS/ROSS云智能体疗',
                                 wechatNumber:'1516',
                                 touchNumber:'12823',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247593310&idx=3&sn=48a3d9804727283510c6b6e53b854a81&chksm=cfdba6c7f8ac2fd1895b47264c726c2defa3246dfc1b4bb515a6fbf567e40f9b11efc990388f&token=155469033&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'美业动态',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-09-07',
                                 keyWord:'西班牙ROSS',
                                 wechatNumber:'592',
                                 touchNumber:'13020',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247595790&idx=5&sn=717fe84a0493b5bf8eb0dbac86250dd2&chksm=cfdbbc97f8ac3581a2f3a87c2e67b61ff5e2e41c5407756fbd902638e4c56749f6e36d7bfd98&token=155469033&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'优惠活动',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-09-14',
                                 keyWord:'西班牙ROSS/ROSS云智能体疗',
                                 wechatNumber:'355',
                                 touchNumber:'13046',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/_ds0bNCCO_YiAPCS8DK5Tg'
                             },
                             {
                                 name:'新品推荐',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-10-11',
                                 keyWord:'ROSS BODY',
                                 wechatNumber:'564',
                                 touchNumber:'13114',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247598296&idx=5&sn=b89bd089e6571d15d0f2b98a8d04eeb3&chksm=cfdb8b41f8ac02578145f19c2a664d0bc01831737737470f64c024c0af5dee0b6db21b55076b&token=155469033&lang=zh_CN#rd%23rd'
                             },
                         ],
@@ -321,10 +337,17 @@ const jsonMixin = function () {// 通知消息
                         },
                     },
                     1634: {
-                        // 顶部logo
-                        chartLogo:'https://img.caimei365.com/group1/M00/04/A0/rB-lGGVcQ2eAILQCAAAYtawMIj0814.png',
-                        // 顶部图
-                        chartBanner:'https://img.caimei365.com/group1/M00/04/A0/rB-lGGVcQ2eAOl_lAAFD4qvhKP4215.png',
+                        shopInfo:{
+                            number:797395,
+                            number1:103456,
+                            number2:767,
+                            number3:64,
+                            number4:6,
+                            // 供应商名称
+                            shopName:'超清秀',
+                            // 顶部logo
+                            chartLogo:'https://img.caimei365.com/group1/M00/04/A0/rB-lGGVcQ2eAILQCAAAYtawMIj0814.png',
+                        },
                         // 第一阶段总结
                         summarize:'自丝艾特携新品超清秀入驻以来，采美针对品牌特性，先后创作新品系列、推荐系列、科普系列、门店访谈等多维度推文，分别从技术原理到市场热度全面展现了超清秀的实力，并在采美全网渠道推送内容，通过内容传播获取更多客户资源；\n' +
                             '通过对比展现量和阅读量可以看出，超清秀在公众号、微博用户访问量较高，其中，微博和微信的营销规则管控力度较低，因此整体访问量偏高；后续采美通过设立/参与【高端皮肤管理】等相关话题活动，促进品牌在市场的知名度提升；',
@@ -332,18 +355,24 @@ const jsonMixin = function () {// 通知消息
                         summarize1:'采美将超清秀相关关键词植入到推文中，以采美商城作为流量载体，2023年6月-10月站内关键词在采美站内搜索次数达478次，品牌在商城的访问量达到767次，其中机构访问量占比34%；\n' +
                             '整体收录情况较好，后续采美建议继续围绕关键词超清秀铺量设置更多长尾词，如：超清秀效果怎么样？超清秀四步曲有哪四步等等，增加关键词【超清秀】在市场的热度，引导更多用户站内外搜索。',
                         // 第三阶段总结
-                        summarize2:'从用户咨询分布上看，6月到7月属于用户认知阶段，因此用户咨询量较少，8月采美将超清秀相关内容进行切片、多渠道分发，整体推流达到一个峰值，因此容户咨询量较多\n' +
-                            '此外，从咨询用户画像分布上看，有44%的客户意向度普通，后续还需针对这部分用户进行精准推送，通过在微信私聊/朋友圈/视频号/社群或者通过站内push的等方式对该部分客户进行多场景触达，增强线索客户的意向度',
+                        summarize2:'从用户咨询分布上看，6月到7月属于用户认知阶段，因此用户咨询量较少；8月采美将超清秀相关内容进行切片、多渠道分发，整体推流达到一个峰值，容户咨询量较多；9月-10月，由于缺少专业性推文吸引外部流浪，整体回流缓慢，咨询量成下降趋势；\n' +
+                            '此外，从咨询用户画像分布上看，有44%的客户意向度普通，后续还需针对这部分用户进行精准推送，通过在微信私聊/朋友圈/视频号/社群或者通过站内push的等方式对该部分客户进行多场景触达，增强线索客户的意向度。',
                         // 广告图统计
                         bannerList:[
                             {
                                 title:"首页",
                                 image:'https://img.caimei365.com/group1/M00/04/9B/rB-lGGU_XzOAWQvrAAPbHLWA-M0505.jpg',
+                                image1:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/22.png',
+                                image2:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/22.png',
+                                image3:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/3h5.png',
                                 number:541
                             },
                             {
                                 title:"信息中心",
                                 image:'https://img.caimei365.com/group1/M00/04/9C/rB-lGGU_ZjeAYLhlAACYQpCq_gk678.jpg',
+                                image1:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/2h5.png',
+                                image2:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/2h5.png',
+                                image3:'',
                                 number:237
                             }
                         ],
@@ -351,219 +380,192 @@ const jsonMixin = function () {// 通知消息
                         volumeList:[
                             {
                                 name:'供应商动态',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-06-10',
                                 keyWord:'超清秀',
                                 wechatNumber:'478',
                                 touchNumber:'12663',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247586737&idx=4&sn=6780ffc924a1f86a2cde60733d80ee8e&chksm=cfdb5828f8acd13e93b4d555d6ad3052e4e6f8bfad126f6af7c86997638be0064ef97133ddc2&token=2025535079&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'供应商动态',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-06-14',
                                 keyWord:'超清秀',
                                 wechatNumber:'610',
                                 touchNumber:'12677',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247590560&idx=4&sn=7b9ba34d576352edc43237865cd9e4a5&chksm=cfdba939f8ac202fff6f117ba56a77892b159edb1487e00017e6d56f823a9ddc4348e53c182c&token=2025535079%E2%8C%A9=zh_CN#rd%23rd%23rd%23rd'
                             },
                             {
                                 name:'新品上线',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-06-21',
                                 keyWord:'SUPERBFACIAL超清秀/超清秀/高端皮肤护理项目',
                                 wechatNumber:'2084',
                                 touchNumber:'12694',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/MX8GqbZU_ESCam8imFRbVw'
                             },
                             {
                                 name:'火爆出圈',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-06-30',
                                 keyWord:'CIT超清秀',
                                 wechatNumber:'717',
                                 touchNumber:'12735',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/YMEuSDfZKtKwXnBXLuGC6g'
                             },
                             {
                                 name:'采美优惠',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-07-06',
                                 keyWord:'CIT超清秀',
                                 wechatNumber:'1045',
                                 touchNumber:'12587',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/rZ5yxGY4cEF45aWBZcJG_A'
                             },
                             {
                                 name:'采美分享',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-07-14',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'1240',
                                 touchNumber:'12766',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/e-_yJ_FTxuzVIoytwAZ7xQ'
                             },
                             {
                                 name:'热门新品',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-07-15',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'1512',
                                 touchNumber:'12766',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247592420&idx=1&sn=071b5d98b8a971d0e3361ca3e2dc145b&chksm=cfdba27df8ac2b6b3da4ed1364b7760362ace0b2ba2fa77c26609df3a862215c41730be11956&token=2025535079%E2%8C%A9=zh_CN#rd%23rd%23rd%23rd'
                             },
                             {
                                 name:'采美推荐',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-07-21',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'1256',
                                 touchNumber:'12785',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247592748&idx=2&sn=7331e61533a12415d6324f912effc7d2&chksm=cfdba0b5f8ac29a3600df9de0202a0b76cd883cccf17b0033e433086212b1e3f65c7fc446d32&token=2025535079&lang=zh_CN#rd'
                             },
                             {
                                 name:'采美科普',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-07-21',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'875',
                                 touchNumber:'12785',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/ljhcg3oBjTO3XgqIyx90UQ'
                             },
                             {
                                 name:'采美科普',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-07-28',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'619',
                                 touchNumber:'12806',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/WSwSmb2MaMW6ZL5Pg2jmdQ'
                             },
                             {
                                 name:'采美分享',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-08-11',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'1105',
                                 touchNumber:'12839',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/gtkVA_NhQ_Vy1VmYJn3sEw'
                             },
                             {
                                 name:'采美科普',
-                                type:'付费',
+                                type:'定制稿',
                                 time:'2023-08-21',
                                 keyWord:'SUPERBFACIAL超清秀/与大、小气泡究竟有何区别',
                                 wechatNumber:'809',
                                 touchNumber:'12876',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/aqJqZMYRKPiLaMMuqMwfiA'
                             },
                             {
                                 name:'供应商动态',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-08-29',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'660',
                                 touchNumber:'12911',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/bluLxt1RdfaCzq788l1nfA'
                             },
                             {
                                 name:'美业动态',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-09-07',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'589',
                                 touchNumber:'13020',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s?__biz=Mzg5MDcwNzcwMg==&mid=2247595790&idx=5&sn=717fe84a0493b5bf8eb0dbac86250dd2&chksm=cfdbbc97f8ac3581a2f3a87c2e67b61ff5e2e41c5407756fbd902638e4c56749f6e36d7bfd98&token=2025535079&lang=zh_CN#rd%23rd'
                             },
                             {
                                 name:'专题报道',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-09-20',
                                 keyWord:'CIT超清秀',
                                 wechatNumber:'741',
                                 touchNumber:'13055',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/Efb-NWYpPhAt97mNp2BjXQ'
                             },
                             {
                                 name:'供应商动态',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-10-11',
                                 keyWord:'SUPERBFACIAL超清秀、CIT超清秀',
                                 wechatNumber:'1069',
                                 touchNumber:'13127',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/C8f-0Etyp4sEhf4gWZd6OA'
                             },
                             {
                                 name:'专题报道',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-10-17',
                                 keyWord:'CIT超清秀',
                                 wechatNumber:'614',
                                 touchNumber:'13115',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/phr216-dDxULkI8jmKYskA'
                             },
                             {
                                 name:'采美专题',
-                                type:'免费',
+                                type:'直发稿',
                                 time:'2023-10-24',
                                 keyWord:'SUPERBFACIAL超清秀',
                                 wechatNumber:'437',
                                 touchNumber:'13355',
+                                channel:'公众号/站内/知乎/百家/头条/搜狐/微博/一点...',
                                 link:'https://mp.weixin.qq.com/s/HDAMvY-GCDC8BgjgHEm4GA'
                             }
                         ],
                         // 关键词词云
-                        keywords:[
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5},
-                            {name:"超清秀 ",value:448},
-                            {name:"SUPERBFACIAL",value:3},
-                            {name:"SUPERBFACIAL超清秀 ",value:10},
-                            {name:"CIT超清秀 ",value:12},
-                            {name:"CIT丝艾特超清秀",value:5}
+                        keywordList:[
+                            {name:"超清秀",value:494,seo:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/1.png'},
+                            {name:"SUPERBFACIAL",value:3,seo:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/2.png'},
+                            {name:"SUPERBFACIAL超清秀",value:10,seo:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/3.png'},
+                            {name:"CIT超清秀",value:12,seo:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/4.png'},
+                            {name:"CIT丝艾特超清秀",value:5,seo:'https://admin.caimei365.com/userfiles/1/images/photo/2023/11/5.png'},
                         ],
                         // 公众号推文数据
                         wechats:{
@@ -580,7 +582,6 @@ const jsonMixin = function () {// 通知消息
                         intention:{
                             xAxis:['6月', '7月', '8月', '9月', '10月'],
                             yAxis:{
-                                website:[31614, 91664, 54595, 33306, 33747],
                                 general:[50769, 63908, 38626, 26075, 39597],
                                 twitter:[26964, 53992, 67540, 60975, 108528],
                                 redBook:[950, 3992, 6929, 6432, 8235],
@@ -591,7 +592,6 @@ const jsonMixin = function () {// 通知消息
                         allVisits:{
                             xAxis:['6月', '7月', '8月', '9月', '10月'],
                             yAxis:{
-                                website:[2465, 3702, 2330, 1011, 1051],
                                 general:[3889, 6547, 2574, 1330, 2120],
                                 twitter:[11101, 11064, 16263, 10190, 13789],
                                 redBook:[396, 996, 1618, 812, 873],
@@ -624,7 +624,7 @@ const jsonMixin = function () {// 通知消息
                         },
                         // 线索用户月度分布
                         leadUserMonthly:{
-                            xAxis:['6月', '7月', '8月', '9月', '9月'],
+                            xAxis:['6月', '7月', '8月', '9月', '10月'],
                             yAxis:{
                                 series:[3, 11, 27, 13, 10]
                             }

src/main/resources/static/js/supplier-center/shop/goods.js

@@ -94,7 +94,7 @@ var myGoods = new Vue({
                     }
                 }
                 if(featuredNum>0){
-                    if (el.validFlag === 2 && el.featuredFlag === 1) {
+                    if (el.featuredFlag === 1) {
                         el.isDelFeatured = true;
                     }
                 }

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

@@ -1,7 +1,7 @@
 <footer id="globalFot" xmlns:th="http://www.w3.org/1999/xhtml" v-cloak>
     <div class="footTop">
         <div class="wrap mf">
-            <span class="icon mIcon mfi">品类丰富 优质服务</span>
+            <span class="icon mIcon mfi">品类丰富 厂家直供</span>
             <span class="icon mIcon mfi">正品溯源 品质保证</span>
             <span class="icon mIcon mfi">全球甄选 大牌云集</span>
             <span class="icon mIcon mfi">分期购机 先赚后还</span>

src/main/resources/templates/supplier-center/encyclopedia/chart.html

@@ -10,30 +10,90 @@
   <template th:replace="components/analysis"></template>
 </head>
 <body>
-<!-- 引用头部 -->
-<!--<header id="globalHead" xmlns:th="http://www.w3.org/1999/xhtml">-->
-
-<!--</header>-->
-<!-- 机构信息 -->
 <div id="chartContent" v-cloak>
-    <input type="hidden" th:value="${coreServer}" id="coreServer">
-    <input type="hidden" th:value="${agent}" id="userAgent">
-    <div class="baseHeadCenter account">
-        <div class="wrap clear">
-            <a href="/" class="logo">
-                <img class="pcOnly" src="https://admin.caimei365.com/userfiles/1/images/photo/2023/11/%E9%87%87%E7%BE%8Elogo.png" alt="采美 生美/医美采购服务平台"/>
-                <img class="h5Only" src="https://admin.caimei365.com/userfiles/1/images/photo/2023/11/%E9%87%87%E7%BE%8Elogo.png" alt="采美 生美/医美采购服务平台"/>
-            </a>
-            <a href="javascript:void(0)" class="logo none">
-                <img class="pcOnly" :src="chartLogo" alt="采美 生美/医美采购服务平台"/>
-                <img class="h5Only" :src="chartLogo" alt="采美 生美/医美采购服务平台"/>
-            </a>
-        </div>
-    </div>
+    <!-- 引用头部 -->
+    <header>
+        <input type="hidden" th:value="${coreServer}" id="coreServer">
+        <input type="hidden" th:value="${agent}" id="userAgent">
+        <div class="baseHeadCenter account">
+            <div class="wrap clear">
+                <a href="/" class="logo">
+                    <img class="pcOnly" src="https://admin.caimei365.com/userfiles/1/images/photo/2023/11/%E9%87%87%E7%BE%8Elogo.png" alt="采美 生美/医美采购服务平台"/>
+                    <img class="h5Only" src="https://admin.caimei365.com/userfiles/1/images/photo/2023/11/%E9%87%87%E7%BE%8Elogo.png" alt="采美 生美/医美采购服务平台"/>
+                </a>
+                <a href="javascript:void(0)" class="logo none">
+                    <img class="pcOnly" :src="shopInfo.chartLogo" alt="采美 生美/医美采购服务平台"/>
+                    <img class="h5Only" :src="shopInfo.chartLogo" alt="采美 生美/医美采购服务平台"/>
+                </a>
+                <div class="header-title"><p>2023年6月-10月数据报表</p></div>
+            </div>
+        </div>
+    </header>
     <div class="chart-content" v-if="isLoading">
         <div class="chart-content-main">
           <div class="chart-main-top">
-            <img :src="chartBanner" alt="漏斗模型">
+              <div class="chart-main-top-title">采美数字化营销漏斗</div>
+              <div class="chart-main-top-main">
+                  <div class="chart-main-top-left">
+                      <div class="chart-main-top-left-li a">
+                        <div class="li-title">展现量</div>
+                        <div class="li-texts"><p>在搜索结果页面展现相关内容关键词提炼/关键词布局</p></div>
+                      </div>
+                      <div class="chart-main-top-left-li b">
+                        <div class="li-title">点击量</div>
+                        <div class="li-texts"><p>推广结果活得用户的点击关键词排名/内容撰写质量</p></div>
+                      </div>
+                      <div class="chart-main-top-left-li c">
+                        <div class="li-title">访问量</div>
+                        <div class="li-texts"><p>用户访问浏览官网页面系统为用户打上画像标签</p></div>
+                      </div>
+                      <div class="chart-main-top-left-li d">
+                        <div class="li-title">咨询量</div>
+                        <div class="li-texts"><p>跟踪标签/精准营销/定向推送通过CRM系统进行线索培育</p></div>
+                      </div>
+                      <div class="chart-main-top-left-li e">
+                        <div class="li-title">报备&成交量</div>
+                        <div class="li-texts"><p>销售与服务，促使成单</p></div>
+                      </div>
+                  </div>
+                  <div class="chart-main-top-mids">
+                    <div class="chart-main-top-mids-li">
+                        <a href="javascript:void(0)" data-id="section-1" class="chart-main-top-mids-ch a" v-text="shopInfo.number"></a>
+                    </div>
+                    <div class="chart-main-top-mids-li">
+                        <a href="javascript:void(0)" data-id="section-1" class="chart-main-top-mids-ch b" v-text="shopInfo.number1"></a>
+                    </div>
+                    <div class="chart-main-top-mids-li">
+                        <a href="javascript:void(0)" data-id="section-2" class="chart-main-top-mids-ch c" v-text="shopInfo.number2"></a>
+                    </div>
+                    <div class="chart-main-top-mids-li">
+                        <a href="javascript:void(0)" data-id="section-3" class="chart-main-top-mids-ch d" v-text="shopInfo.number3"></a>
+                    </div>
+                    <div class="chart-main-top-mids-li">
+                        <a href="javascript:void(0)" data-id="section-3" class="chart-main-top-mids-ch e" v-text="shopInfo.number4"></a>
+                    </div>
+                  </div>
+                  <div class="chart-main-top-right">
+                      <div class="chart-main-top-right-li">
+                          <div class="chart-main-top-right-tips">
+                              <span class="tips a">品牌推广阶段</span>
+                          </div>
+                          <p>【<span v-text="shopInfo.shopName"></span>】在采美站外公域的推广结果</p>
+                      </div>
+                      <div class="chart-main-top-right-li">
+                          <div class="chart-main-top-right-tips">
+                              <span class="tips b">潜客运营阶段</span>
+                          </div>
+                          <p>【<span v-text="shopInfo.shopName"></span>】在采美私域运营情况汇总</p>
+                      </div>
+                      <div class="chart-main-top-right-li">
+                          <div class="chart-main-top-right-tips">
+                              <span class="tips c">销售转化阶段</span>
+                          </div>
+                          <p>【<span v-text="shopInfo.shopName"></span>】客户线索在采美的孵化动作和转化效果</p>
+                      </div>
+                  </div>
+              </div>
           </div>
         </div>
         <div class="chart-title">
@@ -54,9 +114,9 @@
           </div>
         </div>
         <div class="chart-content-main">
-          <div class="chart-main-max ri table">
+          <div class="chart-main-max ri table clear">
             <div class="chart-main-min-title">6-10月公众号推文阅读量</div>
-            <el-table ref="table" :data="volumeList" border>
+            <el-table ref="table" :data="volumeList" border height="528">
               <el-table-column label="序号" align="center" width="50">
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
@@ -70,12 +130,13 @@
               <el-table-column label="类型"  prop="type" align="center"  width="100"></el-table-column>
               <el-table-column label="首发时间"  prop="time" align="center" width="120"></el-table-column>
               <el-table-column label="文章关键词"  prop="keyWord" align="center"></el-table-column>
+              <el-table-column label="分发渠道"  prop="channel" align="center"></el-table-column>
               <el-table-column label="公众号阅读量"  prop="wechatNumber" align="center" width="120"></el-table-column>
               <el-table-column label="触达用户量"  prop="touchNumber" align="center" width="120"></el-table-column>
             </el-table>
           </div>
         </div>
-        <div class="chart-content-main">
+        <div class="chart-content-main"  id="section-1">
           <div class="chart-main-box le" id="myChart2">
 
           </div>
@@ -83,7 +144,7 @@
 
           </div>
         </div>
-        <div class="chart-title">
+        <div class="chart-title" id="section-2">
           <p>潜客运营阶段</p>
         </div>
         <div class="chart-content-text">
@@ -91,28 +152,104 @@
           <p v-text="summarize1"></p>
         </div>
         <div class="chart-content-main">
-          <div class="chart-main-468" id="myChart4"></div>
-          <div class="chart-main-300">
-            <div class="chart-main-min-title">访问用户全商城点击量</div>
-            <el-table ref="table" :data="bannerList" height="200px" border>
-              <el-table-column prop="title" label="广告位置" align="center"></el-table-column>
-              <el-table-column prop="image" label="广告图" align="center">
-                <template slot-scope="{ row }">
-                  <img :src="row.image" :alt="row.name" style="width: 50px;height: 50px;">
-                </template>
-              </el-table-column>
-              <el-table-column prop="number" label="点击量" align="center"></el-table-column>
-            </el-table>
-          </div>
-          <div class="chart-main-400" id="myChart5"></div>
+            <div class="chart-main-max min clear">
+                <div class="chart-main-min-title">关键词SEO收录数据</div>
+                <el-table ref="table" :data="keywordList" height="375px" border>
+                    <el-table-column prop="name" label="关键词" align="center"></el-table-column>
+                    <el-table-column prop="seo" label="SEO排名" align="center">
+                        <template slot-scope="{ row }">
+                            <el-popover
+                                    placement="top-start"
+                                    title=""
+                                    width="380"
+                                    trigger="hover"
+                            >
+                                <img :src="row.seo" alt="" style="width:350px;height:350px;">
+                                <img slot="reference" :src="row.seo" alt="" style="width:40px;height:40px;">
+                            </el-popover>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="value" label="搜索次数" align="center"></el-table-column>
+                </el-table>
+            </div>
         </div>
         <div class="chart-content-main">
-          <div class="chart-main-max" id="myChart0"></div>
+            <div class="chart-main-box le" id="myChart5">
+
+            </div>
+            <div class="chart-main-box ri" id="myChart4">
+
+            </div>
+        </div>
+        <div class="chart-content-main">
+            <div class="chart-main-max min clear">
+                <div class="chart-main-min-title">访问用户全商城点击量</div>
+                <el-table ref="table" :data="bannerList" height="270px" border>
+                    <el-table-column prop="title" label="广告位置" align="center"></el-table-column>
+                    <el-table-column prop="image" label="第四期" align="center">
+                        <template slot-scope="{ row }">
+                            <el-popover
+                                    placement="top-start"
+                                    title=""
+                                    width="380"
+                                    trigger="hover"
+                            >
+                                <img :src="row.image" alt="" style="width:350px;height:170px;">
+                                <img slot="reference" :src="row.image" alt="" style="width:170px;height:85px;">
+                            </el-popover>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="image" label="第三期" align="center">
+                        <template slot-scope="{ row }">
+                            <el-popover
+                                    placement="top-start"
+                                    title=""
+                                    width="380"
+                                    trigger="hover"
+                            >
+                                <img :src="row.image1" alt="" style="width:350px;height:170px;">
+                                <img slot="reference" :src="row.image1" alt="" style="width:170px;height:85px;">
+                            </el-popover>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="image" label="第二期" align="center">
+                        <template slot-scope="{ row }">
+                            <el-popover
+                                    placement="top-start"
+                                    title=""
+                                    width="380"
+                                    trigger="hover"
+                            >
+                                <img :src="row.image2" alt="" style="width:350px;height:170px;">
+                                <img slot="reference" :src="row.image2" alt="" style="width:170px;height:85px;">
+                            </el-popover>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="image" label="第一期" align="center">
+                        <template slot-scope="{ row }">
+                            <el-popover
+                                    v-if="row.image3"
+                                    placement="top-start"
+                                    title=""
+                                    width="380"
+                                    trigger="hover"
+                            >
+                                <img :src="row.image3" alt="" style="width:350px;height:170px;">
+                                <img slot="reference" :src="row.image3" alt="" style="width:170px;height:85px;">
+                            </el-popover>
+                            <template v-else>
+                                <span>- -</span>
+                            </template>
+                        </template>
+                    </el-table-column>
+                    <el-table-column prop="number" label="点击量" align="center"></el-table-column>
+                </el-table>
+            </div>
         </div>
         <div class="chart-content-main">
           <div class="chart-main-max" id="myChart6"></div>
         </div>
-        <div class="chart-title">
+        <div class="chart-title" id="section-3">
           <p>销售转化阶段</p>
         </div>
         <div class="chart-content-text">
@@ -131,6 +268,7 @@
       </div>
 </div>
 <!-- 引入底部 -->
+<template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/echarts.min.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/lib/china.js(v=${version})}"></script>

src/main/resources/templates/supplier-center/encyclopedia/edit.html

@@ -60,7 +60,7 @@
                             <el-input v-model="formData.discription" placeholder="请输入词条概述" v-show="false"></el-input>
                             <div class="el-form-item__error" v-if="formValidate.discription">敏感词：{{formValidate.discription}}</div>
                         </el-form-item>
-                        <div class="bk-label"><em>*</em>banner<i>（建议图片尺寸210px*210px，并上传白底图片）</i></div>
+                        <div class="bk-label"><em>*</em>banner<i>（建议图片尺寸1920*400，并上传白底图片）</i></div>
                         <el-form-item prop="banner" class="banner">
                             <el-input v-show="false" v-model="formData.banner"></el-input>
                             <file-upload @click.native="handlerDiscrip" @upload-success="handleBannerUploadSuccess" @remove="handleBannerRemove" :list="bannerList"></file-upload>

src/main/resources/templates/we_chat/redirect_uri.html

@@ -57,8 +57,6 @@
             location.href = '/supplier/dashboard.html';
         } else if (userData && (userData.userIdentity*1 === 2 || userData.userIdentity*1 === 4)) {
             location.href = '/user/dashboard.html';
-        } else {
-            location.href="/index.html";
         }
     }
 </script>