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

src/jfw/modules/app/src/web/templates/tags/template/tag-footer-concat.html

@@ -6,7 +6,7 @@
     </a>
     <a class="seo-button theme-main radius" href="/jyapp/free/login?url=/jyapp/jylab/mainSearch">
       <span class="j-icon base-icon icon-person-white-solid"></span>
-      <p>登录/注册</p>
+      <p>登录</p>
     </a>
   </div>
 </section>

src/jfw/modules/app/src/web/templates/tags/template/tag-register-login-group.html

@@ -5,5 +5,5 @@
   {{if .T.areaTopTip}}
     <h1 class="header-title">{{.T.areaTopTip}}</h1>
   {{end}}
-  <a class="seo-button theme-main" href="/jyapp/free/login?DisUrl=/jyapp/jylab/mainSearch">登录/注册</a>
+  <a class="seo-button theme-main" href="/jyapp/free/login?DisUrl=/jyapp/jylab/mainSearch">登录</a>
 </section>

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

@@ -2900,8 +2900,8 @@
       }
       outhtml +='<li class="caigouunit commonUser"><p class="name">采购单位</p><div class="unitcenter"><p  class="textcontent">'+rerbuyer+'</p><div class="unitbtn '+rerbuyer_show+'">立即查看<span class="iconunit" style="display:none;"></span></div></div></li>'
       outhtml +='<li style="display:none" class="entnicheUser"><p class="name">采购单位</p><div class="unitcenter sum_caigou client_caigou"><p  class="textcontent">'+rerbuyer+'</p><div class="sum_right"><div class="claim" onClick="setportain(event)"><span class="j-icon icon-porait"></span><span class="getproit" style="color:#2ABED1">查看画像</span></div><span class="columnLine"></span><div class="claim clientClaim" onClick="setClientClaim(event)"><span class="j-icon icon_state icon-claim"></span><span class="icon-claim-text" style="color:#2ABED1;font-size: .26rem;">认领客户</span></div></div></div></li>'
-      outhtml +='<li><p class="name">采购联系人</p><p class="textcontent">'+rerbuyerperson+'</p></li>'+
-          '<li class="bbm0"><p class="name">采购电话</p><p class="textcontent">'+rerbuyertel+'</p><a class="border-tel_ '+buyertel_show+'" style="position: static;display:block" datalink="/jyapp/vipsubscribe/introducePage"><div class="tel"></div></a></li>'
+      outhtml +='<li><p class="name">采购联系人</p><p class="textcontent needLogin">'+rerbuyerperson+'</p></li>'+
+          '<li class="bbm0"><p class="name">采购电话</p><p class="textcontent needLogin">'+rerbuyertel+'</p><a class="border-tel_ '+buyertel_show+'" style="position: static;display:block" datalink="/jyapp/vipsubscribe/introducePage"><div class="tel"></div></a></li>'
       if(packageCon==""){
           var rerbudget = {{.T.obj.budget}};
           if(rerbudget==undefined||rerbudget==null){
@@ -3754,6 +3754,13 @@
         }
         location.href = '/jyapp/frontPage/bigmember/free/perfect_info?source=' + info.source + '&infoid=' + info.infoid
       })
+      // 登录
+      $('.needLogin').click(function(){
+        if(!userId) {
+          backAfterLogin()
+          return
+        }
+      })
     })
 
     // 用户发布的信息的联系方式