Merge branch 'dev3.0.0' of http://192.168.3.207:10080/qmx/jy into dev3.0.0

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

@@ -47,7 +47,7 @@ var vNode = {
                 loadingSun : true
             },
             reqCount: 0,
-            test: 0
+            timer: null
         }
         
     },
@@ -102,7 +102,7 @@ var vNode = {
                         that.reqCount++;
                         if(res.data && Object.keys(res.data).length > 0) {
                             that.chartLoading = false;
-                            console.log(that.reqCount,'that.reqCount')
+                            // console.log(that.reqCount,'that.reqCount')
                             // 招标动态数据
                             if (res.data.topProject && res.data.topProject.length && res.data.topProject.length > 0) {
                                 // 按时间降序排序
@@ -176,19 +176,27 @@ var vNode = {
                                 } else {
                                     that.isShow.showSun = false;
                                 }
+                                // 清除定时器
+                                clearTimeout(that.timer)
                             } else {
                                 console.log(that.reqCount)
-                                if(that.reqCount < 3) {
-                                    that.getChartData('other')
+                                if(that.reqCount < 15) {
+                                    that.timer = setTimeout(function() {
+                                        that.getChartData('other')
+                                    }, 1500)
                                 } else {
-                                    console.log('请求了两次仍获取不到数据，不再请求')
+                                    console.log('请求了仍获取不到数据，不再请求')
                                 }
                             }
                         } else {
-                            if(that.reqCount < 3) {
-                                that.getChartData('')
+                            if(that.reqCount < 15) {
+                                that.timer = setTimeout(function() {
+                                    that.getChartData('')
+                                }, 1500)
                             } else {
-                                console.log('请求了两次仍获取不到数据，不再请求')
+                                console.log('请求了仍获取不到数据，不再请求')
+                                clearTimeout(that.timer);
+                                history.back();
                             }
                         }
                         

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

@@ -298,7 +298,6 @@
                     this.historyList.pop()
                 }
                 localStorage.setItem('BIG_AI_LIST', JSON.stringify(this.historyList))
-                // sessionStorage.setItem('big-ai-search',JSON.stringify(item))
                 location.href = './ai_add?fromType=search&id=' + item.s_id + '&sId=' + item.sourceinfoid;
             },
             historyLink(item) {

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

@@ -241,7 +241,11 @@
                 var str = ''
                 if(data) {
                     for (var key in data) {
-                        str = key + ' ' + data[key].toString()
+                        if(Object.keys(key).length == 0) {
+                            str = key
+                        } else {
+                            str = key + ' ' + data[key].toString()
+                        }
                     }
                 }
                 return str;
@@ -260,6 +264,7 @@
                     success:function(res) {
                         console.log(res)
                         if(res.error_code == 0) {
+                            console.log(JSON.stringify(res.data.area))
                             that.project.projectName = res.data.projectname;
                             that.project.infoId = res.data.infoid;
                             that.project.pId = res.data.id;

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

@@ -566,7 +566,7 @@
                             that.skeletonShow = true;
                             setTimeout(function(){
                                 history.back()
-                            }, 30000)
+                            }, 3000)
                         }
                     },
                     error:function(err) {
@@ -661,13 +661,31 @@
                 history.back()
             },
             // 跳到项目信息详情
-            goProjectDetail: function(item) {
-                var obj = {
-                    fid: item.infoid,
-                    sid: item._id
-                }
-                sessionStorage.setItem('bigvip-fid', JSON.stringify(obj))
-                location.href = "./pro_follow_detail"
+            goProjectDetail: function (item) { 
+                var that = this;
+                $.ajax({
+                    type:'POST',
+                    url:'/bigmember/follow/project/check',
+                    data:{
+                        sid: item.infoid
+                    },
+                    success:function(res) {
+                        console.log(res)
+                        if(res.error_code == 0) {
+                            var obj = {
+                                fid: res.data.fig ? res.data.fig : '',
+                                sid: item.infoid
+                            }
+                            sessionStorage.setItem('bigvip-fid', JSON.stringify(obj))
+                            location.href = "./pro_follow_detail"
+                        }else{
+                            console.log(res.error_code)
+                        }
+                    },
+                    error:function(err) {
+                        console.log(err)
+                    }
+                })
             },
             // 跳转中标预测
             goForecast: function () {

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

@@ -131,11 +131,11 @@
                 </div>
                 <div class="item">
                     <div class="item-key">预测时间</div>
-                    <div class="item-value">${info.yuce_time}</div>
+                    <div class="item-value">${info.yucetime}</div>
                 </div>
                 <div class="item">
                     <div class="item-key">预测线索</div>
-                    <div class="item-value">${info.projectname}</div>
+                    <div class="item-value">${info.title}</div>
                 </div>
             </div>
             <p class="tip">预测说明：新项目预测基于对历史招标信息统计分析，仅供参考</p>
@@ -252,8 +252,8 @@
                         console.log(res)
                         if(res.error_code == 0) {
                             if(res.data) {
-                                if (res.data.yuce_time) {
-                                    res.data.yuce_time = new Date(Number(res.data.yuce_time + '000')).pattern('yyyy/MM/dd')
+                                if (res.data.yucetime) {
+                                    res.data.yucetime = new Date(Number(res.data.yucetime + '000')).pattern('yyyy/MM/dd')
                                 }
                                 // console.log(new Date(Number(res.data.yuce_time + '000')).pattern('yyyy/MM/dd'))
                                 if(res.data.results) {

src/jfw/modules/app/src/web/templates/me/customer.html

@@ -17,6 +17,9 @@
         .j-header.jy-app-header {
             z-index: 9999999;
         }
+        #zc__sdk__container {
+            padding-top: 21.33333vw !important;
+        }
     </style>
 </head>
 <body>

src/web/templates/big-member/pc/page_index.html

@@ -639,14 +639,18 @@
                 })
             }
 
-            zc('config', {
-                top_bar_flag: 0,
-                auto_expand: true,
-                show_face: 1,
-                async: 1,
-                partnerid: ajaxUserInfo.userId,
-                uname: ajaxUserInfo.nickName,
-                face: ajaxUserInfo.headImage
+            zc("frame_manual", function (res) {
+                console.log("初始化成功")
+                zc('config', {
+                    // custom:true,
+                    auto_expand: false,
+                    show_face: 1,
+                    async: 1,
+                    partnerid: ajaxUserInfo.userId,
+                    uname: ajaxUserInfo.nickName,
+                    face: ajaxUserInfo.headImage
+                })
+                zc("dynamic_ready")
             })
         }).fail(function () {
             console.log('xxx')