Merge branch 'dev/v4.9.31_zsy' of qmx/jy into feature/v4.9.31

src/jfw/modules/app/src/web/templates/frontRouter/fileRecord/sess/index.html

@@ -395,15 +395,15 @@
               <h3>
                   <span>
                       <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/collection/image/wx2.png" alt="微信icon">
-                      <span>客户成功经理</span>
+                      <span>{ kefuInfo.remark || '专属客服'}</span>
                   </span>
                   <span class="close-icon" @click="kfDialogShow = false">
                       <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/icon-close.png?v={{Msg "seo" "version"}}" alt="">
                   </span>
               </h3>
               <div class="content">
-                  <p class="qr-code" v-if="QRCode">
-                      <img id="QRCode-pic" :src="QRCode" alt="">
+                  <p class="qr-code" v-if="kefuInfo.wxer">
+                      <img id="QRCode-pic" :src="kefuInfo.wxer" alt="">
                   </p>
                   <p>微信扫一扫</p>
               </div>

src/web/staticres/common-module/exhibition/css/index_pc.css

@@ -11,17 +11,24 @@
   #vm_exhibition .head {
     width: 100%;
     height: 360px;
-    background: url('/common-module/exhibition/img/bannerBG.png?v=1') center center no-repeat;
-    background-size: cover;
-
+    /*background: url('/common-module/exhibition/img/bannerBG.png?v=1') center center no-repeat;*/
+    /*background-size: cover;*/
   }
+#vm_exhibition .exhibition-head{
+    width: 100%;
+    height:100%;
+}
+#vm_exhibition .head img {
+    width: 100%;
+    height:100%;
+}
 
-  #vm_exhibition .head .content {
-    width: 1200px;
-    height: 360px;
-    margin: auto;
-    position: relative;
-  }
+  /*#vm_exhibition .head content {*/
+  /*  width: 1200px;*/
+  /*  height: 360px;*/
+  /*  margin: auto;*/
+  /*  position: relative;*/
+  /*}*/
 
   #vm_exhibition .qr {
     width: 192px;

src/web/staticres/common-module/file-pack/js/index-wx.js

