feat：网站右侧悬浮框调整

go.mod

@@ -1,6 +1,8 @@
 module jybxseo
 
-go 1.20
+go 1.21
+
+toolchain go1.21.4
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20250403014436-53740a2395aa

go.sum

@@ -10,7 +10,9 @@ github.com/ClickHouse/clickhouse-go/v2 v2.2.0/go.mod h1:8f2XZUi7XoeU+uPIytSi1cvx
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -77,6 +79,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -143,6 +146,7 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=

manifest/config/config.yaml

@@ -17,7 +17,7 @@ viewer:
 
 database:
   default:
-    link: "clickhouse:jydev:Jsh2scksi7&hs@tcp(127.0.0.1:2900)/jyseo_cluster?dial_timeout=2000ms&max_execution_time=60"
+    link: "clickhouse:jytop:pwdTopJy123@tcp(172.20.45.129:19000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
     debug: true
 #  default:
 #    link: "clickhouse:jytop:pwdTopJy123@tcp(192.168.3.207:19000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
@@ -28,12 +28,12 @@ bidDetailByRpc: "172.31.31.203:1111"
 
 mongodb:
   default:
-    address: "192.168.3.206:27080"
+    address: "172.20.45.129:27002,172.20.45.130:27080"
     size: 5
     dbName: "qfw"
     replSet: ""
   bidding:
-    address: "192.168.3.206:27002"
+    address: "172.20.45.129:27002,172.20.45.130:27080"
     size: 5
     dbName: "qfw_data"
     replSet: ""
@@ -42,14 +42,14 @@ mongodb:
 
 redis:
   default: # 配置seo的redis
-    address: 127.0.0.1:6379
+    address: 172.20.45.129:1712
 #    address: 192.168.3.149:1712
   other: # 广告位
 #    address: 192.168.3.149:1712
-    address: 127.0.0.1:6379
+    address: 172.20.45.129:1712
   session: # session
 #    address: 192.168.3.149:1712
-    address: 127.0.0.1:6379
+    address: 172.20.45.129:1712
 
 listPageSetting:
   batchSize: 2000

resource/staticres/css/footer.css

@@ -147,7 +147,7 @@
   position: fixed;
   z-index: 100;
   /* min-width: 56px; */
-  width: 80px;
+  width: 68px;
   bottom: 108px;
   left: initial;
   right: 1px;
@@ -160,6 +160,7 @@
   position: absolute;
   top: 0;
   right: 0px;
+  width: 100%;
   height: 100%;
   box-sizing: border-box;
   display: -ms-flexbox;
@@ -205,23 +206,23 @@
 }
 
 .right-side-box .desc_text {
-  font-size: 14px;
-  line-height: 22px;
+  font-size: 13px;
+  line-height: 20px;
   /* identical to box height, or 157% */
   text-align: center;
   /* white/100% */
   color: #FFFFFF;
-  margin-top: 4px;
+  margin-top: 2px;
 }
 
 .right-side-box .desc_text_b {
-  font-size: 14px;
-  line-height: 22px;
+  font-size: 13px;
+  line-height: 20px;
   /* identical to box height, or 157% */
   text-align: center;
   /* Font/#1d1d1d */
   color: #1D1D1D;
-  margin-top: 4px;
+  margin-top: 2px;
 }
 
 /* .right-side-box .right-side-phone {
@@ -233,7 +234,7 @@
   position: relative;
   border-radius: 10px 0 0 0;
   width: 100%;
-  height: 80px;
+  height: 68px;
   background: linear-gradient(180deg, #1699F9 0%, #19C6DC 100%);
   border-top: 2px solid #FFF;
   border-left: 2px solid #FFF;
@@ -244,7 +245,7 @@
 .right-side-box .right-side-wx {
   position: relative;
   width: 100%;
-  height: 80px;
+  height: 68px;
   background: linear-gradient(180deg, #F1F4F9 0%, #FFFFFF 100%);
   border-radius: 0;
   border-left: 2px solid #FFF;
@@ -256,7 +257,7 @@
   position: relative;
   border-radius: 0 0 0 10px;
   width: 100%;
-  height: 80px;
+  height: 68px;
   background: linear-gradient(180deg, #F1F4F9 0%, #FFFFFF 100%);
   border-bottom: 2px solid #FFF;
   border-left: 2px solid #FFF;
@@ -268,8 +269,9 @@
   position: relative;
   border-radius: 0 !important;
   width: 100% !important;
-  height: 80px !important;
-  background: linear-gradient(180deg, #F56500 0%, #F79E51 100%) !important;
+  height: 68px !important;
+  /* background: linear-gradient(180deg, #F56500 0%, #F79E51 100%) !important; */
+  background: linear-gradient(180deg, #1699F9 0%, #19C6DC 100%)!important;
   border-left: 2px solid #FFF;
   box-sizing: border-box;
   cursor: pointer;
@@ -304,13 +306,13 @@
   border-bottom: 6px solid transparent;
 } */
 
