瀏覽代碼

Merge branch 'dev/v1.0.3_yf' of jianyu/jybxseo into feature/v1.0.3

yangfeng 1 年之前
父節點
當前提交
7a79dd0a3c
共有 3 個文件被更改,包括 12 次插入2 次删除
  1. 1 1
      manifest/config/global.yaml
  2. 9 1
      resource/staticres/js/mobile/detail.js
  3. 2 0
      resource/template/mobile/detail.html

+ 1 - 1
manifest/config/global.yaml

@@ -6,7 +6,7 @@ mobileWebDomain: "https://app-a1.jianyu360.cn"
 
 loginUrl:
   jyWeb: "/notin/page?backTo="
-  mobile: "/jyapp/free/login?url="
+  mobile: "/jyapp/free/login?to=back&url="
 
 # 所有行业树
 allClassTree:

+ 9 - 1
resource/staticres/js/mobile/detail.js

@@ -10,7 +10,6 @@ var pageDetail = {
     var _this = this
     this.isImgLoad(function () {
       var adHeight = _this.$adBottomImg.height()// 获取图片高度
-      console.log(adHeight, 'adHeight');
       _this.$pageMain.css('padding-bottom', adHeight + 'px')
     })
     this.goLogin()
@@ -46,5 +45,14 @@ var pageDetail = {
   }
 }
 $(function () {
+  var isPageHide = false;
+  window.addEventListener('pageshow', function () {
+    if (isPageHide) {
+      location.reload()
+    }
+  })
+  window.addEventListener('pagehide', function () {
+    isPageHide = true;
+  })
   pageDetail.init()
 })

+ 2 - 0
resource/template/mobile/detail.html

@@ -94,7 +94,9 @@
 
       {{include "mobile/components/tag-breadcrumb.html" .}}
       {{include "mobile/components/tag-footer.html" .}}
+      {{if not $global.hasLogin}}
       {{include "mobile/components/tag-ad-bottom.html" .}}
+      {{end}}
     </main>
   </div>
   <script src='{{Cdn}}/common-module/public/js/utils.js?v={{Msg "version"}}'></script>