Merge branch 'dev/v4.8.93_tsz' of qmx/jy into feature/v4.8.93

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

@@ -127,7 +127,7 @@
           font-weight: 500;
           color: #161826;
           line-height: 0.4rem;
-          margin-bottom: 0.48rem;
+          margin-bottom: 0.24rem;
           align-items: center;
           text-align: center;
       }
@@ -821,17 +821,20 @@
                     {{end}}
                 </ul>
             </div>
-            <div class="mask-zz dialog-tip-group default-dialog hidden">
+            <div class="mask-zz dialog-tip-group default-dialog hidden" id="cg-nj-dialog">
                 <div class="mask-zz">
-                    <div style="position: relative">
-                        <img class="dialog-top-img" src='/jyapp/images/wx/pc_zzt.png?v={{Msg "seo" "version"}}'>
-                        <div id="dialog-tip-title" style="position: absolute;top: 50%;left: 50%; transform: translateX(-50%);height: 26px;color: antiquewhite;font-size: 16px;white-space: nowrap;">超前项目抢先知，中标更容易</div>
-                    </div>
-                    <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;padding: 0.48rem 0.32rem;">
-                        <div class="dialog-tip-text">
-                            提前3-12个月获取审批中的新项目，超前项目抢先介入，商机提前掌控。
+                    <div style="position: relative; padding-bottom: .4rem; background: url('/jyapp/big-member/image/openVip.png') no-repeat;min-height: 7.4rem;background-size: contain;">
+                        <!-- <img class="dialog-top-img" src='/jyapp/images/wx/pc_zzt.png?v={{Msg "seo" "version"}}'> -->
+                        <div class="tip-box-example">
+                          <div id="dialog-tip-title" style="height: 26px;color: antiquewhite;font-size: 16px;white-space: nowrap;text-align: center; padding: .48rem 0 .32rem;">${info.headtext}</div>
+                          <img :src="'{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wx/' + info.img +'.png?v={{Msg "seo" "version"}}'" alt="">
+                        </div>
+                        <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;padding: 0 0.32rem;background: #fff;">
+                            <div class="dialog-tip-text">
+                              ${info.text}
+                            </div>
+                            <button class="free-btn-reword" style="background-color:  #2CB7CA;font-size: 0.32rem;color: white;border:none;width: 100%;height:0.72rem;border-radius: 0.12rem;">${info.btntext}</button>
                         </div>
-                        <button class="free-btn-reword" style="background-color:  #2CB7CA;font-size: 0.32rem;color: white;border:none;width: 100%;height:0.72rem;border-radius: 0.12rem;">点击进入</button>
                     </div>
                 </div>
             </div>
@@ -1700,7 +1703,7 @@
     })
 
     //留资弹窗页面
