Merge remote-tracking branch 'origin/dev4.6.3.7' into dev4.6.3.7

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

@@ -567,6 +567,9 @@
     var productType = 0 // 0免费用户 1超级订阅 2大会员 // 3商机管理
     var historyVt = ''
 </script>
+<!-- vConsole debug -->
+<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
+<script>new VConsole()</script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
@@ -711,6 +714,7 @@
   }
   $(function () {
       var isPageShow = document.hidden
+      debugger
       setTimeout(function(){
         loadJS("{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/local/fastclick.min.js",function(){
           FastClick.attach(document.body);
@@ -739,14 +743,15 @@
       $(window).bind("pageshow", function (event) {
         if (event.originalEvent.persisted) {
           //返回不加载  导致菜单不出来
-          if(!isPageShow) {
-            JyObj.hiddenBottom("1");
-          }
+          JyObj.hiddenBottom("1");
           count=0;
           initpage();
           isinitpage = true;
         }
       });
+      if(isPageShow) {
+        JyObj.hiddenBottom("0");
+      }
       if (!isinitpage) {
         initpage();
         isinitpage = true;

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -628,6 +628,8 @@
 </script>
 
 <!--S-当前页面的资源-->
+<script type="text/javascript" src="//cdn.bootcdn.net/ajax/libs/vConsole/3.3.4/vconsole.min.js"></script>
+<script>new VConsole()</script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vue/2.6.11/vue.min.js></script>
 <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/public/js/china-map-data.js?v={{Msg "seo" "version"}}'></script>