Merge branch 'dev4.6.3' of http://192.168.3.207:8080/qmx/jy into dev4.6.3

config_formal/publicapply_172.17.148.50/db.json

@@ -64,7 +64,15 @@
 		"passWord": "Topnet123",
 		"maxOpenConns":120,
 		"maxIdleConns":80
-		}
+		},
+	    "entnichePush": {
+	        "dbName": "jianyu",
+		"address": "172.17.4.202:3306",
+		"userName": "root",
+		"passWord": "Topnet123",
+		"maxOpenConns":300,
+		"maxIdleConns":80
+	    }
     },
     "bdcollection":"bdcollection",
     "bdlabel":"bdlabel"

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/client_buyer-example.js

@@ -11,7 +11,7 @@ var vipDialog = `
       <span class="vip_extend"><span>{{getTextMap.headText.top}}</span><br/>{{getTextMap.headText.bot}}</span>
   </div>
   <div class="openBtn">
-      <button style="width:auto;color:#2cb7ca;font-size:0.26rem;" class="" @click="goOpen(getTextMap.headText.top,getTextMap.headText.bot, getTextMap.source)">{{getTextMap.btnText}}</button>
+      <button style="width:auto;color:#2cb7ca;font-size:0.26rem;background:#fff;" class="" @click="goOpen(getTextMap.headText.top,getTextMap.headText.bot, getTextMap.source)">{{getTextMap.btnText}}</button>
   </div>
 </div>
 `

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -1358,6 +1358,8 @@ function appQuit (isKicked) {
     data: { isKicked: isKicked, sign: sign },
     dataType: "json",
     success: function (r) {
+      // 退出登录清除首页商机管理权限缓存
+      sessionStorage.removeItem("setEntStatus")
       if (!isKicked) {
         window.location.href = "/jyapp/free/login?back=index&flag=quit";
       }

src/jfw/modules/app/src/web/templates/big-member/page_client_follow_detail.html

@@ -26,6 +26,9 @@
 <div class="j-container">
     {{include "/big-member/header.html"}}
     <!--S-Vue-->
+    <div id="jyKeepEntComponent">
+        <keep-ent-component ref="vKeepComponent" @on-save-tag="onSaveTag" :bid="nowOpenBid" :first="false"></keep-ent-component>
+    </div>
     <div class="j-main prodetail" id="v-pro" v-cloak>
         <div class="prodetailTop">
             <div class="prodetail_title">
@@ -147,7 +150,7 @@
                         </div>
                         <span class="columnLine"></span>
                         <div class="claim" @click="claimBtn($event, this)">
-                          <span class="j-icon icon-add-claim"></span>
+                          <span class="j-icon icon-claim"></span>
                           <span class="icon-claim-text" style="color:#2ABED1;font-size: .26rem;">认领客户</span>
                         </div>
                       </div>
@@ -218,6 +221,7 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
+<script src='/common-module/keep-tags/keep-ent-tags-template.js?v={{Msg "seo" "version"}}'></script>
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 
@@ -275,6 +279,28 @@
         }
     }
     var localEmail =  {{.T.email}} || sessionStorage.getItem('reportEmail') || ''
