Merge branch 'feature/v4.8.83' into dev/v4.8.83_rjj

src/web/staticres/js/login.js

@@ -2048,7 +2048,7 @@ function trackClick (c_type) {
     console.dir(error)
   }
 }
-function openLoginDig(type, redirectUrl) {
+function openLoginDig(type, redirectUrl,Logincallback) {
     $('#bidLogin .logo').show()
     $('#bidLogin .bind-phone-head').hide()
     $(".login-dig-tabbar-content.is-active .login-dig-input-box").show()
@@ -2099,6 +2099,12 @@ function openLoginDig(type, redirectUrl) {
         }
         // 检查是否需要新窗口打开<新用户兴趣偏好设置页面>
         checkNeedGoNewUserSettingPage()
+        try{
+          if(Logincallback){
+            Logincallback(data, num)
+          }
+        }catch(e){
+        }
         if (redirectUrl === 'reload') {
           return location.reload()
         }

src/web/staticres/js/pc-collect-user-info.js

@@ -435,6 +435,10 @@ var vm = new Vue({
         jyarticle_see3_plus_pc: '标讯详情页-无限次免费查看标讯的权益',
         pc_article_original_one: '标讯详情页-免费用户获取1次查看原文链接机会',
         pc_article_original_more: '标讯详情页-获取更多查看原文链接机会',
+        'bidmanagement-landingpage': '投标项目管理落地页',
+        'businesscooperation-landingpage': '商务合作落地页',
+        'customermanagement-landingpage': '客户管理落地页',
+        'digitalmarketing-landingpage': '数字化营销落地页'
       }
     }
   },
@@ -790,11 +794,13 @@ var vm = new Vue({
         // workScope: this.form.business,
         // partnerNeeds: this.form.need,
         // agree: this.form.agreeChecked,
-        cooperate: this.form.cooperate,
         branch: this.form.branch.indexOf('总裁') > -1 || this.form.branch.indexOf('总经理') > -1 ?  '' : this.form.branch,
         origin: location.origin,
         source_desc: this.sourceDescMap[this.source]
       }
+      if (source === 'businesscooperation-landingpage') {
+        params.cooperate = this.form.cooperate
+      }
       if (infoid != "" && isProDetail != -1){
         params.publish_id = infoid
       }
@@ -1015,6 +1021,7 @@ var vm = new Vue({
         this.form.need = data.partnerNeeds ? data.partnerNeeds : ''
         this.form.agreeChecked = data.agree == undefined ?  true : data.agree
         this.form.branch = data.branch || ''
+        this.form.cooperate = data.cooperate ? data.cooperate : ''
       }
     }
   }

src/web/templates/pc/dataExport_sieve.html

@@ -3191,7 +3191,9 @@
         };
         setLocalStorage(param);
         if (!loginflag){
-          openLoginDig(null,'reload')
+          openLoginDig(null,'reload',function(){
+            sessionStorage.setItem('existing_filter_echo', '2') // 点确定本页拉登录登陆成功不走接口回显
+          })
           return 
         } 
         // console.log(param);