瀏覽代碼

Merge branch 'release4.7.33'

123456 2 年之前
父節點
當前提交
5a1cbc045b

+ 2 - 1
src/jfw/front/shorturl.go

@@ -389,7 +389,8 @@ func (s *Short) Article(stype, id string) error {
 		if obj != nil && len(obj) > 0 {
 		if obj != nil && len(obj) > 0 {
 			var node bool
 			var node bool
 			if ((isVip && isOldVip) || isMember || isEntniche) || //老版本vip、大会员、商机管理
 			if ((isVip && isOldVip) || isMember || isEntniche) || //老版本vip、大会员、商机管理
-				((isVip && !isOldVip) && (!(util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向"))) { //新超级订阅非采购意向”和“拟建项目”
+				((isVip && !isOldVip) && (!(util.ObjToString(obj["subtype"]) == "拟建" || util.ObjToString(obj["subtype"]) == "采购意向"))) || //新超级订阅非采购意向”和“拟建项目”
+				stype == "mailprivate" || stype == "indexcontent" { //邮箱推送
 				node = true
 				node = true
 			} else {
 			} else {
 				_, _, _, objc := pcVRT(sid, indust, stype, isVip || isMember || isEntniche)
 				_, _, _, objc := pcVRT(sid, indust, stype, isVip || isMember || isEntniche)

+ 1 - 56
src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/contrast_trial.js

@@ -224,10 +224,8 @@ var vm = new Vue({
             $(".call-counsel").on('click', function () {
             $(".call-counsel").on('click', function () {
                 location.href = "/jyapp/free/customer"
                 location.href = "/jyapp/free/customer"
             })
             })
-            
-            // 初始化智齿客服
+
             this.checkConfirmDisabled()
             this.checkConfirmDisabled()
-            this.getOfflineMessageCount()
         },
         },
         checkConfirmDisabled: function () {
         checkConfirmDisabled: function () {
             $.ajax({
             $.ajax({
@@ -340,59 +338,6 @@ var vm = new Vue({
         },
         },
         confirmAction: function () {
         confirmAction: function () {
             location.href = 'ontrial_commit'
             location.href = 'ontrial_commit'
-        },
-        getOfflineMessageCount: function () {
-            try {
-                var nowPlatform = this.isApp ? 'app' : 'wxh5';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-    
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-    
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-    
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".icon-badge-number").attr('data-badge-number', omc).show()
-                        } else {
-                            $(".icon-badge-number").removeAttr('data-badge-number')
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
         }
         }
     },
     },
 })
 })

+ 0 - 56
src/jfw/modules/app/src/web/templates/big-member/page_contrast.html

@@ -169,62 +169,6 @@
 <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 <!--<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 {{include "/big-member/commonjs.html"}}
 {{include "/big-member/commonjs.html"}}
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
-<script>
-    function getOfflineMessageCount () {
-        try {
-            var nowPlatform = 'app';
-            (function (w, d, e, x) {
-                w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                x = d.createElement('script');
-                x.async = true;
-                x.id = 'zhichiScript';
-                x.className="zhiCustomBtn";
-
-                x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                window.xxx = x
-                d.body.appendChild(x);
-            })(window, document, 'zc');
-            $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                var ajaxUserInfo = {
-                    headImage: '',
-                    nickName: '默认昵称',
-                    userId: '',
-                }
-
-                if (r) {
-                    Object.keys(ajaxUserInfo).forEach(function (v) {
-                        if (r[v] && r[v] !== '') {
-                            ajaxUserInfo[v] = r[v]
-                        }
-                    })
-                }
-
-                zc('config', {
-                    custom:true,
-                    top_bar_flag: 0,
-                    auto_expand: false,
-                    show_face: 1,
-                    async: 0,
-                    photo_flag: false,
-                    partnerid: ajaxUserInfo.userId,
-                    face: ajaxUserInfo.headImage
-                })
-                zc("offline_message_count",function(res){
-                    console.log(res, 'offline_message_count')
-                    if (res && res.size && res.size > 0) {
-                        var omc = res.size > 99 ? '99+' : res.size
-                        $(".icon-badge-number").attr('data-badge-number', omc).show()
-                    } else {
-                        $(".icon-badge-number").removeAttr('data-badge-number')
-                    }
-                })
-            })
-        } catch (e) {
-            console.log('error: ',e)
-        }
-    }
-    getOfflineMessageCount()
-</script>
 
 
 <!--E-当前页面的资源-->
 <!--E-当前页面的资源-->
 
 

+ 3 - 62
src/jfw/modules/app/src/web/templates/big-member/page_landingPage.html

@@ -49,9 +49,9 @@
           font-size: 0;
           font-size: 0;
       }
       }
       .xiugai{
       .xiugai{
-          font-size: 0.36rem;    
-          font-weight: bold; 
-          line-height: 0.8rem; 
+          font-size: 0.36rem;
+          font-weight: bold;
+          line-height: 0.8rem;
       }
       }
     </style>
     </style>
     <script>
     <script>
@@ -391,65 +391,6 @@
     }
     }
     new Vue(vNode)
     new Vue(vNode)
     </script>
     </script>
-    <script>
-        function getOfflineMessageCount () {
-            try {
-                var nowPlatform = 'app';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-                    // wxh5、app、pc
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    console.log(r, 'r')
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    console.log('获取未读消息')
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".noread_red").text(omc).show()
-                        } else {
-                            $(".noread_red").hide()
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
-        }
-        getOfflineMessageCount()
-    </script>
-
 </body>
 </body>
 
 
 </html>
 </html>

+ 0 - 59
src/jfw/modules/app/src/web/templates/big-member/page_landingPage_old_1.html

@@ -616,65 +616,6 @@
     }
     }
     new Vue(vNode)
     new Vue(vNode)
     </script>
     </script>