@@ -119,8 +119,12 @@ var vm = new Vue({
         freeNum: 0
       },
       kfDialogShow: false,
-      // 二维码
-      QRCode: ''
+      // 客服信息
+      kefuInfo: {
+        name: '',
+        remark: "专属客服",
+        wxer: ''
+      }
     }
   },
   computed: {
@@ -130,6 +134,7 @@ var vm = new Vue({
     }
   },
   created: function () {
+      this.getKefuInfo()
       this.getPType("type")
       this.years = new Date().getFullYear()
       this.months = parseInt(new Date().getMonth() + 1)
@@ -156,21 +161,20 @@ var vm = new Vue({
             _this.userPower.vipStatus = resData.vipStatus
             _this.userPower.memberStatus = resData.memberStatus
             _this.userPower.power = resData.power
-            // 客服二维码获取
-            if(resData.customers && resData.customers.length > 0 ){
-              var qrImgs = {
-                vip: '',
-                default: ''
-              }
-              resData.customers.forEach(function (ele) {
-                if (ele.vip) {
-                  qrImgs.vip = ele.wxer
-                } else {
-                  qrImgs.default = ele.wxer
-                }
-              })
-              _this.QRCode = _this.userPower.isFree ? qrImgs.default : qrImgs.vip
-            }
+          }
+        }
+      })
+    },
+    // 获取客服信息
+    getKefuInfo () {
+      var _this = this
+      $.ajax({
+        type: 'post',
+        url: '/bigmember/use/getCustom',
+        success: function (res) {
+          if (res && res.data) {
+            const resData = res.data || {}
+            _this.kefuInfo = resData
           }
         }
       })

src/web/staticres/common-module/file-pack/js/index.js

@@ -93,8 +93,12 @@ var vm = new Vue({
         freeNum: 0
       },
       kfDialogShow: false,
-      // 二维码
-      QRCode: '',
+      // 客服信息
+      kefuInfo: {
+        name: '',
+        remark: "专属客服",
+        wxer: ''
+      },
       // 保存图片是否成功
       savePicSuccess: false,
       picImgUrl: null
@@ -107,6 +111,7 @@ var vm = new Vue({
     }
   },
   created: function () {
+    this.getKefuInfo()
     this.getPType("type")
     this.years = new Date().getFullYear()
     this.months = parseInt(new Date().getMonth() + 1)
@@ -133,21 +138,20 @@ var vm = new Vue({
             _this.userPower.vipStatus = resData.vipStatus
             _this.userPower.memberStatus = resData.memberStatus
             _this.userPower.power = resData.power
-            // 客服二维码获取
-            if(resData.customers && resData.customers.length > 0 ){
-              var qrImgs = {
-                vip: '',
-                default: ''
-              }
-              resData.customers.forEach(function (ele) {
-                if (ele.vip) {
-                  qrImgs.vip = ele.wxer
-                } else {
-                  qrImgs.default = ele.wxer
-                }
-              })
-              _this.QRCode = _this.userPower.isFree ? qrImgs.default : qrImgs.vip
-            }
+          }
+        }
+      })
+    },
+    // 获取客服信息
+    getKefuInfo () {
+      var _this = this
+      $.ajax({
+        type: 'post',
+        url: '/bigmember/use/getCustom',
+        success: function (res) {
+          if (res && res.data) {
+            const resData = res.data || {}
+            _this.kefuInfo = resData
           }
         }
       })

src/web/staticres/js/login.js

@@ -174,6 +174,11 @@ function toggleLoginDom (type) {
     $("#public-nav .fl").addClass('fix-work')
     // 客服入口显示
     $('#go-customer-4').show()
+    // 客服企微展示
+    $('#customer-wework').show()
+    // 登录后客服间隔（样式）
+    $('#login-custom-gap').show()
+    $('#right-side-swhz').addClass('b-radius-left-top')
   } else {
     $("#public-nav .nav-avatar").hide()
     $("#public-nav .work-link").hide()
@@ -181,6 +186,11 @@ function toggleLoginDom (type) {
     $("#login .loginBtn").show()
     // 客服入口隐藏
     $('#go-customer-4').hide()
+    // 客服企微隐藏
+    $('#customer-wework').hide()
+    // 登录后客服间隔（样式）隐藏
+    $('#login-custom-gap').hide()
+    $('#right-side-swhz').removeClass('b-radius-left-top')
   }
 }
 //
@@ -1223,7 +1233,7 @@ $(function(){
               document.querySelector(setPassArr[i]).style.display = (type ? 'block' : 'none')
             }
           }
-          
+
         },
         ajaxRegister: function (e, arr) {
           var source =	 getParam("source");//百度SEM

src/web/staticres/public-pc/css/pc-bottom.css

@@ -284,6 +284,7 @@
   cursor: pointer;
 }
 
+
 /* .right-side-box .right-side-pop::before {
   content: "客服热线：400-108-6670   服务时间：工作日 9:00-17:40";
   position: absolute;
@@ -578,6 +579,67 @@
     display: block;
 }
 
+.right-side-box .right-side-wework {
+    border-radius: 0 0 0 10px;
+    position: relative;
+    width: 100%;
+    height: 80px;
+    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;
+}
+
+#login-custom-gap{
+    height:16px;
+    background: transparent
+}
+.right-side-box .b-radius-left-top {
+   border-top-left-radius: 10px !important;
+}
 
 @media all and (-ms-high-contrast: none),
 (-ms-high-contrast: active) {

src/web/staticres/public-pc/js/pc-bottom.js

@@ -223,6 +223,30 @@ $(window).on('click', function (e) {
     }
   }
 })
+
+/**
+ * 获取客服二维码
+ */
+window.kefu = {
+  name: '',
+  remark: "专属客服",
+  wxer: ''
+}
+function getKefuInfo () {
+  $.ajax({
+    type: 'post',
+    url: '/bigmember/use/getCustom',
+    data: { type: "kf" },
+    success: function (res) {
+      if (res && res.data) {
+        const resData = res.data || {}
+        window.kefu = resData
+      }
+    }
+  })
+}
+getKefuInfo()
+
 $(function () {
   function getDomScreenHeight () {
     var clientHeight = [document.documentElement.clientHeight, document.body.clientHeight, window.screen.availHeight, window.screen.height]
@@ -302,6 +326,14 @@ $(function () {
   },function() {
     $('.right-side-box .kf-phone').hide()
   })
+
+  // 右侧客服企微
+  $('.right-side-wework').hover(function(e) {
+    $('.right-side-box .kf-wework img').attr('src', window.kefu.wxer)
+    $('.right-side-box .kf-wework').show()
+  },function() {
+    $('.right-side-box .kf-wework').hide()
+  })
 });
 ;(function(){
   // 动态设置copyright
@@ -350,6 +382,8 @@ $(function () {
     stypesearch(stype);
   })
 })();
+
+
 function zbsqClose(){
   $("#bidcommunity").modal("hide");
 }
@@ -456,4 +490,4 @@ function renderBottomCustomer (obj) {
   }
   $('.config_classify_r_box').append(html)
 }
