Merge branch 'feature/v4.8.34_ad' of qmx/jy into feature/v4.8.34

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -817,18 +817,9 @@
             <div id="third-party-verify-attention" class="third-party-verify-attention" style="display:none;">
               <span class="t-p-v-a-text">*温馨提示：系统识别到正文中对投标方有资质要求～</span>
             </div>
-            <div class="noLoginShow" style="display: none;">
+            <div class="noLoginShow option-login" style="display: none;">
               <div class="serve-list">
-                <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/register_serve.png" alt="" />
-              </div>
-              <div class="serve-option">
-                <div class="option-title">登录后可查看全文</div>
-                <div class="option-login option-common">立即登录</div>
-                <div class="option-register option-common">还不是会员？立即免费注册</div>
-                <div class="option-hotline">
-                  <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/telphone.png" alt="" />
-                  <span>咨询热线：400-108-6670</span>
-                </div>
+                <img src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/no-login-content.png" alt="详情页-未登录-引导" />
               </div>
             </div>
             <!--S 登录引导置底 S-->

src/web/staticres/css/pc/index.css

@@ -453,14 +453,16 @@
   width: 100%;
   min-height: 811px;
   background-color: #F4F7FB;
-  background-image: url(/images/index/new/bg.png);
-  background-size: 100% 100%;
-
+  background-image: url(/images/index/new/bg.png?v=1);
+  background-size: 1920px 970px;
+  background-position: right bottom;
+  background-repeat: no-repeat;
 }
 
 /* 4大分类 */
 .jy-index-hot {
   /* margin-top: 40px; */
+  margin-bottom: 40px;
 }
 
 .jy-index-hot>.hot-container {
@@ -540,9 +542,19 @@
   text-decoration: none;
 }
 
+.jy-index-register-guide img {
+  width: 100%;
+  height: 100%;
+  cursor: pointer;
+}
+.jy-index-register-guide {
+  height: 112px;
+  margin-bottom: 32px;
+}
+
 /* 独家行业洞察区域 */
 .jy-index-product {
-  padding: 80px 0 50px 0;
+  padding: 40px 0 50px 0;
 }
 
 .jy-index-product .main-product,
@@ -580,7 +592,7 @@
   overflow: hidden;
   max-width: 100%;
     color: #fff;
-    
+
 }
 
 .jy-index-product .svip-product {
@@ -675,7 +687,7 @@
 }
 .jy-index-product .product-item {
   border-radius: 5px;
-  
+
 }
 .jy-index-product .product-item:hover {
   box-shadow: 0px 4px 16px rgba(8, 31, 38, 0.25);

src/web/staticres/js/login.js

@@ -2048,5 +2048,8 @@ var loginDialog = {
 
 $(function () {
   loginDialog.init()
+  $('#bidLogin').on('hide.bs.modal', function () {
+    backLogin(false)
+  })
 })
 

src/web/staticres/tags/css/no-login-detail.css

@@ -215,7 +215,13 @@
   padding: 10px;
 }
 
-.no-login-detail .reg-service {}
+.no-login-detail .reg-service {
+  width: 828px;
+  height: 310px;
+  background: url(/tags/images/bg.png) no-repeat center;
+  background-size: contain;
+  cursor: pointer;
+}
 .no-login-detail .reg-service .service-top{
   border: 1px solid #F9E5C6;
   border-radius: 4px;
@@ -402,4 +408,4 @@
 }
 .no-login-detail .otherinfo .com-status{
 	float: right;
-}
+}

src/web/templates/pc/index.html

@@ -121,6 +121,13 @@
             </div>
           </div>
         </div>
+        {{if .T.hasLogin}}
+        {{else}}
+        <!-- 未登录引导注册广告 -->
+        <div class="w1200 jy-index-register-guide CfadeInUp">
+          <img onclick='openLoginDigForReg();openLoginDig();' src='{{Msg "seo" "cdn"}}/images/index/new/register-guide.png?v={{Msg "seo" "version"}}' alt="首页-引导注册">
+        </div>
+        {{end}}
         <!-- 独家行业洞察区域 -->
         <div class="jy-index-product CfadeInUp">
           <h3 class="module-title">核心功能推荐</h3>

src/web/templates/pc/tags/detail.html

@@ -191,39 +191,8 @@
                 {{Html (Regexp (Regexp (Regexp (Regexp (Regexp (Regexp .T.obj.detail "(\\n|\\\\n)\\s+" "\n") "(\\n|\\\\n)+" "<br/>") "<td>\\s*$" "") "<tr>\\s*$" "") "<tbody>\\s*$" "") "<table>\\s*$" "")}}
               </div>
             </div>
-            <div class="reg-service">
-              <div class="service-top">
-                <div class="s-t-header"></div>
-                <div class="s-t-content">
-                  <div class="s-t-item">
-                    <p class="item-icon item-icon-1"></p>
-                    <p class="item-hight-title">免费查看招标信息</p>
-                    <p class="item-text">精准匹配你需要的商机，极速推送，获取项目更精准。</p>
-                  </div>
-                  <div class="s-t-item">
-                    <p class="item-icon item-icon-2"></p>
-                    <p class="item-hight-title">潜在竞争对手/合作伙伴挖掘</p>
-                    <p class="item-text">提供个性化定制的标讯数据维度，成为新的拓客方式。</p>
-                  </div>
-                  <div class="s-t-item">
-                    <p class="item-icon item-icon-3"></p>
-                    <p class="item-hight-title">1V1专属服务</p>
-                    <p class="item-text">平台专属服务顾问1V1服务，9大行业社群免费进，行业交流、获取商机更便捷！</p>
-                  </div>
-                </div>
-              </div>
-              <div class="service-bottom">
-                <div class="s-b-header">登录后可查看全文</div>
-                <div class="s-b-group">
-                  <span class="login-btn login-node" id="login-main-btn">立即登录</span>
-                  <span class="reg-btn reg-node" id="reg-main-btn">还不是会员？立即免费注册</span>
-                </div>
-                <div class="s-b-phone">
-                  <i></i>
-                  <span>咨询热线：<span class="tel-num">400-108-6670</span></span>
-                </div>
-              </div>
-            </div>
+           <!--未登录展示的引导广告-->
+            <div class="reg-service login-node"></div>
           </div>
           <div class="bid-footer">
             <div class="otherinfo">