-    <script>
-        function getOfflineMessageCount () {
-            try {
-                var nowPlatform = 'app';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-                    // wxh5、app、pc
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    console.log(r, 'r')
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    console.log('获取未读消息')
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".noread_red").text(omc).show()
-                        } else {
-                            $(".noread_red").hide()
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
-        }
-        getOfflineMessageCount()
-    </script>
-
 </body>
 </body>
 
 
 </html>
 </html>

+ 0 - 59
src/jfw/modules/app/src/web/templates/frontRouter/enptc/free/app_enptc.html

@@ -234,65 +234,6 @@
     }
     }
     new Vue(vNode)
     new Vue(vNode)
     </script>
     </script>
-    <script>
-        function getOfflineMessageCount () {
-            try {
-                var nowPlatform = 'app';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-                    // wxh5、app、pc
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    console.log(r, 'r')
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    console.log('获取未读消息')
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".noread_red").text(omc).show()
-                        } else {
-                            $(".noread_red").hide()
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
-        }
-        getOfflineMessageCount()
-    </script>
-
 </body>
 </body>
 
 
 </html>
 </html>

+ 0 - 59
src/jfw/modules/app/src/web/templates/frontRouter/enptc/sess/app_enptc.html

@@ -224,65 +224,6 @@
     }
     }
     new Vue(vNode)
     new Vue(vNode)
     </script>
     </script>
-    <script>
-        function getOfflineMessageCount () {
-            try {
-                var nowPlatform = 'app';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-                    // wxh5、app、pc
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    console.log(r, 'r')
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    console.log('获取未读消息')
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".noread_red").text(omc).show()
-                        } else {
-                            $(".noread_red").hide()
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
-        }
-        getOfflineMessageCount()
-    </script>
-
 </body>
 </body>
 
 
 </html>
 </html>

+ 10 - 101
src/jfw/modules/app/src/web/templates/me/customer.html

@@ -37,119 +37,28 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 {{include "/big-member/commonjs.html"}}
 {{include "/big-member/commonjs.html"}}
 <script>
 <script>
-  // 客服地址分流
-    let typeModel = JSON.stringify({
-      type: 'APP',
-      isFind: true
-    })
     sessionStorage.removeItem('conversation-login-clear')
     sessionStorage.removeItem('conversation-login-clear')
+    /**
+     * 前往剑鱼客服
+     */
     function getCustomerUrl () {
     function getCustomerUrl () {
       $.post({
       $.post({
         url: '/jyapi/social/obtainShunt',
         url: '/jyapi/social/obtainShunt',
         contentType: 'application/json',
         contentType: 'application/json',
-        data: typeModel,
+        data: JSON.stringify({
+          type: 'APP',
+          isFind: true
+        }),
         success: function(res) {
         success: function(res) {
-          if (res && res.error_code === 0) {
-            // 分流
-            if (res.data.isShunt) {
-              if (res.data.url !== '') {
-                if (!res.data.isOld) {
-                  location.href = res.data.url
-                }
-              } else {
-                typeModel = JSON.stringify({
-                  type: 'APP',
-                  isFind: false
-                })
-                getCustomerUrl()
-              }
-            } else {
-              if(res.data.url) {
-                if (!res.data.isOld) {
-                  location.href = res.data.url
-                }
-              }
-            }
+          if (res && res.data && res.data.url) {
+            location.href = res.data.url
+            return
           }
           }
         }
         }
       })
       })
     }
     }
     getCustomerUrl()
     getCustomerUrl()
 </script>
 </script>
-<script>
-    $.get('/jyapp/front/app/sobot?t='+new Date().getTime())
-    /* 智齿客服 */
-    var ua = navigator.userAgent
-    var isMobile = !!ua.match(/AppleWebKit.*Mobile.*/)
-    var isWx = ua.toLowerCase().indexOf('micromessenger') !== -1
-    var nowPlatform = 'pc'
-    nowPlatform = isMobile ? 'h5' : nowPlatform
-    nowPlatform = isWx ? 'wxh5' : nowPlatform
-    try {
-        JyObj.getVersion()
-        nowPlatform = 'app'
-    } catch (e) {
-        // console.log('no app')
-    }
-
-    if (isMobile) {
-        $("#zc__sdk__sys__btn").hide();
-        window.onmessage = function(e){
-            if(e&&e.data){
-                const {name,data} = JSON.parse(e.data);
-                if(name==='zc_post_message'){
-                    const {action,} = data;
-                    switch(data.action){
-                        case 'chat_collapse_window':
-                            window.history.back()
-                            break;
-                    }
-                }
-            }
-        };
-    }
-
-    try {
-        (function (w, d, e, x) {
-            w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-            x = d.createElement('script');
-            x.async = true;
-            x.id = 'zhichiScript';
-            // wxh5、app、pc
-            x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-            d.body.appendChild(x);
-        })(window, document, 'zc');
-    } catch (e) {
-        console.log('error: ',e)
-    }
-
-    $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-        console.log(r, 'r')
-        var ajaxUserInfo = {
-            headImage: '',
-            nickName: '默认昵称',
-            userId: '',
-        }
-
-        if (r) {
-            Object.keys(ajaxUserInfo).forEach(function (v) {
-                if (r[v] && r[v] !== '') {
-                    ajaxUserInfo[v] = r[v]
-                }
-            })
-        }
-
-        zc('config', {
-            top_bar_flag: 0,
-            auto_expand: true,
-            show_face: 1,
-            async: 1,
-            photo_flag: false,
-            partnerid: ajaxUserInfo.userId,
-            face: ajaxUserInfo.headImage
-        })
-    })
-</script>
 </body>
 </body>
 
 
 </html>
 </html>

