Merge branch 'dev4.6.2.7' of http://192.168.3.207:8080/qmx/jy into dev4.6.2.71

README.md

@@ -4,3 +4,4 @@ weixin sdk https://github.com/wizjin/weixin
 web用xweb框架
 v4.6.2.7
 更改大会员落地页文案
+iosAPP，从招标搜索、招标订阅列表打开三级页再返回，未记录位置

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -63,7 +63,13 @@ $(function () {
         var isPageHide = false;
         window.addEventListener('pageshow', function () {
             if (isPageHide) {
+              // ios从三级页返回不刷新页面
+              const superSearch_iosNoRefresh = sessionStorage.getItem('superSearch_iosNoRefresh')
+              if(!superSearch_iosNoRefresh) {
                 location.reload();
+              } else {
+                sessionStorage.removeItem('superSearch_iosNoRefresh')
+              }
             }
         });
         window.addEventListener('pagehide', function () {
@@ -2223,6 +2229,7 @@ var SuperSearch = {
             sessionStorage.searchpageName = "superSearch";
             sessionStorage.superSearch_dyDiv = SuperSearch.dyDiv;
             sessionStorage.superSearch_advertIsClose = SuperSearch.advertIsClose;
+            sessionStorage.superSearch_iosNoRefresh= 'detail'
 //			if($("#supersearchPage .on").hasClass("showlist")){
 //				localStorage.superSearch_showType="showList";
 //			}else if($("#supersearchPage .on").hasClass("showtable")){

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

@@ -173,7 +173,7 @@
     <keep-component ref="vKeepComponent" @on-change-keep="changeKeepStatus"  :bid="nowOpenBid" :first="false"></keep-component>
 </div>
 
-<div class="j-container" id="select-meau" style="display: none;">
+<div class="j-container" id="select-meau" style="visibility: hidden;">
     <van-popover v-model="showPopover" placement="top" trigger="click" class="housePover">
         <van-grid
         class="fixedPover"
@@ -803,6 +803,7 @@
       this.isCanSwitch=true;
       this.InitPersonal=function(r){
         $("#sub_manager").click(function() {
+            setSessionStorage();
             sessionStorage.setItem(vm.sessStorageKey, JSON.stringify(vm.$data))
             let thisType = sessionStorage.getItem('userIsNew')
             if (window.userNewType || thisType) {
@@ -833,6 +834,7 @@
       }
       this.InitVip=function(r){
         $("#sub_manager").click(function() {
+            setSessionStorage();
             console.log(vm.rootInfo, 'vmrootInfo')
             sessionStorage.setItem(vm.sessStorageKey, JSON.stringify(vm.$data))
             let thisType = sessionStorage.getItem('userIsNew')
@@ -1023,6 +1025,7 @@
             }, 300);
         }
         setTimeout(() => {
+            $('#select-meau').css({'visibility': 'initial'})
             $('#select-meau').css({'display':'flex'})
         }, 500)
         if (hasNextPage) {
@@ -1285,6 +1288,7 @@ function hasNoData() {
     var NoDataShow = $('.findnull-no-key').is(':hidden')
     $(".listcontent").hide()
     $("#loading").hide()
+    $('#select-meau').css({'visibility': 'initial'})
     $('#select-meau').css({'display': 'flex'})
     $(".color_top").hide()
     // 如果no-key-no-data 不显示，才会显示no-data

src/web/staticres/common-module/public/js/utils.js

@@ -318,7 +318,13 @@ var utils = {
         var isPageHide = false;
         window.addEventListener('pageshow', function () {
             if (isPageHide) {
+              // ios从三级页返回不刷新页面
+              const superSearch_iosNoRefresh = sessionStorage.getItem('superSearch_iosNoRefresh')
+              if(!superSearch_iosNoRefresh) {
                 location.reload();
+              } else {
+                sessionStorage.removeItem('superSearch_iosNoRefresh')
+              }
             }
         });
         window.addEventListener('pagehide', function () {