Merge remote-tracking branch 'origin/dev4.6.3' into dev4.6.3

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

@@ -440,6 +440,8 @@
                                     _this.$toast('认领成功')
                                 }
                                 _this.changeClaimState(!params.D)
+                            } else {
+                              _this.$toast(res.error_msg)
                             }
                         } else {
                             _this.$toast(res.error_msg)
@@ -627,7 +629,7 @@
                 }
                 $.ajax({
                     type: 'POST',
-                    url: '/follow/project/addTime',
+                    url: '/entnicheNew/follow/project/addTime',
                     data: {
                         bidopentime: _this.bidopentime,
                         remindtime: _this.remindTime,
@@ -657,7 +659,7 @@
                 this.quotashow = false
                 $.ajax({
                     type: 'POST',
-                    url: '/follow/project/add',
+                    url: '/entnicheNew/follow/project/add',
                     data: {
                         sid: _this.sid
                     },

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/wxinfocontent.html

@@ -1327,7 +1327,7 @@
           url: '/entnicheNew/follow/project/check',
           data: param,
           success: function(res) {
-            if(res.error_code == 0 &&fd.data&& fd.data.showFollow) {
+            if(res.error_code == 0 &&res.data&& res.data.showFollow) {
               $(".follow").css("display","")
               if(res.data.flag) {
                 followFlag = true
@@ -1811,7 +1811,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 != "" ){
@@ -2441,7 +2441,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/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/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/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)
     }