+ 0 - 58
src/jfw/modules/app/src/web/templates/me/mine.html

@@ -409,64 +409,6 @@
             })
             })
         }
         }
     </script>
     </script>
-    <script>
-        function getOfflineMessageCount () {
-            try {
-                var nowPlatform = 'app';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-                    // wxh5、app、pc
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    console.log(r, 'r')
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    console.log('获取未读消息')
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".badge-number").text(omc).show()
-                        } else {
-                            $(".badge-number").hide()
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
-        }
-        getOfflineMessageCount()
-    </script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/me/js/mine.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/me/js/mine.js?v={{Msg "seo" "version"}}'></script>
     {{include "/common/baiducc.html"}}
     {{include "/common/baiducc.html"}}
 
 

+ 0 - 62
src/jfw/modules/app/src/web/templates/me/notice.html

@@ -226,68 +226,6 @@
             FastClick.attach(document.body);
             FastClick.attach(document.body);
         }, false);
         }, false);
     }
     }
-    function getOfflineMessageCount () {
-        try {
-            var nowPlatform = 'app';
-            (function (w, d, e, x) {
-                w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                x = d.createElement('script');
-                x.async = true;
-                x.id = 'zhichiScript';
-                x.className="zhiCustomBtn";
-                // wxh5、app、pc
-                x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                d.body.appendChild(x);
-            })(window, document, 'zc');
-            $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                console.log(r, 'r')
-                var ajaxUserInfo = {
-                    headImage: '',
-                    nickName: '默认昵称',
-                    userId: '',
-                }
-
-                if (r) {
-                    Object.keys(ajaxUserInfo).forEach(function (v) {
-                        if (r[v] && r[v] !== '') {
-                            ajaxUserInfo[v] = r[v]
-                        }
-                    })
-                }
-
-                zc('config', {
-                    custom:true,
-                    top_bar_flag: 0,
-                    auto_expand: false,
-                    show_face: 1,
-                    photo_flag: false,
-                    partnerid: ajaxUserInfo.userId,
-                    face: ajaxUserInfo.headImage
-                })
-                console.log('获取未读消息')
-                zc('receive_message',function(res){
-                    console.log(res, 'res receive_message')
-                })
-                zc('zhichiReceive',function(res){
-                    console.log(res, 'res zhichiReceive')
-                })
-                zc("offline_message_count",function(res){
-                    console.log(res, 'offline_message_count')
-                    if (res && res.size && res.size > 0) {
-                        var omc = res.size > 99 ? '99+' : res.size
-                        $("#msg-count").attr('data-badge-number', omc).show()
-                        $(".app-layout-content-b.no-message").removeClass('no-message')
-                    } else {
-                        $("#msg-count").removeAttr('data-badge-number')
-                        $(".app-layout-content-b").addClass('no-message')
-                    }
-                })
-            })
-        } catch (e) {
-            console.log('error: ',e)
-        }
-    }
-    getOfflineMessageCount()
 </script>
 </script>
 <script type="text/javascript">
 <script type="text/javascript">
     localStorage.removeItem("redSpotLastAjaxTime");
     localStorage.removeItem("redSpotLastAjaxTime");

+ 1 - 56
src/web/staticres/big-member/js/contrast_trial.js

@@ -230,10 +230,8 @@ var vm = new Vue({
             $(".call-counsel").on('click', function () {
             $(".call-counsel").on('click', function () {
                 location.href = "./customer"
                 location.href = "./customer"
             })
             })
-            
-            // 初始化智齿客服
+
             this.checkConfirmDisabled()
             this.checkConfirmDisabled()
-            this.getOfflineMessageCount()
         },
         },
         checkConfirmDisabled: function () {
         checkConfirmDisabled: function () {
             $.ajax({
             $.ajax({
@@ -346,59 +344,6 @@ var vm = new Vue({
         },
         },
         confirmAction: function () {
         confirmAction: function () {
             location.href = 'ontrial_commit'
             location.href = 'ontrial_commit'
-        },
-        getOfflineMessageCount: function () {
-            try {
-                var nowPlatform = this.isApp ? 'app' : 'wxh5';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-    
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-    
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-    
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".icon-badge-number").attr('data-badge-number', omc).show()
-                        } else {
-                            $(".icon-badge-number").removeAttr('data-badge-number')
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
         }
         }
     },
     },
 })
 })

+ 1 - 35
src/web/staticres/common-module/messageCenter/js/index.js

@@ -16,7 +16,7 @@ var vm = new Vue({
         {title: '项目动态', url:'xiangmu'},{title: '企业动态', url:'qiye'},
         {title: '项目动态', url:'xiangmu'},{title: '企业动态', url:'qiye'},
         {title: '分析报告', url:'fenxi'},{title: '系统通知', url:'xitong'}
         {title: '分析报告', url:'fenxi'},{title: '系统通知', url:'xitong'}
       ],
       ],