+    // 商机管理-认领客户
+    var vKeepEntComponent = new Vue({
+        delimiters: ['${', '}'],
+        el: '#jyKeepEntComponent',
+        data: {
+            nowOpenBid: ''
+        },
+        methods: {
+            changeBid (id, type) {
+                this.nowOpenBid = id
+                this.$refs.vKeepComponent.ajaxAddKeep(id, type)
+            },
+            onSaveTag (data) {
+                var getclient = sessionStorage.getItem('setClientInfo')
+                if(getclient) {
+                    getclient = JSON.parse(getclient)
+                    getclient.label = data
+                    vm.setClaimState(getclient)
+                }
+            }
+        }
+    })
     var vNode = {
         delimiters: ['${', '}'],
         el: '#v-pro',
@@ -367,54 +393,70 @@
                 success: function(res) {
                   console.log(res)
                   if(res.data.iscoll) {
-                    if(res.data.names.length > 0) {
-                      $('.icon-claim-text').text('已认领')
-                    } else {
-                      $('.icon-claim-text').text('认领')
-                    }
+                    _this.changeClaimState(res.data.names.length > 0)
                   }
                 }
               })
             },
             // 认领
             claimBtn: function(e, that) {
-              e.stopPropagation()
-              let claim = $('.icon-claim-text').text()
-              if(claim == '已认领') {
-                this.$toast('不支持在该页面进行退回')
-                return
-              }
-              let _this = this
-              let params = {
-                "name": this.$data.prolist.buyer, //采购单位名称
-                "province": this.$data.prolist.area, //省份
-                "city": this.$data.prolist.city, //区域
-                "mold": 1, //1 认领；默认 0关注
-                "D": false, //true 取关；默认 false 关注
-              }
-              $.ajax({
-                type: 'POST',
-                url: '/entnicheNew/customer/attention',
-                contentType: 'application/json',
-                data: JSON.stringify(params),
-                success: function(res) {
-                  console.log(res)
-                  if(res.error_code == 0) {
-                    if(res.data) {
-                      if(params.mold == 0) {
-                        _this.follow = !_this.follow
-                      } else {
-                        _this.$toast('认领成功')
-                        $('.icon-claim-text').text('已认领')
-                      }
-                    } else {
-                      _this.$toast(res.error_msg)
-                    }
-                    // this.getActionState(utils.getParam('entName'), 'g')
-                    // this.getActionState(utils.getParam('entName'), 'r')
-                  }
+                e.stopPropagation()
+                let claim = $('.icon-claim-text').text()
+                var claimState = claim === '已认领'
+                // if(claim == '已认领') {
+                //   return this.$toast('不支持在该页面进行退回')
+                // }
+
+                let _this = this
+                let params = {
+                    "name": this.$data.prolist.buyer, //采购单位名称
+                    "province": this.$data.prolist.area, //省份
+                    "city": this.$data.prolist.city, //区域
+                    "mold": 1, //1 认领；默认 0关注
+                    "D": claimState, //true 取关；默认 false 关注
                 }
-              })
+                sessionStorage.setItem('setClientInfo', JSON.stringify(params))
+
+                if (!claimState) {
+                    vKeepEntComponent.changeBid(params.name, !claimState)
+                } else {
+                    // 取消认领
+                    this.setClaimState(params)
+                }
+            },
+            setClaimState: function (params) {
+                var _this = this
+                $.ajax({
+                    type: 'POST',
+                    url: '/entnicheNew/customer/attention',
+                    contentType: 'application/json',
+                    data: JSON.stringify(params),
+                    success: function(res) {
+                        if(res.error_code == 0) {
+                            if(res.data) {
+                                if (params.D) {
+                                    _this.$toast('取消认领成功')
+                                } else {
+                                    _this.$toast('认领成功')
+                                }
+                                _this.changeClaimState(!params.D)
+                            } else {
+                              _this.$toast(res.error_msg)
+                            }
+                        } else {
+                            _this.$toast(res.error_msg)
+                        }
+                    }
+                })
+            },
+            changeClaimState: function (f) {
+              if (f) {
+                $('.icon-claim-text').text('已认领')
+                $('.claim .j-icon').removeClass('icon-claim').addClass('icon-add-claim')
+              } else {
+                $('.icon-claim-text').text('认领客户')
+                $('.claim .j-icon').removeClass('icon-add-claim').addClass('icon-claim')
+              }
             },
             // 获取项目详情
             getProDetail: function () {
@@ -587,7 +629,7 @@
                 }
                 $.ajax({
                     type: 'POST',
-                    url: '/follow/project/addTime',
+                    url: '/entnicheNew/follow/project/addTime',
                     data: {
                         bidopentime: _this.bidopentime,
                         remindtime: _this.remindTime,
@@ -617,7 +659,7 @@
                 this.quotashow = false
                 $.ajax({
                     type: 'POST',
-                    url: '/follow/project/add',
+                    url: '/entnicheNew/follow/project/add',
                     data: {
                         sid: _this.sid
                     },
@@ -844,7 +886,7 @@
             }
         }
     }
-    var tt = new Vue(vNode)
+    var vm = new Vue(vNode)
 </script>
 
 </body>

src/jfw/modules/app/src/web/templates/big-member/page_client_list.html

@@ -427,7 +427,7 @@
                         console.log(res)
                         if(res.error_code == 0) {
                             if(res.data) {
-                                _this.$toast((params.D ? '取消' : '') +  '认领成功')
+                                _this.$toast(((params.D || params.B) ? '取消' : '') +  (params.hasOwnProperty('D') ? '认领' : '关注') + '成功')
                                 _this.getProjectList()
                             } else {
                                 _this.$toast(res.error_msg)

src/jfw/modules/app/src/web/templates/big-member/page_client_portrayal.html

@@ -146,7 +146,7 @@
               </div>
             </div>
             <!-- 采购单位通讯录 -->
-            <hispro-component @nomoredata="noMoreData" v-else class="history-list" type="client" :status="bigStatus" :buyer="buyer.name"></hispro-component>
+            <hispro-component v-else class="history-list" type="client"  :buyer="buyer.name"></hispro-component>
             <!-- 高级分析设置 -->
             <!-- 高级分析 -->
             <div class="win-analyse">

src/jfw/modules/app/src/web/templates/common/baiducc.html

@@ -190,16 +190,82 @@ function grafana_statistics(advName){
 
     try {
         jyClabUtils.init()
+
+        function initClabTracker () {
+            var trackURL = "https://cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web"
+
+            function loadJS (url, success) {
+                var scripts = document.getElementsByTagName('script')
+                for (var i = 0; i < scripts.length; i++) {
+                    if (scripts[i].src && scripts[i].src.indexOf(url) > -1) {
+                        if (success) success();
+                        return;
+                    }
+                }
+                var domScript = document.createElement('script');
+                domScript.src = url;
+                success = success || function () {
+                };
+                domScript.onload = domScript.onreadystatechange = function () {
+                    if (!this.readyState || 'loaded' === this.readyState || 'complete' === this.readyState) {
+                        success();
+                        this.onload = this.onreadystatechange = null;
+                        //this.parentNode.removeChild(this);
+                    }
+                }
+                document.getElementsByTagName('head')[0].appendChild(domScript);
+            }
+
+            function checkHasJquery () {
+                if (typeof jQuery === 'undefined') {
+                    return false
+                }
+                return $.fn.jquery
+            }
+
+            /* 拦截 clab_chunk 注入 */
+            var injectionTrackStatus = true
+            if (injectionTrackStatus) {
+                var tempCAppend =  document.head.appendChild
+                document.head.appendChild = function (t) {
+                    if (t.tagName === 'SCRIPT' && t.src.indexOf('cbe.huiju.cool/cbe/clab_chunk.js') !== -1) {
+                        t.src = '{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/track/clab_chunk.js'
+                    }
+                    return tempCAppend.bind(this)(t)
+                }
+            }
+
+
+            /* 注册荟聚SDK */
+            function registerClabTarcker (tracker) {
+                if (typeof tracker !== 'undefined' && typeof tracker.track === 'function') {
+                    clab_tracker = tracker
+                }
+                if (typeof clab_tracker !== 'undefined' && typeof clab_tracker.track === 'function') {
+                    clab_tracker.ready(function () {
+                        this.push({"pageType":"web"});
+                        this.track("open_page", jyClabUtils.getNowPageInfo());
+                    })
+                    /* 自定义事件传递 */
+                    if (checkHasJquery()) {
+                        $('body').on('click','*[data-cl-event]', function () {
+                            clab_tracker && clab_tracker.track($(this).attr('data-cl-event'))
+                        })
+                    }
+                }
+            }
+
+            /* 判断环境 */
+            if (typeof System !== 'undefined' && typeof System.import === 'function') {
+                System.import(trackURL).then(registerClabTarcker);
+            } else {
+                loadJS(trackURL, registerClabTarcker)
+            }
+        }
         // 荟聚
-        $.getScript('//cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web', function () {
-            clab_tracker.ready(function () {
-                this.push({"pageType":"web"});
-                this.track("open_page", jyClabUtils.getNowPageInfo());
-            })
-            $('body').on('click','*[data-cl-event]', function () {
-                clab_tracker && clab_tracker.track($(this).attr('data-cl-event'))
-            })
-        })
+        initClabTracker()
+
+
     } catch (error) {
         console.log(error)
     }

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -581,12 +581,6 @@
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/historypush.js?v={{Msg "seo" "version"}}'></script>
 <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-<script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
-<script>
-// 初始化
-var vConsole = new VConsole();
-console.log('Hello world');
-</script>
    <script>
         // 双11活动文案修改
         $.get('/jyactive/doubleEleven/isActiving?t=' + new Date().getTime(), function (r) {
@@ -958,6 +952,9 @@ console.log('Hello world');
             $(".listcontent").scrollTop(scrollTop);
             removeSessionStorage();
         } else {
+            if(historyVt == 's') {
+                $(".set_keyword").hide();
+            } 
             userId = sessionStorage.userId;
             $.ajax({
                 type: 'post',
@@ -1744,6 +1741,9 @@ function hasNoData() {
   var ajaxFlag = true;
 
   function ajaxFun(time, area, city, subscopeclass, buyerclass, key, subtype) {
+    if(historyVt == 's') {
+      $(".set_keyword").hide();
+    } 
       if (!ajaxFlag) {
           return
       }

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -650,6 +650,7 @@
       success: function(res) {
         console.log(res)
         if(res.error_code == 0) {
+          sessionStorage.setItem('setEntStatus', res.data.isNew)
           SuperSearch.isEntNicheNew = res.data.isNew
           jyUserPower.entniche = res.data.isNew || res.data.isPower
         }

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -2023,6 +2023,7 @@
         }
         // tabs 切换
         $(".tabs-nav div").on('click', function () {
+            var setEntStatus = sessionStorage.getItem('setEntStatus')
             $(this).addClass('active').siblings().removeClass('active')
             var nowIndex = $(this).index()
             var tipArr = ['多个关键词用空格隔开', '企业名称', '采购单位名称']
@@ -2033,7 +2034,7 @@
                 $(".search-header-box").addClass('m-r')
                 if (nowIndex !== 1) {
                   $(".search-header-box").removeAttr("action")
-                  if(SuperSearch.isEntNicheNew) {
+                  if(SuperSearch.isEntNicheNew || setEntStatus) {
                     $(".search-header-box").next().show()
                   } else {
                     $(".search-header-box").next().hide()

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -163,6 +163,9 @@
 <div id="jyKeepComponent">
     <keep-component ref="vKeepComponent" @on-save-tag="getKeepList" @on-change-keep="changeKeepStatus" :bid="nowOpenBid" :first="false"></keep-component>
 </div>
+<div id="jyKeepEntComponent">
+  <keep-ent-component ref="vKeepComponent" @on-save-tag="onSaveTag" :bid="nowOpenBid" :first="false"></keep-ent-component>
+</div>
 <div class="share1">
 
     <!-- 复制提示 star -->
@@ -844,6 +847,9 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src='/common-module/keep-tags/keep-tags-template.js?v={{Msg "seo" "version"}}'></script>
+<script src='/common-module/keep-tags/keep-ent-tags-template.js?v={{Msg "seo" "version"}}'></script>
+<!-- <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>
+<script> new VConsole(); </script> -->
 <script>
     var	shareimgflag = true;
     var area = {{.T.obj.area}}
@@ -1092,7 +1098,6 @@
                 window.fileNum = res.data.fileNum // 超级订阅用户可下载附件次数
                 bigstatus = res.data.memberStatus
                 hasServiceArr = res.data.power ? res.data.power : []
-                $('.commonUser').show()
                 isFollow()
                 if (window.isFree){
                   checkShowDialog()
@@ -1157,12 +1162,16 @@
                   $('.icon-help').css('display', 'inline-block')
                   $('.file-count').html(res.data.fileNum)
                 }
+                getNewEntRoot()
             },
             error:function(err) {
                 console.log(err)
             }
         })
-        $.ajax({
+    }
+
+    function getNewEntRoot () {
+      $.ajax({
           type: "post",
           url: '/entnicheNew/buy/whetherbuy',
           success: function(res) {
@@ -1172,6 +1181,9 @@
               if(res.data.isNew) {
                 $('.commonUser').hide()
                 $('.entnicheUser').show()
+                if(!{{.T.obj.buyer}}) {
+                  $('.entnicheUser .sum_right').hide()
+                }
                 getActionState ({{.T.obj.buyer}}, 'g')
                 getActionState ({{.T.obj.buyer}}, 'r')
               } else {
@@ -1182,6 +1194,7 @@
           }
         })
     }
+    getNewEntRoot()
     //isOpening()
     // 大会员引流文案
     function getDrainInfo () {
@@ -1298,20 +1311,16 @@
           contentType: 'application/json',
           data: JSON.stringify(params),
           success: function(res) {
-            console.log(res)
-            if(res.data.iscoll) {
+            if(res.data && res.data.iscoll) {
               claimData = true
-              // $('.icon_state').removeClass('icon-claim').addClass('icon-add-claim')
-              $('.icon-claim-text').text('已认领')
             } else {
               claimData = false
-              // $('.icon_state').removeClass('icon-add-claim').addClass('icon-claim')
-              $('.icon-claim-text').text('认领客户')
             }
+            changeClaimState(claimData)
           }
         })
       } else if (str == 'g') {
-        $(".follow").css("display","")
+
         // 关注
         let param = {
           sid:id
@@ -1321,8 +1330,8 @@
           url: '/entnicheNew/follow/project/check',
           data: param,
           success: function(res) {
-            console.log(res)
-            if(res.error_code == 0) {
+            if(res.error_code == 0 &&res.data&& res.data.showFollow) {
+              $(".follow").css("display","")
               if(res.data.flag) {
                 followFlag = true
                 $(".follow").addClass('follow_vip').html('<i class="glyphicon yiguanzhu"></i>已关注');
@@ -1339,41 +1348,84 @@
     // 商机管理---认领
     function setClientClaim (e) {
       e.preventDefault()
-      if(claimData) {
-        EasyAlert.show("不支持在该页面进行退回");
-        return
-      }
+      // if(claimData) {
+      //   EasyAlert.show("不支持在该页面进行退回");
+      //   return
+      // }
+      // claimData:true则当前为已认领
       if(window.entniche) {
         params = {
-          "userId": 123,
           "name": {{.T.obj.buyer}}, //采购单位名称
           "province": {{.T.obj.area}}, //省份
           "city": {{.T.obj.city}}, //区域
           "mold": 1, //1 认领；默认 0关注
           "D": claimData, //true 取关；默认 false 关注
         }
-        $.ajax({
-          type: 'POST',
-          url: '/entnicheNew/customer/attention',
-          contentType: 'application/json',
-          data: JSON.stringify(params),
-          success: function(res) {
-            console.log(res)
-            if(res.error_code == 0) {
-              if(res.data) {
-                if(claimData) {
-                  // $('.icon_state').removeClass('icon-add-claim').addClass('icon-claim')
-                } else {
-                  $('.icon-claim-text').text('已认领')
-                  // $('.icon_state').removeClass('icon-claim').addClass('icon-add-claim')
-                }
+
+        sessionStorage.setItem('setClientInfo', JSON.stringify(params))
+        if (!claimData) {
+          vKeepEntComponent.changeBid(params.name, !claimData)
+        } else {
+          // 取消认领
+          setClaimState(params)
+        }
+      }
+    }
+
+    function setClaimState (params) {
+      $.ajax({
+        type: 'POST',
+        url: '/entnicheNew/customer/attention',
+        contentType: 'application/json',
+        data: JSON.stringify(params),
+        success: function(res) {
+          if(res.error_code == 0) {
+            if(res.data) {
+              claimData = !claimData
+              changeClaimState(claimData)
+              if (claimData) {
+                EasyAlert.show('认领成功')
+              } else {
+                EasyAlert.show('取消认领成功')
               }
             }
           }
-        })
+        }
+      })
+    }
+    function changeClaimState (f) {
+      if (f) {
+        $('.icon-claim-text').text('已认领')
+        $('.icon_state').removeClass('icon-claim').addClass('icon-add-claim')
+      } else {
+        $('.icon-claim-text').text('认领客户')
+        $('.icon_state').removeClass('icon-add-claim').addClass('icon-claim')
       }
     }
 
+    // 商机管理-认领客户
+    var vKeepEntComponent = new Vue({
+      delimiters: ['${', '}'],
+      el: '#jyKeepEntComponent',
+      data: {
+        nowOpenBid: ''
+      },
+      methods: {
+        changeBid (id, type) {
+          this.nowOpenBid = id
+          this.$refs.vKeepComponent.ajaxAddKeep(id, type)
+        },
+        onSaveTag (data) {
+          var getclient = sessionStorage.getItem('setClientInfo')
+          if(getclient) {
+            getclient = JSON.parse(getclient)
+            getclient.label = data
+            setClaimState(getclient)
+          }
+        }
+      }
+    })
+
     function setportain (e) {
       e.preventDefault()
       location.href = '/jyapp/big/page/client_portrayal?entName=' + encodeURIComponent({{.T.obj.buyer}}) + '&from=client'
@@ -1762,7 +1814,7 @@
                     }
                     if(res.data.memberStatus <= 0 || hasServiceArr.indexOf(14) == -1){
                         if (newEntNiche) {
-                            return goMemberFollowPage('/jyapp/big/page/client_follow_detail')
+                            return goMemberFollowPage('/jyapp/big/page/client_follow_detail?from=client')
                         }
                         if (hsn){
                             if (projectname != "" || projectcode != "" ){
@@ -1938,7 +1990,7 @@
           buyertel_show = "hide"
       }
       outhtml +='<li class="caigouunit commonUser"><p class="name">采购单位</p><div class="unitcenter"><p  class="textcontent">'+rerbuyer+'</p><div class="unitbtn '+rerbuyer_show+'">立即查看<span class="iconunit" style="display:none;"></span></div></div></li>'
-      outhtml +='<li class="entnicheUser"><p class="name">采购单位</p><div class="unitcenter sum_caigou client_caigou"><p  class="textcontent">'+rerbuyer+'</p><div class="sum_right"><div class="claim" onClick="setportain(event)"><span class="j-icon icon-porait"></span><span class="getproit" style="color:#2ABED1">查看画像</span></div><span class="columnLine"></span><div class="claim clientClaim" onClick="setClientClaim(event)"><span class="j-icon icon_state icon-add-claim"></span><span class="icon-claim-text" style="color:#2ABED1;font-size: .26rem;">认领客户</span></div></div></div></li>'
+      outhtml +='<li class="entnicheUser"><p class="name">采购单位</p><div class="unitcenter sum_caigou client_caigou"><p  class="textcontent">'+rerbuyer+'</p><div class="sum_right"><div class="claim" onClick="setportain(event)"><span class="j-icon icon-porait"></span><span class="getproit" style="color:#2ABED1">查看画像</span></div><span class="columnLine"></span><div class="claim clientClaim" onClick="setClientClaim(event)"><span class="j-icon icon_state icon-claim"></span><span class="icon-claim-text" style="color:#2ABED1;font-size: .26rem;">认领客户</span></div></div></div></li>'
       outhtml +='<li><p class="name">采购联系人</p><p class="textcontent">'+rerbuyerperson+'</p></li>'+
           '<li class="bbm0"><p class="name">采购电话</p><p class="textcontent">'+rerbuyertel+'</p><a class="border-tel_ '+buyertel_show+'" style="position: static;display:block" datalink="/jyapp/vipsubscribe/introducePage"><div class="tel"></div></a></li>'
       if(packageCon==""){
@@ -2045,7 +2097,7 @@
               }
             */
             //  大会员用户、非大会员用户都可跳转采购单位画像
-            if(window.entniche) { return }
+            if(newEntNiche) { return }
             location.href = "/jyapp/big/page/unit_portrayal?entName="+encodeURIComponent(rerbuyer)
         }
 
@@ -2392,7 +2444,7 @@
           // 添加关注的项目
           let cancelurl = '/bigmember/follow/project/cancel'
           let confirmurl = '/bigmember/follow/project/add'
-          if(window.entniche) {
+          if(newEntNiche) {
             cancelurl = '/entnicheNew/follow/project/cancel'
             confirmurl = '/entnicheNew/follow/project/add'
           }

src/jfw/modules/publicapply/src/active/21yearEndReport.go

@@ -68,6 +68,11 @@ func (this *YearEndReport) YearEndReportApi() {
 		if userId == "" {
 			return nil, fmt.Errorf("未登录")
 		}
+		openid := qutil.ObjToString(this.Session().Get("s_m_openid"))
+		if !checkUserIsSubscribe(openid) {
+			return nil, fmt.Errorf("未关注")
+		}
+
 		if time.Now().Unix() > yearEndReportEndTimeStamp {
 			return nil, fmt.Errorf("不在活动期限内")
 		}
@@ -138,3 +143,22 @@ func getRandom(userId string, t int64) int32 {
 	}
 	return int32(i)%9 + 1
 }
+
+//checkUserIsSubscribe 检查用户是否关注
+func checkUserIsSubscribe(openid string) bool {
+	if openid != "" {
+		user, ok := db.Mgo.FindOneByField("user", map[string]interface{}{
+			"i_appid":    2,
+			"s_m_openid": openid,
+			"s_unionid":  map[string]interface{}{"$ne": openid},
+		}, `{"i_ispush":1}`)
+		if ok && user != nil {
+			if (*user)["_id"] == nil || qutil.IntAllDef((*user)["i_ispush"], 1) == 0 {
+				return false
+			} else {
+				return true
+			}
+		}
+	}
+	return false
+}

src/jfw/modules/publicapply/src/subscribePush/service/pushList.go

@@ -32,7 +32,6 @@ type SubscribePush struct {
 func (sp *SubscribePush) VipSwitch() {
 	userId, _ := sp.GetSession("userId").(string)
 	//entUserId := util.IntAll(sp.GetSession("entUserId"))
-	fmt.Println("11111111111",util.IntAll(sp.GetSession("entUserId")))
 	rData, errMsg := func() (interface{}, error) {
 		if userId == "" {
 			return nil, fmt.Errorf("未登录")
@@ -40,9 +39,8 @@ func (sp *SubscribePush) VipSwitch() {
 		switchOk := false
 		vt := sp.GetString("vt")
 		if vt == "" {
-			vt=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+			vt = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 			sp.SetSession(jy.SwitchService.SessionKey, vt)
-			fmt.Println("1231233",vt)
 		} else if vt == jy.SubVipFlag {
 			vipMsg := jy.GetBigVipUserBaseMsg(userId, db.Mysql, db.Mgo)
 			if vipMsg.VipStatus <= 0 {
@@ -87,11 +85,9 @@ func (sp *SubscribePush) HasPushHistory() {
 
 	vipType := sp.GetString("vt")
 	if vipType == "" { //默认取已切换的企业
-		vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+		vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 	}
-	fmt.Println("12312",vipType,userId,	util.IntAll(sp.GetSession("entUserId")))
-	if vipType==jy.SwitchService.Entniche{
-		fmt.Println(util.IntAll(sp.GetSession("entUserId")))
+	if vipType == jy.SwitchService.Entniche {
 		userId = fmt.Sprint(util.IntAll(sp.GetSession("entUserId")))
 	}
 	go entity.HistoryPush.UpdateUserPushUnread(userId, vipType)
@@ -208,9 +204,9 @@ func (sp *SubscribePush) HistoryPaging() {
 	}
 	vipType := sp.GetString("vt")
 	if vipType == "" { //默认取已切换的企业
-		vipType=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+		vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 	}
-	if vipType==jy.SwitchService.Entniche{
+	if vipType == jy.SwitchService.Entniche {
 		userId = fmt.Sprint(util.IntAll(sp.GetSession("entUserId")))
 	}
 	pageNum, _ := sp.GetInteger("pageNum")
@@ -272,7 +268,7 @@ func (sp *SubscribePush) SetRead() error {
 	}
 	vipType := sp.GetString("vt")
 	if vipType == "" { //默认取已切换的企业
-		vipType=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+		vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 	}
 	if userId := util.ObjToString(sp.GetSession("userId")); userId != "" {
 		if vipType == jy.SwitchService.Member {
@@ -303,7 +299,7 @@ func (sp *SubscribePush) GetPushCount() error {
 	if userId != "" {
 		vipType := sp.GetString("vt")
 		if vipType == "" { //默认取已切换的企业
-			vipType=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+			vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 
 		}
 		matchway, _ := sp.GetInteger("matchway")
@@ -322,7 +318,7 @@ func (sp *SubscribePush) GetPushAllCount() error {
 		index, _ := sp.GetInteger("index")
 		vipType := sp.GetString("vt")
 		if vipType == "" { //默认取已切换的企业
-			vipType=jy.SwitchService.GetEntniche(sp.Session(), db.Mgo,db.Mysql)
+			vipType = jy.SwitchService.GetEntniche(sp.Session(), db.Mgo, db.Mysql)
 		}
 		sp.ServeJson(map[string]interface{}{
 			"count": entity.SubViewDatasCount(userId, vipType, sp.GetString("item"), index),

src/web/staticres/common-module/collection/js/history-project.js

@@ -146,7 +146,7 @@ var hisproComponent = {
                 _this.list = res.data.list
               }
             } else {
-              this.$emit('nomoredata', res.data)
+              // this.$emit('nomoredata', res.data)
             }
           } else {
             loading.clear()

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -1541,7 +1541,7 @@ if (navigator.userAgent.toLowerCase().indexOf('micromessenger') === -1) {
                     data.claim = !data.claim
                   }
                   _this.$toast('操作成功')
-                  _this.onLoad()
+                  _this.doQueryList()
                 } else {
                   _this.$toast(res.error_msg)
                 }

src/web/staticres/common-module/keep-tags/keep-ent-tags-template.js

@@ -1,4 +1,4 @@
-var tempStyleComponent = `<style>
+var tempEntStyleComponent = `<style>
 /*
 * Prefixed by https://autoprefixer.github.io
 * PostCSS: v7.0.29,
@@ -337,7 +337,7 @@ Vue.component('keep-ent-component', {
     }
   } ,
   mounted () {
-    $('head').append(tempStyleComponent)
+    $('head').append(tempEntStyleComponent)
     // if (this.first) {
     //   this.ajaxGetAllTags()
     // }

src/web/staticres/common-module/public/fotter.js

@@ -85,57 +85,81 @@ var jyClabUtils = {
 }
 
 try {
+    jyClabUtils.init()
+
+    function initClabTracker () {
+        var trackURL = "https://cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web"
 
-    function checkHasJquery () {
-        if (typeof jQuery === 'undefined') {
-            return false
+        function loadJS (url, success) {
+            var scripts = document.getElementsByTagName('script')
+            for (var i = 0; i < scripts.length; i++) {
+                if (scripts[i].src && scripts[i].src.indexOf(url) > -1) {
+                    if (success) success();
+                    return;
+                }
+            }
+            var domScript = document.createElement('script');
+            domScript.src = url;
+            success = success || function () {
+            };
+            domScript.onload = domScript.onreadystatechange = function () {
+                if (!this.readyState || 'loaded' === this.readyState || 'complete' === this.readyState) {
+                    success();
+                    this.onload = this.onreadystatechange = null;
+                    //this.parentNode.removeChild(this);
+                }
+            }
+            document.getElementsByTagName('head')[0].appendChild(domScript);
         }
-        return $.fn.jquery
-    }
 
-    function loadJS (url, success) {
-        var scripts = document.getElementsByTagName('script')
-        for (var i = 0; i < scripts.length; i++) {
-            if (scripts[i].src && scripts[i].src.indexOf(url) > -1) {
-                if (success) success();
-                return;
+        function checkHasJquery () {
+            if (typeof jQuery === 'undefined') {
+                return false
             }
+            return $.fn.jquery
         }
-        var domScript = document.createElement('script');
-        domScript.src = url;
-        success = success || function () {
-        };
-        domScript.onload = domScript.onreadystatechange = function () {
-            if (!this.readyState || 'loaded' === this.readyState || 'complete' === this.readyState) {
-                success();
-                this.onload = this.onreadystatechange = null;
-                //this.parentNode.removeChild(this);
+
+        /* 拦截 clab_chunk 注入 */
+        var injectionTrackStatus = true
+        if (injectionTrackStatus) {
+            var tempCAppend =  document.head.appendChild
+            document.head.appendChild = function (t) {
+                if (t.tagName === 'SCRIPT' && t.src.indexOf('cbe.huiju.cool/cbe/clab_chunk.js') !== -1) {
+                    t.src = '/common-module/track/clab_chunk.js'
+                }
+                return tempCAppend.bind(this)(t)
             }
         }
-        document.getElementsByTagName('head')[0].appendChild(domScript);
-    }
 
-    function initClabTrack () {
-        // 荟聚
-        $('body').on('click','*[data-cl-event]', function () {
-            clab_tracker && clab_tracker.track($(this).attr('data-cl-event'))
-        })
-    }
 
-    jyClabUtils.init()
-    // 荟聚
-    loadJS('//cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web', function () {
-        clab_tracker.ready(function () {
-            this.push({"pageType":"web"});
-            this.track("open_page", jyClabUtils.getNowPageInfo());
-        })
-    })
+        /* 注册荟聚SDK */
+        function registerClabTarcker (tracker) {
+            if (typeof tracker !== 'undefined' && typeof tracker.track === 'function') {
+                clab_tracker = tracker
+            }
+            if (typeof clab_tracker !== 'undefined' && typeof clab_tracker.track === 'function') {
+                clab_tracker.ready(function () {
+                    this.push({"pageType":"web"});
+                    this.track("open_page", jyClabUtils.getNowPageInfo());
+                })
+                /* 自定义事件传递 */
+                if (checkHasJquery()) {
+                    $('body').on('click','*[data-cl-event]', function () {
+                        clab_tracker && clab_tracker.track($(this).attr('data-cl-event'))
+                    })
+                }
+            }
+        }
 
-    if (checkHasJquery()) {
-        initClabTrack()
-    } else {
-        loadJS('//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js', initClabTrack)
+        /* 判断环境 */
+        if (typeof System !== 'undefined' && typeof System.import === 'function') {
+            System.import(trackURL).then(registerClabTarcker);
+        } else {
+            loadJS(trackURL, registerClabTarcker)
+        }
     }
+    // 荟聚
+    initClabTracker()
 
 } catch (error) {
     console.log(error)

src/web/staticres/js/pur-search-index-pc.js

@@ -463,7 +463,8 @@ var vm = new Vue({
             this.getList(p)
         },
         goTitle(name) {
-            location.href = '/entpc/unit_portrayal/' + name
+            // location.href = '/entpc/unit_portrayal/' + name
+            window.open('/entpc/unit_portrayal/' + name)
         },
         // 全选
         allChange() {
@@ -496,24 +497,24 @@ var vm = new Vue({
                 $('.check-all').prop('checked', false)
             }
             this.selectName = arr1
-            // var tempArray1 = this.arrDefault(this.selectName, this.attentionName)
-            // var tempArray2 = this.arrDefault(this.selectName, this.claimcheckName)
-            // if (tempArray1.length == 0) {
-            //     this.follow = true
-            //     if (this.selectName.length == 0) {
-            //         this.follow = false
-            //     }
-            // } else {
-            //     this.follow = false
-            // }
-            // if (tempArray2.length == 0) {
-            //     this.claim = true
-            //     if (this.selectName.length == 0) {
-            //         this.claim = false
-            //     }
-            // } else {
-            //     this.claim = false
-            // }
+            var tempArray1 = this.arrDefault(this.selectName, this.attentionName)
+            var tempArray2 = this.arrDefault(this.selectName, this.claimcheckName)
+            if (tempArray1.length == 0) {
+                this.follow = true
+                if (this.selectName.length == 0) {
+                    this.follow = false
+                }
+            } else {
+                this.follow = false
+            }
+            if (tempArray2.length == 0) {
+                this.claim = true
+                if (this.selectName.length == 0) {
+                    this.claim = false
+                }
+            } else {
+                this.claim = false
+            }
         },
         // 是否关注企业
         attentionCheck(arrs, item) {
@@ -592,16 +593,16 @@ var vm = new Vue({
                         }
                     } else {
                         _this.getList(_this.listState.pageNum)
-                        if (per && this.follow) {
-                            this.follow = false
-                        } else {
-                            this.follow = true
-                        }
-                        if (per && this.claim) {
-                            this.claim = false
-                        } else {
-                            this.claim = true
-                        }
+                        // if (per && this.follow) {
+                        //     this.follow = false
+                        // } else {
+                        //     this.follow = true
+                        // }
+                        // if (per && this.claim) {
+                        //     this.claim = false
+                        // } else {
+                        //     this.claim = true
+                        // }
                     }
                 }.bind(this)
             })
@@ -629,20 +630,20 @@ var vm = new Vue({
                 var tempArray2 = this.arrDefault(this.selectName, this.claimcheckName)
                 if (type == 0) {
                     if (tempArray1.length == 0) {// 批量取关
-                        // this.follow = true
+                        this.follow = true
                         this.attention(String(this.selectName), type, true, 'pi') 
                     } else if (tempArray1.length == this.selectName.length) {// 批量关注
-                        // this.follow = false
+                        this.follow = false
                         this.attention(String(this.selectName), type, false, 'pi')
                     } else {
                         toastFn('关注和取消不能同时进行！', 2000)
                     }
                 } else {
                     if (tempArray2.length == 0) {// 批量取认领
-                        // this.claim = true
+                        this.claim = true
                         this.attention(String(this.selectName), type, true, 'pi') 
                     } else if (tempArray2.length == this.selectName.length) {// 批量认领
-                        // this.claim = false
+                        this.claim = false
                         this.attention(String(this.selectName), type, false, 'pi')
                     } else {
                         toastFn('认领和取消不能同时进行！', 2000)

src/web/templates/common/baiducc.html

@@ -209,16 +209,79 @@
 
     try {
         jyClabUtils.init()
+        function initClabTracker () {
+            var trackURL = "https://cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web"
+
+            function loadJS (url, success) {
+                var scripts = document.getElementsByTagName('script')
+                for (var i = 0; i < scripts.length; i++) {
+                    if (scripts[i].src && scripts[i].src.indexOf(url) > -1) {
+                        if (success) success();
+                        return;
+                    }
+                }
+                var domScript = document.createElement('script');
+                domScript.src = url;
+                success = success || function () {
+                };
+                domScript.onload = domScript.onreadystatechange = function () {
+                    if (!this.readyState || 'loaded' === this.readyState || 'complete' === this.readyState) {
+                        success();
+                        this.onload = this.onreadystatechange = null;
+                        //this.parentNode.removeChild(this);
+                    }
+                }
+                document.getElementsByTagName('head')[0].appendChild(domScript);
+            }
+
+            function checkHasJquery () {
+                if (typeof jQuery === 'undefined') {
+                    return false
+                }
+                return $.fn.jquery
+            }
+
+            /* 拦截 clab_chunk 注入 */
+            var injectionTrackStatus = true
+            if (injectionTrackStatus) {
+                var tempCAppend =  document.head.appendChild
+                document.head.appendChild = function (t) {
+                    if (t.tagName === 'SCRIPT' && t.src.indexOf('cbe.huiju.cool/cbe/clab_chunk.js') !== -1) {
+                        t.src = '{{Msg "seo" "cdn"}}/common-module/track/clab_chunk.js'
+                    }
+                    return tempCAppend.bind(this)(t)
+                }
+            }
+
+
+            /* 注册荟聚SDK */
+            function registerClabTarcker (tracker) {
+                if (typeof tracker !== 'undefined' && typeof tracker.track === 'function') {
+                    clab_tracker = tracker
+                }
+                if (typeof clab_tracker !== 'undefined' && typeof clab_tracker.track === 'function') {
+                    clab_tracker.ready(function () {
+                        this.push({"pageType":"web"});
+                        this.track("open_page", jyClabUtils.getNowPageInfo());
+                    })
+                    /* 自定义事件传递 */
+                    if (checkHasJquery()) {
+                        $('body').on('click','*[data-cl-event]', function () {
+                            clab_tracker && clab_tracker.track($(this).attr('data-cl-event'))
+                        })
+                    }
+                }
+            }
+
+            /* 判断环境 */
+            if (typeof System !== 'undefined' && typeof System.import === 'function') {
+                System.import(trackURL).then(registerClabTarcker);
+            } else {
+                loadJS(trackURL, registerClabTarcker)
+            }
+        }
         // 荟聚
-        $.getScript('//cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web', function () {
-            clab_tracker.ready(function () {
-                this.push({"pageType":"web"});
-                this.track("open_page", jyClabUtils.getNowPageInfo());
-            })
-            $('body').on('click','*[data-cl-event]', function () {
-                clab_tracker && clab_tracker.track($(this).attr('data-cl-event'))
-            })
-        })
+        initClabTracker()
     } catch (error) {
         console.log(error)
     }