-    $('.free-btn-reword').on('click', function() {
+    $(document).on('click', '.free-btn-reword', function() {
         var subType = {{.T.obj.subtype}}
         var sourceKey = 'article_slogan'
         if(!canRead) {
@@ -1924,6 +1927,34 @@
     //     }
     //   })
     // }
+    // 采购意向、拟建遮罩弹窗
+    var cgnjDialog = new Vue({
+      delimiters: ['${', '}'],
+      el: '#cg-nj-dialog',
+      data: {
+        info: {}
+      },
+      mounted: function () {
+        if(subtype === '拟建') {
+          this.info = {
+            text: '提前3-12个月获取审批中的新项目，超前项目抢先介入，商机提前掌控。',
+            img: 'app-nj-detail',
+            headtext: '超前项目抢先知，中标更容易',
+          }
+        } else if(subtype === '采购意向') {
+          this.info = {
+            text: '提前1-3个月获取项目信息，\n及早介入准备更充分',
+            img: 'app-cg-detail',
+            headtext: '项目提前介入，中标更轻松',
+          }
+        }
+        if(!userId) {
+          this.info.btntext = '登陆后解锁会员查看'
+        } else {
+          this.info.btntext = '点击进入'
+        }
+      }
+    })
     // 参标展示更新投标状态弹窗
     var showUpdateBid = new Vue({
       el: '.refer_stand',

src/web/templates/weixin/wxinfocontent_rec.html

@@ -719,7 +719,7 @@ em {
     font-weight: 500;
     color: #161826;
     line-height: 0.4rem;
-    margin-bottom: 0.48rem;
+    margin-bottom: 0.24rem;
     align-items: center;
     text-align: center;
 }
@@ -1270,20 +1270,22 @@ body .loading_ p span {
 			</ul>
 
 		</div>
-		<div class="mask-zz dialog-tip-group default-dialog hidden">
-			<div class="mask-zz">
-				<div style="position: relative">
-					<img class="dialog-top-img" src='/images/wx/pc_zzt.png?v={{Msg "seo" "version"}}'>
-					<div  id="dialog-tip-title" style="position: absolute;top: 50%;left: 50%; transform: translateX(-50%);height: 26px;color: antiquewhite;font-size: 16px;white-space: nowrap;">超前项目抢先知，中标更容易</div>
-				</div>
-				<div style="display: flex;flex-direction: column;justify-content: center;align-items: center;padding: 0.48rem 0.32rem;">
-					<div class="dialog-tip-text">
-						提前3-12个月获取审批中的新项目，超前项目抢先介入，商机提前掌控。
-					</div>
-					<button class="free-btn-reword" style="background-color:  #2CB7CA;font-size: 0.32rem;color: white;border:none;width: 100%;height:0.72rem;border-radius: 0.12rem;">点击进入</button>
-				</div>
-			</div>
-		</div>
+      <div class="mask-zz dialog-tip-group default-dialog hidden" id="cg-nj-dialog">
+        <div class="mask-zz">
+            <div style="position: relative; padding-bottom: .4rem; background: url('/big-member/image/openVip.png') no-repeat;min-height: 7.4rem;background-size: contain;">
+                <div class="tip-box-example">
+                  <div id="dialog-tip-title" style="height: 26px;color: antiquewhite;font-size: 16px;white-space: nowrap;text-align: center; padding: .48rem 0 .32rem;">${info.headtext}</div>
+                  <img :src="'{{Msg "seo" "cdn"}}/jyapp/images/wx/' + info.img +'.png?v={{Msg "seo" "version"}}'" alt="">
+                </div>
+                <div style="display: flex;flex-direction: column;justify-content: center;align-items: center;padding: 0 0.32rem;background: #fff;">
+                    <div class="dialog-tip-text">
+                      ${info.text}
+                    </div>
+                    <button class="free-btn-reword" style="background-color:  #2CB7CA;font-size: 0.32rem;color: white;border:none;width: 100%;height:0.72rem;border-radius: 0.12rem;">${info.btntext}</button>
+                </div>
+            </div>
+        </div>
+      </div>
         <div class="mask-zz dialog-tip-group compare-dialog hidden">
             <div class="mask-zz">
                 <div class="compare-dialog-head">
@@ -2025,7 +2027,7 @@ function showTopAd () {
 }
 
 //留资弹窗页面
-$('.free-btn-reword').on('click', function() {
+$(document).on('click', '.free-btn-reword', function() {
 	var subType = {{.T.obj.subtype}}
 	var sourceKey = 'article_slogan'
   if(!canRead) {
@@ -2293,6 +2295,31 @@ function openFileDown (url) {
 //         }
 //       })
 //     }
+// 采购意向、拟建遮罩弹窗
+    var cgnjDialog = new Vue({
+      delimiters: ['${', '}'],
+      el: '#cg-nj-dialog',
+      data: {
+        info: {}
+      },
+      mounted: function () {
+        if(subtype === '拟建') {
+          this.info = {
+            text: '提前3-12个月获取审批中的新项目，超前项目抢先介入，商机提前掌控。',
+            img: 'app-nj-detail',
+            headtext: '超前项目抢先知，中标更容易',
+            btntext: '点击进入'
+          }
+        } else if(subtype === '采购意向') {
+          this.info = {
+            text: '提前1-3个月获取项目信息，\n及早介入准备更充分',
+            img: 'app-cg-detail',
+            headtext: '项目提前介入，中标更轻松',
+            btntext: '点击进入'
+          }
+        }
+      }
+    })
     // 参标展示更新投标状态弹窗
     var showUpdateBid = new Vue({
       el: '.refer_stand',