-      isShowEntrance: false // 是否展示私信入口
+      isShowEntrance: true // 是否展示私信入口
     }
     }
   },
   },
   created() {
   created() {
@@ -24,7 +24,6 @@ var vm = new Vue({
     this.lastMsg()
     this.lastMsg()
     this.msgData()
     this.msgData()
     this.getPrivateLetter()
     this.getPrivateLetter()
-    this.getShuntUrl()
     let wxType = getType()
     let wxType = getType()
     if (!wxType) {
     if (!wxType) {
       checkMsgCount(true, 0)
       checkMsgCount(true, 0)
@@ -79,39 +78,6 @@ var vm = new Vue({
         }
         }
       })
       })
     },
     },
-    // 获取分流地址
-    getShuntUrl () {
-      const _this = this
-      let typeAppModel = JSON.stringify({
-        type: 'APP',
-        isFind: true
-      })
-      let typeWxModel = JSON.stringify({
-        type: 'WX',
-        isFind: true
-      })
-      let wxType = getType()
-      $.ajax({
-        type:'POST',
-        contentType: 'application/json',
-        url:'/jyapi/social/obtainShunt',
-        data: wxType ? typeWxModel : typeAppModel,
-        success:function (res) {
-          if (res && res.error_code === 0) {
-            // 分流
-            if (res.data.isShunt) {
-              if (res.data.url !== '') {
-                _this.isShowEntrance = !res.data.isOld
-              } else {
-                _this.isShowEntrance = false
-              }
-            } else {
-              _this.isShowEntrance = false
-            }
-          }
-        }
-      })
-    },
     // 消息列表
     // 消息列表
     msgData() {
     msgData() {
       const _this = this
       const _this = this

+ 1 - 10
src/web/staticres/frontRouter/pc/mesgCenter/js/index-pc.js

@@ -10,7 +10,7 @@ var vm = new Vue({
       kfCount: 0,
       kfCount: 0,
       isTabs: '',
       isTabs: '',
       shuntData: {},
       shuntData: {},
-      shunted: false,
+      shunted: true,
       imgSrcs: [
       imgSrcs: [
         { type: '0', title: '全部', url: '/images/pc/quanbu@2x.png' }, { type: '1', title: '活动优惠', url: '/images/pc/huodong@2x.png' },
         { type: '0', title: '全部', url: '/images/pc/quanbu@2x.png' }, { type: '1', title: '活动优惠', url: '/images/pc/huodong@2x.png' },
         { type: '2', title: '服务通知', url: '/images/pc/fuwu@2x.png' }, { type: '3', title: '订阅消息', url: '/images/pc/dingyue@2x.png' },
         { type: '2', title: '服务通知', url: '/images/pc/fuwu@2x.png' }, { type: '3', title: '订阅消息', url: '/images/pc/dingyue@2x.png' },
@@ -44,15 +44,6 @@ var vm = new Vue({
         contentType: 'application/json',
         contentType: 'application/json',
         success: function (res) {
         success: function (res) {
           _this.shuntData = res.data
           _this.shuntData = res.data
-          if(res.data.isShunt) {
-            if (res.data.url == '' || res.data.url == 'zcpc') {
-              _this.shunted = false
-            } else {
-              _this.shunted = !res.data.isOld
-            }
-          } else {
-            _this.shunted = false
-          }
         }
         }
       })
       })
     },
     },

+ 0 - 55
src/web/staticres/me/js/mine.js

@@ -21,7 +21,6 @@ var mine = {
         this.setUserImg()
         this.setUserImg()
 
 
         this.linkClickEvents()
         this.linkClickEvents()
-        this.getOfflineMessageCount()
         // 企业画像记录访问权限
         // 企业画像记录访问权限
         this.getBigVipState()
         this.getBigVipState()
         // 清除超级订阅购买、续费、升级相关的缓存
         // 清除超级订阅购买、续费、升级相关的缓存
@@ -201,60 +200,6 @@ var mine = {
         } else {
         } else {
             icon.hide()
             icon.hide()
         }
         }
-    },
-    getOfflineMessageCount: function () {
-        try {
-            var nowPlatform = 'wxh5';
-            (function (w, d, e, x) {
-                w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                x = d.createElement('script');
-                x.async = true;
-                x.id = 'zhichiScript';
-                x.className="zhiCustomBtn";
-
-                x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                d.body.appendChild(x);
-            })(window, document, 'zc');
-            $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                console.log(r, 'r')
-                var ajaxUserInfo = {
-                    headImage: '',
-                    nickName: '默认昵称',
-                    userId: '',
-                }
-
-                if (r) {
-                    Object.keys(ajaxUserInfo).forEach(function (v) {
-                        if (r[v] && r[v] !== '') {
-                            ajaxUserInfo[v] = r[v]
-                        }
-                    })
-                }
-
-                zc('config', {
-                    custom:true,
-                    top_bar_flag: 0,
-                    auto_expand: false,
-                    show_face: 1,
-                    async: 0,
-                    photo_flag: false,
-                    partnerid: ajaxUserInfo.userId,
-                    face: ajaxUserInfo.headImage
-                })
-                console.log('获取未读消息')
-                zc("offline_message_count",function(res){
-                    console.log(res, 'offline_message_count')
-                    if (res && res.size && res.size > 0) {
-                        var omc = res.size > 99 ? '99+' : res.size
-                        $(".badge-number").text(omc).show()
-                    } else {
-                        $(".badge-number").hide()
-                    }
-                })
-            })
-        } catch (e) {
-            console.log('error: ',e)
-        }
     }
     }
 }
 }
 
 

