Преглед на файлове

Merge branch 'v4.10.6.3_yf' of qmx/jy into hotfix/v4.10.6.3

yangfeng преди 4 месеца
родител
ревизия
492f93481f

+ 1 - 2
src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/css/vip_introduce.css

@@ -34,7 +34,6 @@ html,body {
 }
 
 .j-header {
-  position: absolute;
   width: 100%;
   display: flex;
   align-items: center;
@@ -115,7 +114,7 @@ html,body {
 .vip_introduce {
   width: 100%;
   height: 100%;
-  overflow: hidden;
+  overflow-y: scroll;
   display: flex;
   flex-direction: column;
   justify-content: space-between;

+ 68 - 70
src/jfw/modules/app/src/web/templates/vipsubscribe/vip_introduce.html

@@ -76,76 +76,74 @@
 </head>
 <body>
 <div class="j-container" id="vip-intro-container">
-    <div class="j-header jy-app-header transparent-header">
+    <div class="j-header jy-app-header">
       <span class="app-back jyapp-icon jyapp-icon-zuojiantou header-left"></span>
       <span class="header-title">超级订阅</span>
       <span class="header-right hide"></span>
     </div>
     <div class="j-main vip_introduce vip-body" id="vip-body">
-        <div class="main">
-          <div class="landing-banner">
-            <img id="cut-2" src='' />
-            <div class="statistic-info">
-              <div class="statistic-item">
-                <h3 class="item-count day-update-count"></h3>
-                <p>每日招采信息新增</p>
+        <div class="landing-banner">
+          <img id="cut-2" src='' />
+          <div class="statistic-info">
+            <div class="statistic-item">
+              <h3 class="item-count day-update-count"></h3>
+              <p>每日招采信息新增</p>
+            </div>
+            <div class="statistic-item">
+              <h3 class="item-count purchase-partyA-count"></h3>
+              <p>覆盖省市镇招采甲方</p>
+            </div>
+            <div class="statistic-item">
+              <h3 class="item-count purchase-project-count"></h3>
+              <p>覆盖全行业招采项目</p>
+            </div>
+          </div>
+        </div>
+        <div class="cooperate-container">
+          <div class="cooperate-header">
+            <h2 class="cooperate-header-title"></h2>
+            <p class="line-flex cooperate-header-subtitle">
+              <span class="split-box--before"></span>
+              <span class="split-box--text">定向推送!覆盖全网全类招采项目</span>
+              <span class="split-box--after"></span>
+            </p>
+          </div>
+          <div class="cooperate-main">
+            <div class="cooperate-list">
+              <div class="cooperate-item">
+                <div class="cooperate-item-icon cooperate-item-icon-1"></div>
+                <p class="cooperate-item-text">建筑工程</p>
               </div>
-              <div class="statistic-item">
-                <h3 class="item-count purchase-partyA-count"></h3>
-                <p>覆盖省市镇招采甲方</p>
+              <div class="cooperate-item">
+                <div class="cooperate-item-icon cooperate-item-icon-2"></div>
+                <p class="cooperate-item-text">弱电安防</p>
               </div>
-              <div class="statistic-item">
-                <h3 class="item-count purchase-project-count"></h3>
-                <p>覆盖全行业招采项目</p>
+              <div class="cooperate-item">
+                <div class="cooperate-item-icon cooperate-item-icon-3"></div>
+                <p class="cooperate-item-text">信息技术</p>
               </div>
-            </div>
-          </div>
-          <div class="cooperate-container">
-            <div class="cooperate-header">
-              <h2 class="cooperate-header-title"></h2>
-              <p class="line-flex cooperate-header-subtitle">
-                <span class="split-box--before"></span>
-                <span class="split-box--text">定向推送!覆盖全网全类招采项目</span>
-                <span class="split-box--after"></span>
-              </p>
-            </div>
-            <div class="cooperate-main">
-              <div class="cooperate-list">
-                <div class="cooperate-item">
-                  <div class="cooperate-item-icon cooperate-item-icon-1"></div>
-                  <p class="cooperate-item-text">建筑工程</p>
-                </div>
-                <div class="cooperate-item">
-                  <div class="cooperate-item-icon cooperate-item-icon-2"></div>
-                  <p class="cooperate-item-text">弱电安防</p>
-                </div>
-                <div class="cooperate-item">
-                  <div class="cooperate-item-icon cooperate-item-icon-3"></div>
-                  <p class="cooperate-item-text">信息技术</p>
-                </div>
-                <div class="cooperate-item">
-                  <div class="cooperate-item-icon cooperate-item-icon-4"></div>
-                  <p class="cooperate-item-text">医疗卫生</p>
-                </div>
-                <div class="cooperate-item">
-                  <div class="cooperate-item-icon cooperate-item-icon-5"></div>
-                  <p class="cooperate-item-text">服务采购</p>
-                </div>
-                <div class="cooperate-item">
-                  <div class="cooperate-item-icon cooperate-item-icon-6"></div>
-                  <p class="cooperate-item-text">机械设备</p>
-                </div>
+              <div class="cooperate-item">
+                <div class="cooperate-item-icon cooperate-item-icon-4"></div>
+                <p class="cooperate-item-text">医疗卫生</p>
+              </div>
+              <div class="cooperate-item">
+                <div class="cooperate-item-icon cooperate-item-icon-5"></div>
+                <p class="cooperate-item-text">服务采购</p>
               </div>
-              <div class="cooperate-footer" data-href="/jy_mobile/search/middle/bidding">
-                <div class="cooperate-item-icon cooperate-item-icon-7"></div>
-                <p class="cooperate-item-text">更多行业</p>
+              <div class="cooperate-item">
+                <div class="cooperate-item-icon cooperate-item-icon-6"></div>
+                <p class="cooperate-item-text">机械设备</p>
               </div>
             </div>
-          </div>
-          <div class="vs-container">
-            <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/image/vs_new.png?v={{Msg "seo" "version"}}' alt="vs">
+            <div class="cooperate-footer" data-href="/jy_mobile/search/middle/bidding">
+              <div class="cooperate-item-icon cooperate-item-icon-7"></div>
+              <p class="cooperate-item-text">更多行业</p>
+            </div>
           </div>
         </div>
+        <div class="vs-container">
+          <img src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/vipsubscribe/image/vs_new.png?v={{Msg "seo" "version"}}' alt="vs">
+        </div>
     </div>
     <div class="j-footer j-button-group popup-bottom-group">
         <!-- <div class="adbottom" style="width:375px;height: 40px;text-align: center;" id="bottomad"></div>
@@ -261,21 +259,21 @@
             window.history.back()
         })
         // 头部滚动事件
-        $('.j-main .main').on('scroll', function () {
-            var headerDOM = $('.j-header.jy-app-header')
-            var scrollTop = this.scrollTop
+        // $('.j-main .main').on('scroll', function () {
+        //     var headerDOM = $('.j-header.jy-app-header')
+        //     var scrollTop = this.scrollTop
 
-            // 是否有header-transparent这个类名
-            var hasClassT = headerDOM.hasClass('transparent-header')
+        //     // 是否有header-transparent这个类名
+        //     var hasClassT = headerDOM.hasClass('transparent-header')
 
-            if(scrollTop >= 75) {
-                if (!hasClassT) return
-                headerDOM.removeClass('transparent-header')
-            }else {
-                if (hasClassT) return
-                headerDOM.addClass('transparent-header')
-            }
-        })
+        //     if(scrollTop >= 75) {
+        //         if (!hasClassT) return
+        //         headerDOM.removeClass('transparent-header')
+        //     }else {
+        //         if (hasClassT) return
+        //         headerDOM.addClass('transparent-header')
+        //     }
+        // })
 
         // 清除超级订阅购买、续费、升级页面相关的优惠券、商品规格缓存
         sessionStorage.removeItem('vip-cur-select-coupon')

+ 1 - 1
src/web/staticres/css/subscribe_new.css

@@ -589,7 +589,7 @@
   width: 100%;
   height: 100%;
   content: "";
-  background-image: url(/images/subscribe/right.png);
+  background-image: url(/images/subscribe/right.png?v=1);
   background-size: 24px 24px;
   background-repeat: no-repeat;
   background-position: center;

+ 5 - 1
src/web/staticres/js/login.js

@@ -1296,7 +1296,11 @@ $(function(){
         verifyInput.show()
       } else {
         verifyInput.find('input').val('HIDE')
-        Direct.verify.code.skip('HIDE')
+        try {
+          Direct.verify.code.skip('HIDE')
+        } catch (error) {
+          console.log(error)
+        }
         verifyInput.hide()
       }
     }