Merge branch 'dev/v4.10.19_yf' of qmx/jy into feature/v4.10.19

src/jfw/modules/app/src/web/templates/frontRouter/property/free/index.html

@@ -139,6 +139,9 @@
         window.location.href= "/jyapp/free/login?url=/jyapp/frontPage/bigmember/free/perfect_info?source=" + source
       }
     });
+    $('.j-header .header-left').on('click', function () {
+        window.history.back()
+    })
   });
 </script>
 {{include "/common/js.html"}}

src/web/staticres/bid-fileinter/css/product-introduce.css

@@ -335,3 +335,11 @@
 .style-nzjxm .desc-module {
   padding-top: 50px;
 }
+.bottom-banner-container.fixed{
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 99;
+}

src/web/staticres/bid-fileinter/js/product-introduce-config.js

@@ -548,7 +548,7 @@ var __page_config = {
         title: '临期商机 抢先布局',
         source: 'jjdqProject_experience',
         subtitle: '通过数字化工具关注企业/商户合同履约周期，<span class="color-blue">预判资产处<br/>置需求。</span>跟踪供应链节点（如生产日期、库存周转率），<br/>锁定潜在临期标的。',
-        buttonText: '立即体验',
+        buttonText: '联系专家',
         bannerImageSrc: '/bid-fileinter/image/project/jjdqmx-banner-bg1.png'
       },
     ],
@@ -577,7 +577,7 @@ var __page_config = {
         title: '锁定先机 游刃有余',
         source: 'nzjProject_experience',
         subtitle: '实时抓取拟在建项目，<br />预审、环评公示、可研批复‌等核心节点，<br />让商务动作快于招标公告。',
-        buttonText: '立即体验',
+        buttonText: '联系专家',
         bannerImageSrc: '/bid-fileinter/image/project/nzjxm-banner-bg1@2x.png'
       },
     ],

src/web/staticres/bid-fileinter/js/product-introduce.js

@@ -4,6 +4,7 @@ $(function() {
     needPower: ['yyszb'],
     data: {},
     imageViewer: null,
+    lastScrollCall: null,
     init: function() {
       var pageCodeList = Object.keys(__page_config)
       var success = this.initPageData()
@@ -11,6 +12,12 @@ $(function() {
         console.log('页面数据初始化成功', pageCodeList)
         this.initModule()
       }
+      $(window).on('scroll', function() {
+        this.windowScrollFn()
+      }.bind(this))
+      $(window).on('resize', function() {
+        this.windowScrollFn()
+      }.bind(this))
     },
     initPageData: function() { 
       var code = __pageInfo.code
@@ -239,6 +246,20 @@ $(function() {
         })
       })
     },
+    windowScrollFn: function() {
+      // 判断留资模块是否处于可视区域
+      var mainFooter = $('.j-bottom')
+      var stickyBanner= $('.bottom-banner-container')
+      if (!mainFooter.length) return
+      
+      var now = Date.now()
+      if (this.lastScrollCall && now - this.lastScrollCall < 100) return
+      this.lastScrollCall = now
+      // 精确计算元素位置
+      var rect = mainFooter[0].getBoundingClientRect()
+      var isInViewport = rect.top <= window.innerHeight && rect.bottom >= 0
+      stickyBanner.toggleClass('fixed', !isInViewport)
+    }
   }
   __page.init();
 })

src/web/staticres/common-module/perfect-info/js/perfect-info.js

@@ -1055,6 +1055,9 @@ var vNode = {
             this.moduleShow.data_requirement = true
             this.moduleShow.email = true
           }
+          if (source.indexOf('_property_consult') > -1) {
+            this.moduleShow.position = false
+          }
         }
 
         if (source.indexOf('_freeuser') > -1 && infoText.indexOf('【') > -1) {
@@ -2049,6 +2052,15 @@ var vNode = {
                 },'提交成功')
                 break
               }
+              // 物业版本
+              case 'app_property_consult': 
+              case 'wx_property_consult':
+              case 'h5_property_consult': {
+                 _this.showMessage('您的申请已提交，我们将尽快联系您，请耐心等待！', '我知道了', function () {
+                  history.back()
+                },'提交成功')
+                break
+              }
               default: {
                 var biaoshu = source === 'bid_document_Introduction_page' || source.indexOf('article_BidPreparation') > -1
                 // 标书制作或者三方认证(case语句满足不了条件，放default中做更多判断)

src/web/templates/product-introduce/index.html

@@ -148,7 +148,7 @@
         </div>
     </div>
 
-    <div class="bottom-banner-container loaded-show" style="display: none;">
+    <div class="bottom-banner-container loaded-show fixed" style="display: none;">
         <div class="bottom-banner-content w">
             <span class="bottom-banner-title">获取商机  抢先布局</span>
             <span class="bottom-banner-action-container">