+ 59 - 185
src/web/staticres/public-pc/js/pc-bottom.js

@@ -1,3 +1,59 @@
+/**
+ * 获取用户信息 (用于兼用旧页面使用 ajaxUserInfo)
+ */
+function getNowUserInfo () {
+  $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r) {
+    if (r) {
+      Object.keys(ajaxUserInfo).forEach(function (v) {
+        if (r[v] && r[v] !== '') {
+          ajaxUserInfo[v] = r[v]
+        }
+      })
+      // 存储userId 大会员中标预测历史记录要用到
+      localStorage.setItem('BIGMEMBER_PC', r.userId)
+    }
+    typeof window.getUserInfoCallback === 'function' ? getUserInfoCallback() : null
+  }).fail(function () {
+    ajaxUserInfo = {
+      headImage: '',
+      nickName: '',
+      userId: '',
+    }
+    typeof window.getUserInfoCallback === 'function' ? getUserInfoCallback() : null
+  })
+}
+$(function () {
+  getNowUserInfo()
+})
+
+/**
+ * 前往剑鱼客服
+ */
+function goCustomerUrl () {
+  $.post({
+    url: '/jyapi/social/obtainShunt',
+    contentType: 'application/json',
+    data: JSON.stringify({type: 'PC', isFind: true}),
+    success: function(res) {
+      if (res && res.data && res.data.url) {
+        location.href = res.data.url
+        return
+      }
+    }
+  })
+}
+
+/**
+ * 前往客服页面 (兼容旧业务逻辑,检查登录状态)
+ */
+function checkCustomerService () {
+  // 登录判断
+  if (!loginflag) {
+    return openLoginDig()
+  }
+  goCustomerUrl()
+}
+
 $(".jy_classify_list ul li").mouseenter(function(){
 $(".jy_classify_list ul li").mouseenter(function(){
   $(".jy_classify_list ul li").removeClass('active')
   $(".jy_classify_list ul li").removeClass('active')
   $(".jy_classify_list ul li div").hide()
   $(".jy_classify_list ul li div").hide()
@@ -69,189 +125,15 @@ function scrollSideIconHide(el) {
   })
   })
 }
 }
 
 
-/**
- * 智齿客服相关初始化
- */
-var __registerSobotStatus = false
-var ajaxUserInfo = {
-  headImage: '',
-  nickName: '默认昵称',
-  userId: '',
-}
 
 
-function registerSobotCustomerService (callback) {
-  if (__registerSobotStatus) {
-    return callback()
-  }
-
-  ;(function (w, d, e, x) {
-    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-    x = d.createElement('script');
-    x.async = true;
-    x.id = 'zhichiScript';
-    x.src = 'https://pc-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-    d.body.appendChild(x);
-  })(window, document, 'zc');
-
-  function setConfig () {
-    typeof window.getUserInfoCallback === 'function' ? getUserInfoCallback() : null
-    console.log(JSON.stringify(ajaxUserInfo.userId + ajaxUserInfo.headImage))
-    zc("config", {
-      custom: false,
-      auto_expand: false,
-      show_face: 1,
-      partnerid: ajaxUserInfo.userId,
-      face: ajaxUserInfo.headImage || '',
-      height: '640',
-      async: false,
-      manual: true
-    })
-    // zc("frame_manual", function (res) {
-    //   console.log("init sobot")
-    //   zc("offline_message_count",function(res){
-    //     // console.log(res, 'offline_message_count')
-    //     if (res && res.size && res.size > 0) {
-    //       var omc = res.size > 99 ? '99+' : res.size
-    //       $(".icon-badge-number").attr('data-badge-number', omc)
-    //     } else {
-    //       $(".icon-badge-number").removeAttr('data-badge-number')
-    //     }
-    //   })
-    // })
-    callback()
-  }
-  $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r) {
-    if (r) {
-      Object.keys(ajaxUserInfo).forEach(function (v) {
-        if (r[v] && r[v] !== '') {
-          ajaxUserInfo[v] = r[v]
-        }
-      })
-      // 存储userId 大会员中标预测历史记录要用到
-      localStorage.setItem('BIGMEMBER_PC', r.userId)
-    }
-    setConfig()
-  }).fail(function () {
-    ajaxUserInfo = {
-      headImage: '',
-      nickName: '默认昵称',
-      userId: '',
-    }
-    setConfig()
-  })
-  __registerSobotStatus = true
-}
-
-function ajaxObtainShunt (isFind, callback) {
-  $.post({
-    url: '/jyapi/social/obtainShunt',
-    type: 'POST',
-    data: JSON.stringify({ type: 'PC', isFind: isFind }),
-    contentType: 'application/json',
-    success: function (res) {
-      // 是否需要设置分流
-      const needSetAjax = res.data.isShunt && !res.data.url
-      if (needSetAjax) {
-        return ajaxObtainShunt(false, callback)
-      }
-
-      const isUseNewJyCustomerService = res.data.isShunt && res.data.url && res.data.url !== 'zcpc' && !res.data.isOld
-      callback(isUseNewJyCustomerService, res.data.url)
-    },
-    error: function () {
-      callback(false)
-    }
-  })
-}
-
-
-var callTm = null
-var callStatus = false
-var initSobotStatus = false
-function tryCallMaxCount (time) {
-  if (callStatus) {
-    return clearTimeout(callTm)
-  }
-  console.log('tryCallMaxCount')
-  clearTimeout(callTm)
-  if (!initSobotStatus) {
-    zc("frame_manual", function (res) {
-      console.log("init sobot status")
-      initSobotStatus = true
-      zc('frame_status', function(data) {
-        console.log(data, 'sobot frame_status')
-        if (typeof data === 'string') {
-          openCustomDig = data === 'expand'
-          callStatus = true
-          clearTimeout(callTm)
-        }
-      })
-    })
-  } else {
-    zc('frame_status', function(data) {
-      console.log(data, 'sobot frame_status')
-      if (typeof data === 'string') {
-        openCustomDig = data === 'expand'
-        callStatus = true
-        clearTimeout(callTm)
-      }
-    })
-  }
-
-  callTm = setTimeout(function () {
-    tryCallMaxCount(time)
-  }, time)
-}
-
-function checkCustomerService () {
-  // 登录判断
-  if (!loginflag) {
-    return openLoginDig()
-  }
-  // 检查智齿是否打开,需要关闭
-  if (openCustomDig) {
-    try {
-      zc('frame_status', function(data) {
-        console.log(data, 'click')
-        openCustomDig = data === 'expand'
-      })
-    } catch (e) {}
-  }
-  // 检查分流状态
-  ajaxObtainShunt(true, function (isNewJyCustomerService, link) {
-    // 是否使用剑鱼客服
-    if (isNewJyCustomerService) {
-      window.open(link + '&mini=0')
-    } else {
-      registerSobotCustomerService(function () {
-        callStatus = false
-        tryCallMaxCount(150)
-      })
-    }
-  })
-}
 
 
 $(function () {
 $(function () {
   scrollSideIconHide()
   scrollSideIconHide()
   localStorage.removeItem('kf-shunt-data')
   localStorage.removeItem('kf-shunt-data')
 })
 })
