Merge branch 'dev/v4.8.36_zsy' of qmx/jy into feature/v4.8.36

src/jfw/modules/app/src/web/staticres/jyapp/css/wxinfocontent.css

@@ -676,7 +676,6 @@ pre {
 .onlyone img {
     width: 100%;
 }
-
 .adv-appcontent-bottom::after {
     content: "广告";
     position: absolute;
@@ -692,7 +691,7 @@ pre {
     line-height: 12px;
 }
 
-.adv-appcontent-bottom {
+.adv-appcontent-bottom{
     width: 100%;
     margin: auto;
     text-align: center;
@@ -701,7 +700,7 @@ pre {
     position: relative;
 }
 
-.adv-appcontent-bottom img {
+.adv-appcontent-bottom img{
     width: 100%;
 }
 

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

@@ -229,56 +229,56 @@
         <span class="app-back jyapp-icon jyapp-icon-zuojiantou share-back"></span>
         <span class="header-title">公告信息</span>
         <span class="header-share" id="share">
-		<img class="share-gift" src="/jyapp/images/jianyubi.png">
-		<p class="share-gift" style="font-size: 10px; line-height: 12px">分享有礼</p>
-    <div class="overlay">
-      <div class="share-sheet">
-        <div class="title">
-          <h4>分享有礼</h4>
-          <img src="/jyapp/images/img/close.png" alt="" class="close">
-        </div>
-        <!-- <div class="description">
-          <img src="/jyapp/images/hongbao.png" alt="">
-          <p>分享剑鱼标讯产品给好友，购买成功您得佣金</p>
-          <a href="/page_partner/partner/partner.html?flag=1">了解详情</a>
-        </div> -->
-        <div class="description">
-          <img src="/jyapp/images/jianyubi.png" alt="">
-          <p>分享招标信息及文档，好友访问立得剑鱼币</p>
-          <a href="/page_points_mobile/share">了解详情</a>
-        </div>
-        <div class="sheet-option">
-          <ul class="shareType">
-            <li id="weixin " class="Software">
-              <img src="/jyapp/images/img/weixin.png" alt="">
-              <span>微信</span>
-            </li>
-            <li id="pengyouquan" class="Software">
-              <img src="/jyapp/images/img/pengyouquan.png" alt="">
-              <span>朋友圈</span>
-            </li>
-            <li id="qq"  class="Software">
-              <img src="/jyapp/images/img/qq.png" alt="">
-              <span>QQ</span>
-            </li>
-            <!-- <li id="kouling">
-              <img src="/jyapp/images/img/kouling.png" alt="">
-              <span>口令分享</span>
-            </li>
-            <li id="lianjie">
-              <img src="/jyapp/images/img/lianjie.png" alt="">
-              <span>链接分享</span>
-            </li>
-            <li id="tupian1">
-              <img src="/jyapp/images/img/tupian.png" alt="">
-              <span>图片分享</span>
-            </li> -->
-          </ul>
+            <img class="share-gift" src="/jyapp/images/jianyubi.png">
+            <p class="share-gift" style="font-size: 10px; line-height: 12px">分享有礼</p>
+            <div class="overlay">
+              <div class="share-sheet">
+                <div class="title">
+                  <h4>分享有礼</h4>
+                  <img src="/jyapp/images/img/close.png" alt="" class="close">
+                </div>
+                <!-- <div class="description">
+                  <img src="/jyapp/images/hongbao.png" alt="">
+                  <p>分享剑鱼标讯产品给好友，购买成功您得佣金</p>
+                  <a href="/page_partner/partner/partner.html?flag=1">了解详情</a>
+                </div> -->
+                <div class="description">
+                  <img src="/jyapp/images/jianyubi.png" alt="">
+                  <p>分享招标信息及文档，好友访问立得剑鱼币</p>
+                  <a href="/page_points_mobile/share">了解详情</a>
+                </div>
+                <div class="sheet-option">
+                  <ul class="shareType">
+                    <li id="weixin " class="Software">
+                      <img src="/jyapp/images/img/weixin.png" alt="">
+                      <span>微信</span>
+                    </li>
+                    <li id="pengyouquan" class="Software">
+                      <img src="/jyapp/images/img/pengyouquan.png" alt="">
+                      <span>朋友圈</span>
+                    </li>
+                    <li id="qq"  class="Software">
+                      <img src="/jyapp/images/img/qq.png" alt="">
+                      <span>QQ</span>
+                    </li>
+                    <!-- <li id="kouling">
+                      <img src="/jyapp/images/img/kouling.png" alt="">
+                      <span>口令分享</span>
+                    </li>
+                    <li id="lianjie">
+                      <img src="/jyapp/images/img/lianjie.png" alt="">
+                      <span>链接分享</span>
+                    </li>
+                    <li id="tupian1">
+                      <img src="/jyapp/images/img/tupian.png" alt="">
+                      <span>图片分享</span>
+                    </li> -->
+                  </ul>
+                </div>
+              </div>
         </div>
-      </div>
-    </div>
             <!-- 分享 end -->
-	</span>
+	    </span>
     </div>
     <div class="app-layout-content-b">
         <div class="mask"></div>
@@ -479,7 +479,7 @@
                               <span class="icon weishoucang"></span>
                               <span class="icon-text">收藏</span>
                           </div>
-                          {{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:1px !important;display: none">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div><!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
+                          {{if or .T.obj.projectname .T.obj.projectcode}}<div class="follow" style="top:1px !important;">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</div><!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
                           <div class="forward-share">
                             <forwardshare :params="params"></forwardshare>
                           </div>
@@ -570,7 +570,7 @@
                                 <span class="icon weishoucang"></span>
                                 <span class="icon-text">收藏</span>
                             </div>
-                            {{if or .T.obj.projectname .T.obj.projectcode}}<span class="follow" style="display: none">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</span><!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
+                            {{if or .T.obj.projectname .T.obj.projectcode}}<span class="follow">{{if .T.obj.followFlag}}<i class="glyphicon yiguanzhu"></i>已关注{{else}}<i class="glyphicon weiguanzhu"></i>关注项目{{end}}</span><!--<a href="/swordfish/share/-1" style="text-decoration: none;color:#24C0D7;"><span class="follow"><i class="glyphicon weiguanzhu"></i></span>关注项目</a>-->{{end}}
                             <div class="forward-share">
                               <forwardShare :params="params"></forwardShare>
                             </div>
@@ -1037,7 +1037,7 @@
     // 未登录展示登录模块
     if(!userId) {
       $('.noLoginShow').show()
-      $('.share-gift').hide()
+      // $('.share-gift').hide()
       $('.bid-dec-in').hide()
       $('.bigvip_drain').hide()
       $('.abs').hide()
@@ -2333,6 +2333,11 @@
           },100)
       });
       $(".header-share").click(function(){
+         if(!userId){
+           const url = `/jyapp/article/content/${id}.html`
+           autoLogin(url)
+           return
+         }
           $(".depthread-share").hide();
           $("#sharelist").toggleClass("hide");
       });

src/web/templates/weixin/wxinfocontent_rec.html

@@ -1040,7 +1040,6 @@ body .loading_ p span {
       </div>
     </div>
 	</div>
-
 	<div class="newuser hidden">
 	<img src="{{Msg "seo" "cdn"}}/images/wx/newuser.png"/>
 	</div>
@@ -1248,10 +1247,10 @@ body .loading_ p span {
                     </ul>
                 </div>
             </div>
-		<center class="reward">
-			{{.T.rewardText}}
-			<button type="button" onclick="reward()" class="btn">打赏</button>
-		</center>
+<!--		<center class="reward">-->
+<!--			{{.T.rewardText}}-->
+<!--			<button type="button" onclick="reward()" class="btn">打赏</button>-->
+<!--		</center>-->
 		<div id="third-party-verify-attention" class="third-party-verify-attention" style="display:none;">
 			<span class="t-p-v-a-text">*温馨提示：系统识别到正文中对投标方有资质要求～</span>
 		</div>