-.right-side-box>.right-side-item .text-customer img,
-.right-side-box .right-side-phone .text-customer img {
-  width: 32px;
-  width: 32px;
+.right-side-item .text-customer img,
+.right-side-phone .text-customer img {
+  width: 28px;
+  width: 28px;
   display: block;
   margin: auto !important;
-  margin-top: 12px !important;
+  margin-top: 10px !important;
 }
 
 .right-side-box .right-side-phone .text-customer-hover {
@@ -555,8 +557,8 @@
 }
 
 .right-side-box .back-to-up {
-  width: 80px;
-  height: 72px;
+  width: 68px;
+  height: 68px;
   background: linear-gradient(180deg, #F1F4F8 0%, #FEFEFF 100%);
   border-width: 2px 0px 2px 2px;
   border-style: solid;
@@ -658,6 +660,78 @@
   display: none;
 }
 
+.right-side-box .right-side-wework {
+    border-radius: 0 0 0 10px;
+    position: relative;
+    width: 100%;
+    height: 68px;
+    background: linear-gradient(180deg, #F1F4F9 0%, #fff 100%);
+    /* border-top: 2px solid #FFF; */
+    /* border-left: 2px solid #FFF; */
+    box-sizing: border-box;
+    cursor: pointer;
+    padding-top: 10px;
+}
+.right-side-box .right-side-wework .text-customer {
+    text-align: center !important;
+}
+.right-side-box .right-side-wework .text-customer img{
+    width: 28px;
+    height: 28px;
+}
+.right-side-box .right-side-wework .desc_text{
+    font-size: 13px;
+    line-height:20px;
+    color: #1d1d1d;
+}
+.right-side-wework .kf-wework {
+    display: none;
+    width:144px;
+    height:154px;
+    min-width:144px;
+    top: 6px;
+    font-size: 14px;
+    line-height: 22px;
+    left: -162px;
+    color: #1D1D1D;
+    background: linear-gradient(180deg, #F1F4F8 0%, #FEFEFF 100%);
+    border: 2px solid #FFFFFF;
+    box-shadow: 0px 0px 20px rgba(8, 31, 38, 0.12);
+    border-radius: 8px;
+    box-sizing: border-box;
+    text-align: center;
+    padding: 12px 20px;
+}
+.right-side-wework .kf-wework img {
+    width: 104px;
+    height:104px;
+}
+.right-side-wework .kf-wework p {
+    font-size: 14px;
+    line-height: 22px;
+    color:#1d1d1d;
+    text-align: center;
+    margin-top:4px;
+}
+.right-side-one{
+  box-shadow: 0 0 16px rgba(8, 31, 38, 0.14);
+  border-radius: 12px 0 0 12px;
+}
+.right-side-two {
+    margin-top:16px;
+    box-shadow: 0 0 16px rgba(8, 31, 38, 0.14);
+    border-radius: 12px 0 0 12px;
+}
+.right-side-two .right-side-wx:nth-child(1) {
+    border-radius: 10px 0 0 0;
+}
+.right-side-box .b-bottom-left-r {
+    border-bottom-left-radius: 10px!important;
+}
+.right-side-box .b-bottom-left-r  .hover-open-box{
+    border-bottom-left-radius: 10px!important;
+}
+
 #sideIcon {
   position: absolute;
   top: -108px;

resource/staticres/js/login.js

@@ -127,6 +127,10 @@ window.seoLoginModule = {
 
             // 客服入口显示
             $('#go-customer-4').show()
+             // 企微客服入口展示
+            $('.right-side-wework').show(function() {
+              $('.right-side-kf').removeClass('b-bottom-left-r')
+            })
         } else {
             $('*[data-login-show]').hide()
             $('*[data-login-hide]').hide()
@@ -148,7 +152,11 @@ window.seoLoginModule = {
             $('.work-link').hide()
 
             // 客服入口隐藏
-            $('#go-customer-4').hide()
+            // $('#go-customer-4').hide()
+            // 企微客服入口隐藏
+            $('.right-side-wework').hide(function(){
+              $('.right-side-kf').addClass('b-bottom-left-r')
+            })
         }
     },
     // 检查 instance

resource/staticres/js/pc-bottom.js

@@ -46,12 +46,37 @@ function scrollSideIconHide(el) {
         }
     })
 }
-
+function getKeFuInfo () {
+  var data = {}
+  // 官网展示客服，主站有客成展示客成，没有展示客服活码
+  // 根据 window.__headerSiteType 判断是否是子站或者资讯站
+  // 0:剑鱼标讯官网  1:品牌网站  2:资讯站  3其他(即未定义，此处未定义可以默认看作是主站)
+  if(window.__headerSiteType === 1) {
+    data = {
+      type: "kf"
+    }
+  }
+  $.ajax({
+    type: 'post',
+    url: '/bigmember/use/getCustom',
+    data: data,
+    success: function (res) {
+      if (res && res.data) {
+        var resData = res.data || {}
+        $('.kf-wework .qrcode').attr('src', resData.wxer)
+      }
+    },
+    error: function (res) {
+      console.log('客服信息获取失败')
+    }
+  })
+}
 
 
 $(function () {
     scrollSideIconHide()
     localStorage.removeItem('kf-shunt-data')
+    getKeFuInfo()
 })
 /**
  * 全局客服事件拦截（用于旧客服业务 open-customer 改造）
@@ -180,6 +205,12 @@ $(function () {
     },function() {
         $('.right-side-box .kf-phone').hide()
     })
+    // 右侧客服企微
+    $('.right-side-wework').hover(function(e) {
+      $('.right-side-box .kf-wework').show()
+    },function() {
+      $('.right-side-box .kf-wework').hide()
+    })
 });
 ;(function(){
     // 动态设置copyright

resource/template/pc/common/footer.html

@@ -1,47 +1,75 @@
 <link rel="stylesheet" href='{{Cdn}}/jybx/css/footer.css?v={{Msg "version"}}'>
-
+{{$ad:=Ad "jy_pc_sidebar_float" -1}}
 <!--S-侧边栏-->
 <div class="right-side-box" data-backside>
   <div id="sideIcon" class="" style="right: 1px;width: 88px;height: 88px;display: none;"></div>
-  <div class="right-side-phone right-side-pop">
-    <span class=" text-customer">
-      <img src='{{Cdn}}/jybx/images/telphone.png?v={{Msg "version"}}' alt="客服热线">
-    </span>
-    <span class="text-customer text-customer-hover"><img src='{{Cdn}}/jybx/images/telphone.png?v={{Msg "version"}}'
-        alt="客服热线"></span>
-    <p class="desc_text">客服热线</p>
-    {{range $k,$v:=Ad "jy_pc_sidebar_float" -1}}
-      <div class="silde-float kf-phone">{{ParseNtoBr $v.S_pic | ParseHtml}}</div>
-    {{break}}
-    {{end}}
-  </div>
-  <div class="right-side-item right-side-kf open-customer" id="go-customer-4">
-    <div class="hover-open-box" style="padding: 0;">
-      <!-- <div class="icon-customer white icon-badge-number" data-badge-number=""></div> -->
-      <div class="icon-badge-number text-customer" data-badge-number="">
-        <img src='{{Cdn}}/jybx/images/kf.png?v={{Msg "version"}}' alt="在线客服">
+  <div class="right-side-one">
+    <div class="right-side-phone right-side-pop">
+      <span class=" text-customer">
+        <img src='{{Cdn}}/jybx/images/telphone.png?v={{Msg "version"}}' alt="客服热线">
+      </span>
+      <span class="text-customer text-customer-hover"><img src='{{Cdn}}/jybx/images/telphone.png?v={{Msg "version"}}'
+          alt="客服热线"></span>
+      <p class="desc_text">客服热线</p>
+      {{range $k,$v:=Ad "jy_pc_sidebar_float" -1}}
+        <div class="silde-float kf-phone">{{ParseNtoBr $v.S_pic | ParseHtml}}</div>
+      {{break}}
+      {{end}}
+    </div>
+    <div class="right-side-item right-side-kf open-customer" id="go-customer-4">
+      <div class="hover-open-box" style="padding: 0;">
+        <!-- <div class="icon-customer white icon-badge-number" data-badge-number=""></div> -->
+        <div class="icon-badge-number text-customer" data-badge-number="">
+          <img src='{{Cdn}}/jybx/images/kf.png?v={{Msg "version"}}' alt="在线客服">
+        </div>
+        <p class="desc_text">在线客服</p>
       </div>
-      <p class="desc_text">在线客服</p>
     </div>
-  </div>
-  <div class="right-side-phone right-side-wx">
-    <span class=" text-customer"><img src='{{Cdn}}/jybx/images/wx.png?v={{Msg "version"}}' alt="关注剑鱼"></span>
-    <span class="text-customer text-customer-hover"><img src='{{Cdn}}/jybx/images/wx1.png?v={{Msg "version"}}'
-        alt="关注剑鱼"></span>
-    <p class="desc_text_b">关注剑鱼</p>
-    <div class="slidePop">
-      <img data-share-img src="/front/share/10" alt="关注剑鱼">
-      <p>关注剑鱼标讯<br>免费追踪全国商机</p>
+    <div class="right-side-wework  common-right-side-item" id="customer-wework" >
+        <p class="text-customer">
+            <img src='{{Cdn}}/jybx/images/wework.png?v={{Msg "version"}}' alt="客服企微">
+        </p>
+        <p class="desc_text">客服企微</p>
+        <div class="silde-float kf-wework">
+            <img class="qrcode" src="" alt="">
+            <p>微信扫一扫</p>
+        </div>
     </div>
   </div>
-  <div class="right-side-phone right-side-wx right-side-app">
-    <span class=" text-customer"><img src='{{Cdn}}/jybx/images/weixin_miam_b.png?v={{Msg "version"}}' alt="下载App"></span>
-    <span class="text-customer text-customer-hover"><img src='{{Cdn}}/jybx/images/weixin_miam.png?v={{Msg "version"}}'
-        alt="下载App"></span>
-    <p class="desc_text_b">下载App</p>
-    <div class="slidePop">
-      <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="下载App">
-      <p>下载App<br>免费查看全国商机</p>
+  <div class="right-side-two">
+    <div class="right-side-phone right-side-wx common-right-side-item" id="right-side-swhz">
+        <span class="text-customer"><img src='{{Cdn}}/jybx/images/shangwuhezuo.png?v={{Msg "version"}}' alt=""></span>
+        <span class="text-customer text-customer-hover"><img src='{{Cdn}}/jybx/images/shangwuhezuo-blue.png?v={{Msg "version"}}' alt=""></span>
+        <p class="desc_text_b">商务合作</p>
+        <div class="slidePop">
+            {{if $ad}}
+            {{$sw:=index $ad 1}}
+            {{if $sw}}
+            <img class="cooperation-code" src="{{$sw.S_pic | ParseHtmlAttr}}">
+            {{end}}
+            {{end}}
+            <p>微信扫一扫<br>商务合作</p>
+        </div>
+    </div>
+    <div class="right-side-phone right-side-wx">
+      <span class=" text-customer"><img src='{{Cdn}}/jybx/images/wx.png?v={{Msg "version"}}' alt="关注剑鱼"></span>
+      <span class="text-customer text-customer-hover"><img src='{{Cdn}}/jybx/images/wx1.png?v={{Msg "version"}}'
+          alt="关注剑鱼"></span>
+      <p class="desc_text_b">关注剑鱼</p>
+      <div class="slidePop">
+        <img data-share-img src="/front/share/10" alt="关注剑鱼">
+        <p>关注剑鱼标讯<br>免费追踪全国商机</p>
+      </div>
+    </div>
+    <div class="right-side-phone right-side-wx right-side-app">
+      <span class=" text-customer"><img src='{{Cdn}}/jybx/images/weixin_miam_b.png?v={{Msg "version"}}' alt="下载App"></span>
+      <span class="text-customer text-customer-hover"><img src='{{Cdn}}/jybx/images/weixin_miam.png?v={{Msg "version"}}'
+          alt="下载App"></span>
+      <p class="desc_text_b">下载App</p>
+      <div class="slidePop">
+        <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="下载App">
+        <p>下载App<br>免费查看全国商机</p>
+      </div>
     </div>
   </div>
   <div class="right-side-item back-to-up" data-backtop>