-var openCustomDig = false
-window.onmessage = function(e){
-  if(e&&e.data&&e.data!== ''){
-    try {
-      var dd = JSON.parse(e.data);
-      if(dd.name==='zc_post_message'){
-        switch(dd.data.action){
-          case 'chat_collapse_window':
-            openCustomDig = false
-            break;
-        }
-      }
-    } catch (e) {
-      // console.log('!not call message')
-    }
-  }
-};
+/**
+ * 全局客服事件拦截(用于旧客服业务 open-customer 改造)
+ */
 $(window).on('click', function (e) {
 $(window).on('click', function (e) {
   var openDom = $(e.target).hasClass('open-customer') || $(e.target).parents().hasClass('open-customer')
   var openDom = $(e.target).hasClass('open-customer') || $(e.target).parents().hasClass('open-customer')
   if (openDom) {
   if (openDom) {
@@ -276,14 +158,6 @@ $(window).on('click', function (e) {
       _hmt && _hmt.push(['_trackEvent','客服', 'click', '右侧客服问题测试']);
       _hmt && _hmt.push(['_trackEvent','客服', 'click', '右侧客服问题测试']);
       console.log('未初始化百度统计')
       console.log('未初始化百度统计')
     }
     }
-  } else {
-    // 收起客服
-    if (openCustomDig) {
-      zc('frame_status', function(data) {
-        console.log(data, 'click')
-        openCustomDig = data === 'expand'
-      })
-    }
   }
   }
 })
 })
 $(function () {
 $(function () {

+ 11 - 99
src/web/templates/big-member/wx/page_customer.html

@@ -47,117 +47,29 @@
 <script src='{{Msg "seo" "cdn"}}/js/rem.js'></script>
 <script src='{{Msg "seo" "cdn"}}/js/rem.js'></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 <script>
 <script>
-  // 客服地址分流
-    let typeModel = JSON.stringify({
-      type: 'WX',
-      isFind: true
-    })
     sessionStorage.removeItem('conversation-login-clear')
     sessionStorage.removeItem('conversation-login-clear')
+
+    /**
+     * 前往剑鱼客服
+     */
     function getCustomerUrl () {
     function getCustomerUrl () {
       $.post({
       $.post({
         url: '/jyapi/social/obtainShunt',
         url: '/jyapi/social/obtainShunt',
         contentType: 'application/json',
         contentType: 'application/json',
-        data: typeModel,
+        data: JSON.stringify({
+          type: 'WX',
+          isFind: true
+        }),
         success: function(res) {
         success: function(res) {
-          if (res && res.error_code === 0) {
-            // 分流
-            if(res.data.isShunt) {
-              if (res.data.url !== '') {
-                if (!res.data.isOld) {
-                  location.href = res.data.url
-                }
-              } else {
-                typeModel = JSON.stringify({
-                  type: 'WX',
-                  isFind: false
-                })
-                getCustomerUrl()
-              }
-            } else {
-              if(res.data.url) {
-                if (!res.data.isOld) {
-                  location.href = res.data.url
-                }
-              }
-            }
+          if (res && res.data && res.data.url) {
+            location.href = res.data.url
+            return
           }
           }
         }
         }
       })
       })
     }
     }
     getCustomerUrl()
     getCustomerUrl()
 </script>
 </script>
-<script>
-    $.get('/front/wx/sobot?t='+new Date().getTime())
-    /* 智齿客服 */
-    var ua = navigator.userAgent
-    var isMobile = !!ua.match(/AppleWebKit.*Mobile.*/)
-    var isWx = ua.toLowerCase().indexOf('micromessenger') !== -1
-    var nowPlatform = 'pc'
-    nowPlatform = isMobile ? 'h5' : nowPlatform
-    nowPlatform = isWx ? 'wxh5' : nowPlatform
-    try {
-        JyObj.getVersion()
-        nowPlatform = 'app'
-    } catch (e) {
-        // console.log('no app')
-    }
-
-    if (isMobile) {
-        $("#zc__sdk__sys__btn").hide();
-        window.onmessage = function(e){
-            if(e&&e.data){
-                const {name,data} = JSON.parse(e.data);
-                if(name==='zc_post_message'){
-                    const {action,} = data;
-                    switch(data.action){
-                        case 'chat_collapse_window':
-                            window.history.back()
-                            break;
-                    }
-                }
-            }
-        };
-    }
-
-    try {
-        (function (w, d, e, x) {
-            w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-            x = d.createElement('script');
-            x.async = true;
-            x.id = 'zhichiScript';
-            // wxh5、app、pc
-            x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-            d.body.appendChild(x);
-        })(window, document, 'zc');
-    } catch (e) {
-        console.log('error: ',e)
-    }
-    $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-        console.log(r, 'r')
-        var ajaxUserInfo = {
-            headImage: '',
-            nickName: '默认昵称',
-            userId: '',
-        }
-
-        if (r) {
-            Object.keys(ajaxUserInfo).forEach(function (v) {
-                if (r[v] && r[v] !== '') {
-                    ajaxUserInfo[v] = r[v]
-                }
-            })
-        }
-
-        zc('config', {
-            top_bar_flag: 0,
-            auto_expand: true,
-            show_face: 1,
-            async: 1,
-            partnerid: ajaxUserInfo.userId,
-            face: ajaxUserInfo.headImage
-        })
-    })
-</script>
 {{include "/common/baiducc.html"}}
 {{include "/common/baiducc.html"}}
 </body>
 </body>
 
 

+ 0 - 56
src/web/templates/big-member/wx/page_index.html

@@ -182,62 +182,6 @@
 <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
 <!--<script src='{{Msg "seo" "cdn"}}/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 <!--<script src='{{Msg "seo" "cdn"}}/js/check-bind-phone.js?v={{Msg "seo" "version"}}'></script>-->
 <!--E-当前页面的资源-->
 <!--E-当前页面的资源-->
-<script>
-    function getOfflineMessageCount ()  {
-        try {
-            var nowPlatform = 'wxh5';
-            (function (w, d, e, x) {
-                w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                x = d.createElement('script');
-                x.async = true;
-                x.id = 'zhichiScript';
-                x.className="zhiCustomBtn";
-
-                x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                window.xxx = x
-                d.body.appendChild(x);
-            })(window, document, 'zc');
-            $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                var ajaxUserInfo = {
-                    headImage: '',
-                    nickName: '默认昵称',
-                    userId: '',
-                }
-
-                if (r) {
-                    Object.keys(ajaxUserInfo).forEach(function (v) {
-                        if (r[v] && r[v] !== '') {
-                            ajaxUserInfo[v] = r[v]
-                        }
-                    })
-                }
-
-                zc('config', {
-                    custom:true,
-                    top_bar_flag: 0,
-                    auto_expand: false,
-                    show_face: 1,
-                    async: 0,
-                    photo_flag: false,
-                    partnerid: ajaxUserInfo.userId,
-                    face: ajaxUserInfo.headImage
-                })
-                zc("offline_message_count",function(res){
-                    console.log(res, 'offline_message_count')
-                    if (res && res.size && res.size > 0) {
-                        var omc = res.size > 99 ? '99+' : res.size
-                        $(".icon-badge-number").attr('data-badge-number', omc).show()
-                    } else {
-                        $(".icon-badge-number").removeAttr('data-badge-number')
-                    }
-                })
-            })
-        } catch (e) {
-            console.log('error: ',e)
-        }
-    }
-    getOfflineMessageCount()
-</script>
 <!--小于100行同css,减少请求数-->
 <!--小于100行同css,减少请求数-->
 <script>
 <script>
     $(".down-app-img").on('click',function () {
     $(".down-app-img").on('click',function () {

+ 0 - 58
src/web/templates/big-member/wx/page_landingPage.html

@@ -359,64 +359,6 @@
     }
     }
     new Vue(vNode)
     new Vue(vNode)
     </script>
     </script>
-    <script>
-        function getOfflineMessageCount () {
-            try {
-                var nowPlatform = 'wx';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-                    // wxh5、app、pc
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    console.log(r, 'r')
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    console.log('获取未读消息')
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".noread_red").text(omc).show()
-                        } else {
-                            $(".noread_red").hide()
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
-        }
-        getOfflineMessageCount()
-    </script>
     {{include "/common/baiducc.html"}}
     {{include "/common/baiducc.html"}}
 </body>
 </body>
 
 

+ 0 - 58
src/web/templates/big-member/wx/page_landingPage2.html

@@ -596,64 +596,6 @@
     }
     }
     new Vue(vNode)
     new Vue(vNode)
     </script>
     </script>
