Merge branch 'dev/v4.8.67_yf' of qmx/jy into feature/v4.8.67

src/jfw/modules/app/src/web/templates/tags/template/tag-area-nav.html

@@ -1,12 +1,27 @@
 <section class="tag-area-nav-container">
   <div class="tag-area-nav-list-container simple-area">
-    <p class="tag-area-nav-list-title">分站</p>
+    <div class="tag-area-nav-list-title">分站</div>
     <ul class="tag-area-nav-list">
-      {{range $val:=.T.hotArea}}
+      <!-- {{range $val:=.T.hotArea}}
       <li class="tag-area-nav-item">
         <a href="{{$val.Url}}" title="{{$val.Name}}招标网">{{$val.Name}}</a>
       </li>
-      {{end}}
+      {{end}} -->
+      <li class="tag-area-nav-item">
+        <a href="/list/area/BJ.html" title="北京招标网">北京</a>
+      </li>
+      <li class="tag-area-nav-item">
+        <a href="/list/area/SD.html" title="山东招标网">山东</a>
+      </li>
+      <li class="tag-area-nav-item">
+        <a href="/list/area/SXC.html" title="陕西招标网">陕西</a>
+      </li>
+      <li class="tag-area-nav-item">
+        <a href="/list/area/JS.html" title="江苏招标网">江苏</a>
+      </li>
+      <li class="tag-area-nav-item">
+        <a href="/list/area/GD.html" title="广东招标网">广东</a>
+      </li>
       <li class="tag-area-nav-item highlight-text action-show-more">更多 &gt;</li>
     </ul>
   </div>

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

@@ -28,6 +28,8 @@
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/bootstrap.min.js"></script>
     <script src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/share.js?v={{Msg "seo" "version"}}"></script>
     <script src="//cdn-common.jianyu360.com/cdn/lib/html2canvas/1.3.3/dist/html2canvas.min.js"></script>
+    <link href='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/tags/css/tags-module-common.css?v={{Msg "seo" "version"}}' rel="stylesheet" />
+    
 
     {{include "/common/js.html"}}
     <style>
@@ -344,6 +346,7 @@
             </ul>
         </div>
     </div>
+    {{if .T.obj.hasSession}}
     <div class="app-layout-header jy-app-header">
         <span class="app-back jyapp-icon jyapp-icon-zuojiantou share-back"></span>
         <span class="header-title">公告信息</span>
@@ -399,7 +402,15 @@
             <!-- 分享 end -->
 	    </span>
     </div>
+    {{else}}
+    {{include "tags/template/tag-header.html" .}}
+    {{end}}
+
     <div class="app-layout-content-b">
+        {{if not .T.obj.hasSession}}
+        {{include "tags/template/tag-info-type-nav.html" .}}
+        {{include "tags/template/tag-area-nav.html" .}}
+        {{end}}
         <div class="mask"></div>
         <div class="info">
             <!-- <div class="_c2l0w7g3cjf"></div> -->
@@ -1132,6 +1143,9 @@
         {{end}}
         {{end}}
         {{end}}
+        {{if not .T.obj.hasSession}}
+        {{include "tags/template/tag-footer.html" .}}
+        {{end}}
     </div>
 </div>
 <!-- 三方认证弹窗 -->
@@ -1155,7 +1169,6 @@
       $(this).wrap('<div class="scroll-tab-container" style="max-width: 100%;overflow-x: scroll;"></div>')
     })
   });
-
     var canRead = {{.T.canRead}} //免费用户当天查看是否查看三次公告
     var	shareimgflag = true;
     var area = {{.T.obj.area}}
@@ -3520,7 +3533,60 @@
         return key
       }
     }
+    
 </script>
+{{if not .T.obj.hasSession }}
+  <script>
+      var areaNavModule = {
+      $el: null,
+      init: function () {
+        this.getTargetDOM()
+        this.addListener()
+      },
+      getTargetDOM: function () {
+        this.$el = $('.tag-area-nav-container')
+      },
+      addListener: function () {
+        var _this = this
+        if (!this.$el) return
+        this.$el.find('.action-show-more').on('click', function () {
+          _this.$el.find('.tag-area-nav-list-group').toggle()
+        })
+      }
+    }
+    var backToTop = {
+      $scrollDOM: $('.app-layout-content-b'),
+      $backToTop: $('.back-to-top'),
+      init: function () {
+        this.checkBackToTopButtonShow()
+        this.bindEvents()
+      },
+      bindEvents: function () {
+        var _this = this
+        this.$backToTop.on('click', function () {
+          $('.app-layout-content-b').animate({
+            scrollTop: 0
+          })
+        })
+        this.$scrollDOM.on('scroll', function (e) {
+          _this.checkBackToTopButtonShow()
+        })
+      },
+      checkBackToTopButtonShow: function () {
+        var scrollTop = this.$scrollDOM.scrollTop()
+        if (scrollTop < 5) {
+          this.$backToTop.hide()
+        } else {
+          this.$backToTop.show()
+        }
+      },
+    }
+    $(function(){
+      areaNavModule.init()
+      backToTop.init()
+    })
+  </script>
+{{end}}
 {{include "/common/baiducc.html"}}
 </body>
 </html>