-/** SEO优化-pcbottom.html内js迁移 END */
+/** SEO优化-pcbottom.html内js迁移 END */

src/web/templates/common/pcbottom.html

@@ -155,7 +155,19 @@
             </div>
           </div> -->
       </div>
-      <div class="right-side-phone right-side-wx common-right-side-item">
+        <div class="right-side-wework  common-right-side-item" id="customer-wework" style="display:none;">
+            <p class="text-customer">
+              <img src='{{Msg "seo" "cdn"}}/images/index/new/wework.png?v={{Msg "seo" "version"}}' alt="">
+            </p>
+            <p class="desc_text">客服企微</p>
+            <div class="silde-float kf-wework">
+                <img class="qrcode" src="" alt="">
+                <p>微信扫一扫</p>
+            </div>
+        </div>
+<!--        登录后的间隔-->
+       <div id="login-custom-gap"></div>
+      <div class="right-side-phone right-side-wx common-right-side-item" id="right-side-swhz">
           <span class="text-customer"><img src='{{Msg "seo" "cdn"}}/images/index/new/shangwuhezuo.png?v={{Msg "seo" "version"}}' alt=""></span>
           <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/index/new/shangwuhezuo-blue.png?v={{Msg "seo" "version"}}' alt=""></span>
           <p class="desc_text_b">商务合作</p>

src/web/templates/exhibition/pc/index.html

@@ -35,12 +35,17 @@
   <div id="vm_exhibition">
     <div class="box">
       <div class="head">
-        <div class="content">
-          <div class="qr">
-            <img src="{{Msg " seo" "cdn" }}/common-module/exhibition/img/qr-code-shichang.png?v={{Msg "seo" "version"}}" alt="">
-            <p class="text">扫码咨询 展会合作</p>
-          </div>
-        </div>
+          {{range $k,$v:=Ad "pc-exhibition-index-head" -1 .Host (cookie "SESSIONID")}}
+              <div class="exhibition-head" >
+                  <img src="{{Msg "seo" "cdn"}}{{$v.S_pic}}" alt="">
+              </div>
+          {{end}}
+<!--        <div class="content">-->
+<!--          <div class="qr">-->
+<!--            <img src="{{Msg " seo" "cdn" }}/common-module/exhibition/img/qr-code-shichang.png?v={{Msg "seo" "version"}}" alt="">-->
+<!--            <p class="text">扫码咨询 展会合作</p>-->
+<!--          </div>-->
+<!--        </div>-->
       </div>
       <h2 class="title pc_hide">热门展会</h2>
       <div class="content bannerSwiper">

src/web/templates/frontRouter/wx/fileRecord/sess/index.html

@@ -14,7 +14,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="format-detection" content="telephone=no">
-    <title>附件下载</title>
+    <title>22附件下载</title>
     <script src="/big-member/js/rem.js"></script>
     <!--S-当前页面的css资源-->
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />
@@ -404,15 +404,15 @@
               <h3>
                   <span>
                       <img src="{{Msg "seo" "cdn"}}/common-module/collection/image/wx2.png" alt="微信icon">
-                      <span>客户成功经理</span>
+                      <span>{ kefuInfo.remark || '专属客服' }</span>
                   </span>
                   <span class="close-icon" @click="kfDialogShow = false">
                       <img id="QRCode-pic" src="{{Msg "seo" "cdn"}}/jyapp/images/icon-close.png?v={{Msg "seo" "version"}}" alt="">
                   </span>
               </h3>
               <div class="content">
-                  <p class="qr-code">
-                      <img :src="QRCode" alt="">
+                  <p class="qr-code" v-if="kefuInfo.wxer">
+                      <img :src="kefuInfo.wxer" alt="">
                   </p>
                   <p>微信扫一扫</p>
               </div>