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

src/web/staticres/common-module/consult-dialog/js/index.js

@@ -17,33 +17,48 @@ var consultDialog = new Vue({
   created: function () {
   },
   mounted: function () {
-    this.getimage()
+    this.getKefuInfo()
   },
   methods: {
-      getimage: function () {
-          var this_ = this
-          $.ajax({
-              type: 'POST',
-              url: '/bigmember/use/equity',
-              data: {
-
-              },
-              success: function (res) {
-                  if (res.data) {
-                      var customers = res.data.customers
-                      customers.forEach(function (ele) {
-                          if (ele.vip == false) {
-                              this_.img = ele.wxer
-
-                          } else if (ele.vip == true) {
-                              this_.vip_img = ele.wxer
-
-                          }
-                      });
-                      this_.getstates()
-                  }
-              }
-          })
+      // getimage: function () {
+      //     var this_ = this
+      //     $.ajax({
+      //         type: 'POST',
+      //         url: '/bigmember/use/equity',
+      //         data: {
+      //
+      //         },
+      //         success: function (res) {
+      //             if (res.data) {
+      //                 var customers = res.data.customers
+      //                 customers.forEach(function (ele) {
+      //                     if (ele.vip == false) {
+      //                         this_.img = ele.wxer
+      //
+      //                     } else if (ele.vip == true) {
+      //                         this_.vip_img = ele.wxer
+      //
+      //                     }
+      //                 });
+      //                 this_.getstates()
+      //             }
+      //         }
+      //     })
+      // },
+      getKefuInfo: function () {
+        var _this = this
+        $.ajax({
+          type: 'post',
+          url: '/bigmember/use/getCustom',
+          data: { type: "kf" },
+          success: function (res) {
+            if (res && res.data) {
+              const resData = res.data || {}
+              _this.url = resData.wxer
+              _this.getstates()
+            }
+          }
+        })
       },
       getstates: function () {
         var this_ = this
@@ -70,11 +85,11 @@ var consultDialog = new Vue({
                     }
                 }
                 if(this_.isbuy_big){
-                  this_.url = this_.vip_img
+                  // this_.url = this_.vip_img
                   this_.text='扫一扫，立即联系您的专属客服'
 
                 }else{
-                  this_.url = this_.img
+                  // this_.url = this_.img
                   this_.text='扫一扫，立即联系客户经理'
                 }
             }
@@ -82,7 +97,7 @@ var consultDialog = new Vue({
     },
     close: function (val) {
           this[val] = false
-   },   
+   },
   }
 })
 

src/web/staticres/frontRouter/pc/fileHistory/js/index-pc.js

@@ -147,6 +147,7 @@ var fileRecorder = new Vue({
     this.getUserPower()
     this.subPoint()
     this.subRecord()
+    this.getKefuInfo()
   },
   methods: {
     getUserPower () {
@@ -158,28 +159,25 @@ var fileRecorder = new Vue({
           if (res && res.data) {
             for (var key in res.data) {
               _this.$set(_this.userPower, key, res.data[key])
-              _this.calcKefuInfo()
+              // _this.calcKefuInfo()
             }
           }
         }
       })
     },
-    calcKefuInfo: function () {
-      var customers = this.userPower.customers
-      if (!$.isArray(customers)) {
-        return
-      }
-      var target;
-      for (var i = 0; i < customers.length; i++) {
-        if (customers[i].remark.indexOf('成功') > -1) {
-          target = customers[i]
-          break
+    getKefuInfo: function () {
+      var _this = this
+      $.ajax({
+        type: 'post',
+        url: '/bigmember/use/getCustom',
+        success: function (res) {
+          if (res && res.data) {
+            const resData = res.data || {}
+            _this.kefu.qr = resData.wxer
+            _this.kefu.name = resData.remark
+          }
         }
-      }
-      if (target) {
-        this.kefu.qr = target.wxer
-        this.kefu.name = target.remark
-      }
+      })
     },
     cellClick (row, column, cell, event) {
       console.log(row, column, cell, event)

src/web/staticres/serviceSystem/js/serviceSystem.js

@@ -8,11 +8,10 @@ var vNode = new Vue({
             tabs: 0,
             tablist: ['供应商服务', '采购单位服务', '招标代理机构服务'],
             isshow: false,
-            text: '扫一扫，立即联系客户经理',
-            // 扫一扫，立即联系您的专属客服
-            url: '',
-            img: "",
-            vip_img: "",
+            kefu: {
+              text: '扫一扫，立即联系客户经理',
+              qr: ''
+            },
             loginFlag: false,
             isbuy_vip: false,
             isbuy_big: false,
@@ -31,7 +30,7 @@ var vNode = new Vue({
           this.urlParams = this.getUrlKey('from')
         }
         this.getcode()
-        this.getImage()
+        this.getKefuInfo()
     },
     mounted: function () {
         this.calcFixedTop()
@@ -79,30 +78,22 @@ var vNode = new Vue({
             })
 
         },
-        getImage: function() {
-            var this_ = this
-            // 此接口未登录也能获取客服信息
-            $.ajax({
-                type: 'POST',
-                url: '/bigmember/use/equity',
-                success: function (res) {
-                    if (res.data) {
-                        // 客服二维码
-                        var customers = res.data.customers
-                        customers.forEach(function (ele) {
-                            if (ele.vip) {
-                              this_.vip_img = ele.wxer
-                            } else  {
-                              this_.img = ele.wxer
-                            }
-                        });
-                    }
-                }
-            })
+       // 获取客服信息
+        getKefuInfo: function () {
+          var _this = this
+          $.ajax({
+            type: 'post',
+            url: '/bigmember/use/getCustom',
+            success: function (res) {
+              if (res && res.data) {
+                const resData = res.data || {}
+                _this.kefu.qr = resData.wxer
+              }
+            }
+          })
         },
         close: function(val) {
             this[val] = false
-
         },
         export_my: function() {//自助导出
             if (this.loginFlag) {
@@ -138,7 +129,7 @@ var vNode = new Vue({
                 //去购买
                 window.location.href = "/swordfish/page_big_pc/free/svip/buy"
             } else {
-                // 进入续费活动页 
+                // 进入续费活动页
                 // window.location.href="/swordfish/page_big_pc/free/svip/buy?type=renew"
                 window.location.href = this.vipRenewActivityPage
               }
@@ -153,7 +144,7 @@ var vNode = new Vue({
               }
             } else {
               // this.toast('您已开通大会员')
-              // 进入续费活动页 
+              // 进入续费活动页
               window.location.href = this.bigRenewActivityPage
             }
           }
@@ -163,25 +154,11 @@ var vNode = new Vue({
           // this.vipshow = true
           location.href = '/page_workDesktop/'
         },
-        showBigCustomQrDialog: function () {
-            if (this.isbuy_big || this.powerInfo.entniche) {
-                this.text = '扫一扫，立即联系您的专属客服'
-                this.url = this.vip_img
-            } else {
-                this.text = '扫一扫，立即联系客户经理'
-                this.url = this.img
-            }
-            this.isshow = true
-        },
         consultation: function(val) {
-
             if (val == 0 && this.isbuy_big) {//供应商服务
-                this.text = '扫一扫，立即联系您的专属客服'
-                this.url = this.vip_img
-
+              this.kefu.text = '扫一扫，立即联系您的专属客服'
             } else {
-                this.text = '扫一扫，立即联系客户经理'
-                this.url = this.img
+              this.kefu.text = '扫一扫，立即联系客户经理'
             }
             this.isshow = true
         },

src/web/templates/frontRouter/pc/serviceSystem/free/index.html

@@ -975,9 +975,9 @@
                 <img src="/serviceSystem/img/close.png" alt="" class="close" @click.stop="close('isshow')">
                 <div class="title">立即咨询</div>
                 <div class="box">
-                    <img :src="url" alt="">
+                    <img :src="kefu.qr" alt="">
                 </div>
-                <p class="text">{text}</p>
+                <p class="text">{kefu.text}</p>
             </div>
         </div>
         <div class="model_ toast_model" v-show="showToast"  @click.self="close('showToast')">

src/web/templates/pc/dataExport_sieve.html

@@ -1478,6 +1478,9 @@
   var winnerLimit = limit.winnerLimit || 100
   var agencyLimit = limit.agencyLimit || 100
   var wordsLimit =  limit.countLimit
+  var kefu = {
+    qr: ''
+  }
   console.log(limit);
   var dataNode = new Vue({
     delimiters: ['${', '}'],
@@ -2370,15 +2373,27 @@
       }
     }
   })
-  $('.customWx').mouseenter(function () {
-    if(window.customers && window.customers.length) {
-      window.customers.forEach(function(item) {
-        var $item = $(item)
-        var $img = $('.custom-service-wximg-img')
-        if(item.name === '高静') {
-          $img.attr('src', item.wxer)
+
+   function getKefuInfo () {
+    $.ajax({
+      type: 'post',
+      url: '/bigmember/use/getCustom',
+      data: { type: "kf" },
+      success: function (res) {
+        if (res && res.data) {
+          const resData = res.data || {}
+          kefu.qr = resData.wxer
         }
-      })
+      }
+    })
+  }
+  getKefuInfo()
+
+
+  $('.customWx').mouseenter(function () {
+    if(kefu && kefu.qr) {
+      var $img = $('.custom-service-wximg-img')
+      $img.attr('src', kefu.qr)
     }
     $('.custom-service-wximg').show()
   })