Browse Source

fix:标讯详情页模板语法&登录取详情页参数

yangfeng 11 tháng trước cách đây
mục cha
commit
44c579555b

+ 1 - 1
src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -1685,7 +1685,7 @@ function loginSuccess (result, loginType) {
   }
   //判断是否需要跳过设置密码和兴趣爱好
   // P574移动端未登录调整:用户从标讯详情页注册后,不出现业务标签填写流程,直接跳转到登陆前url对应的h5链接
-  var isPass =  getParam("activity") || document.referrer.indexOf('/nologin/conten/') > -1
+  var isPass =  getParam("activity") || document.referrer.indexOf('/nologin/conten/') > -1 || document.referrer.indexOf('/article/content/') > -1
   // 当前为新用户(即注册)--跳转设置密码页
    if(!isPass&&result.userInfo && result.userInfo.isNewUser) {
      var href ="/jyapp/free/setPwd";

+ 4 - 1
src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -1144,7 +1144,10 @@
         {{include "tags/template/tag-footer.html" .}}
         {{end}}
     </div>
-    {{if not ((eq .T.obj.subtype "拟建") or (eq .T.obj.subtype '采购意向'))}}
+    {{ $subtype := .T.obj.subtype }}
+    {{ $isNotNiji := ne $subtype "拟建" }}
+    {{ $isNotCgyx := ne $subtype "采购意向" }}
+    {{if and $isNotNiji $isNotCgyx}}
     {{include "tags/template/article-tabbar.html" .}}
     {{end}}
 </div>