-    <script>
-        function getOfflineMessageCount () {
-            try {
-                var nowPlatform = 'wx';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-                    // wxh5、app、pc
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    console.log(r, 'r')
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    console.log('获取未读消息')
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".noread_red").text(omc).show()
-                        } else {
-                            $(".noread_red").hide()
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
-        }
-        getOfflineMessageCount()
-    </script>
     {{include "/common/baiducc.html"}}
     {{include "/common/baiducc.html"}}
 </body>
 </body>
 
 

+ 18 - 3
src/web/templates/big-member/wx/page_pro_follow_detail.html

@@ -42,8 +42,7 @@
                     <span class="down-report active" @click="downReport('app')">下载项目报告</span>
                     <span class="down-report active" @click="downReport('app')">下载项目报告</span>
                     <span class="toVip" @click="openVip()" v-if="!this.$data.isPayedUser">开通</span>
                     <span class="toVip" @click="openVip()" v-if="!this.$data.isPayedUser">开通</span>
                 </div>
                 </div>
-                <div class="forecast" @click="goAiAdd()"
-                     v-if="this.$data.prodetail.bidtype=='招标'||this.$data.prodetail.bidtype=='询价'">
+                <div class="forecast" @click="goAiAdd()" v-if="aiFloatShow">
                     <span class="j-icon icon-face"></span>
                     <span class="j-icon icon-face"></span>
                     <span class="for_text">中标预测</span>
                     <span class="for_text">中标预测</span>
                 </div>
                 </div>
