Pārlūkot izejas kodu

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

汤世哲 1 gadu atpakaļ
vecāks
revīzija
830570a68d

+ 8 - 6
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -827,11 +827,13 @@
                         <!-- <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 class="dialog-tip-img" style="position: relative;">
+                            <div style="position: absolute;right: .32rem; top: .32rem;padding: .02rem .16rem;background: #E5FCFF;color: #2ABED1;font-size: .26rem;">示例</div>
+                            <img :src="'{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/images/wx/' + info.img +'.png?v={{Msg "seo" "version"}}'" alt="">
+                          </div>
                         </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 class="dialog-tip-text" v-html="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>
@@ -1639,8 +1641,8 @@
         // 改遮罩文字
         if (advanceProject) {
             if (subtype == '采购意向') {
-                $('#dialog-tip-title').text('项目提前介入,中标更轻松')
-                $(".dialog-tip-text").html('提前1-3个月获取项目信息,及早介入准备更充分')
+                // $('#dialog-tip-title').text('项目提前介入,中标更轻松')
+                // $(".dialog-tip-text").html('提前1-3个月获取项目信息,及早介入准备更充分')
             }
             if(!canRead) {
               $('.default-dialog').removeClass("hidden")
@@ -1943,7 +1945,7 @@
           }
         } else if(subtype === '采购意向') {
           this.info = {
-            text: '提前1-3个月获取项目信息,\n及早介入准备更充分',
+            text: '提前1-3个月获取项目信息,<br/>及早介入准备更充分',
             img: 'app-cg-detail',
             headtext: '项目提前介入,中标更轻松',
           }

+ 8 - 6
src/web/templates/weixin/wxinfocontent_rec.html

@@ -1275,11 +1275,13 @@ body .loading_ p span {
             <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 class="dialog-tip-img" style="position: relative;">
+                    <div style="position: absolute;right: .32rem; top: .32rem;padding: .02rem .16rem;background: #E5FCFF;color: #2ABED1;font-size: .26rem;">示例</div>
+                    <img :src="'{{Msg "seo" "cdn"}}/jyapp/images/wx/' + info.img +'.png?v={{Msg "seo" "version"}}'" alt="">
+                  </div>
                 </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 class="dialog-tip-text" v-html="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>
@@ -1984,8 +1986,8 @@ function checkShowDialog () {
 	if (advanceProject) {
 		// 超前项目
 		if (subtype == '采购意向') {
-			$('#dialog-tip-title').text('项目提前介入,中标更轻松')
-			$(".dialog-tip-text").html('提前1-3个月获取项目信息,及早介入准备更充分')
+			// $('#dialog-tip-title').text('项目提前介入,中标更轻松')
+			// $(".dialog-tip-text").html('提前1-3个月获取项目信息,及早介入准备更充分')
 		}
         if(!canRead) {
           $('.default-dialog').removeClass("hidden")
@@ -2312,7 +2314,7 @@ function openFileDown (url) {
           }
         } else if(subtype === '采购意向') {
           this.info = {
-            text: '提前1-3个月获取项目信息,\n及早介入准备更充分',
+            text: '提前1-3个月获取项目信息,<br/>及早介入准备更充分',
             img: 'app-cg-detail',
             headtext: '项目提前介入,中标更轻松',
             btntext: '点击进入'