@@ -155,7 +154,7 @@
             <div class="cement_title" style="display: flex;align-items: center;justify-content: space-between;">
             <div class="cement_title" style="display: flex;align-items: center;justify-content: space-between;">
                 <h2 class="title_h2">项目公告</h2>
                 <h2 class="title_h2">项目公告</h2>
                 <div @click="goAnalysis" class="bid-dec-in"
                 <div @click="goAnalysis" class="bid-dec-in"
-                     v-if="this.$data.prodetail.bidtype !=='中标' && this.$data.prodetail.bidtype !=='成交' && this.$data.prodetail.bidtype !=='合同'">
+                     v-if="analysisFloatShow">
                     <em class="dec-icon"></em>
                     <em class="dec-icon"></em>
                     投标决策分析
                     投标决策分析
                 </div>
                 </div>
@@ -311,6 +310,22 @@
             }
             }
             this.getProDetail()
             this.getProDetail()
         },
         },
+        computed: {
+            aiFloatShow: function () {
+                if (this.bigstatus <= 0) {
+                    return this.prodetail.bidtype == '招标' || this.prodetail.bidtype == '询价'
+                } else {
+                    return false
+                }
+            },
+            analysisFloatShow: function () {
+                if (this.bigstatus <= 0) {
+                    return this.prodetail.bidtype !== '中标' && this.prodetail.bidtype !== '成交' && this.prodetail.bidtype !== '合同'
+                } else {
+                    return false
+                }
+            }
+        },
         methods: {
         methods: {
             goAnalysis: function () {
             goAnalysis: function () {
                 sessionStorage.removeItem('big-analysis_filter')
                 sessionStorage.removeItem('big-analysis_filter')

+ 0 - 58
src/web/templates/frontRouter/wx/entpc/free/entpc.html

@@ -173,64 +173,6 @@
     }
     }
     new Vue(vNode)
     new Vue(vNode)
     </script>
     </script>
-    <script>
-        function getOfflineMessageCount () {
-            try {
-                var nowPlatform = 'wx';
-                (function (w, d, e, x) {
-                    w[e] = function () { w.cbk = w.cbk || []; w.cbk.push(arguments); }
-                    x = d.createElement('script');
-                    x.async = true;
-                    x.id = 'zhichiScript';
-                    x.className="zhiCustomBtn";
-                    // wxh5、app、pc
-                    x.src = 'https://' + nowPlatform + '-jianyu.sobot.com/chat/frame/v2/entrance.js?sysnum=9d1e3980f91e4b75b8f04e2d206a4c76&t=' + new Date().getTime();
-                    window.xxx = x
-                    d.body.appendChild(x);
-                })(window, document, 'zc');
-                $.post("/jypay/user/getSimpleData?t="+new Date().getTime(),{},function(r){
-                    console.log(r, 'r')
-                    var ajaxUserInfo = {
-                        headImage: '',
-                        nickName: '默认昵称',
-                        userId: '',
-                    }
-
-                    if (r) {
-                        Object.keys(ajaxUserInfo).forEach(function (v) {
-                            if (r[v] && r[v] !== '') {
-                                ajaxUserInfo[v] = r[v]
-                            }
-                        })
-                    }
-
-                    zc('config', {
-                        custom:true,
-                        top_bar_flag: 0,
-                        auto_expand: false,
-                        show_face: 1,
-                        async: 0,
-                        photo_flag: false,
-                        partnerid: ajaxUserInfo.userId,
-                        face: ajaxUserInfo.headImage
-                    })
-                    console.log('获取未读消息')
-                    zc("offline_message_count",function(res){
-                        console.log(res, 'offline_message_count')
-                        if (res && res.size && res.size > 0) {
-                            var omc = res.size > 99 ? '99+' : res.size
-                            $(".noread_red").text(omc).show()
-                        } else {
-                            $(".noread_red").hide()
-                        }
-                    })
-                })
-            } catch (e) {
-                console.log('error: ',e)
-            }
-        }
-        getOfflineMessageCount()
-    </script>
     {{include "/common/baiducc.html"}}
     {{include "/common/baiducc.html"}}
 </body>
 </body>