Merge branch 'dev4.6.1.4' into release

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/utils.js

@@ -317,9 +317,19 @@ var utils = {
     // 解决ios返回不刷新页面的问题
     iosBackRefresh: function () {
         var isPageHide = false;
+        let superSearch_iosNoRefresh = sessionStorage.getItem('superSearch_iosNoRefresh')
         window.addEventListener('pageshow', function () {
             if (isPageHide) {
+              // ios从三级页返回不刷新页面
+              if(!superSearch_iosNoRefresh) {
                 location.reload();
+              } else {
+                sessionStorage.removeItem('superSearch_iosNoRefresh')
+              }
+            } else {
+              if(superSearch_iosNoRefresh) {
+                sessionStorage.removeItem('superSearch_iosNoRefresh')
+              }
             }
         });
         window.addEventListener('pagehide', function () {

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

@@ -1659,6 +1659,7 @@ function hasNoData() {
           sessionStorage.historypushDataCache = JSON.stringify(dataCache);
           sessionStorage.historypushPageIndexCache = pageIndex;
           sessionStorage.historypushHasNextPage = hasNextPage;
+          sessionStorage.superSearch_iosNoRefresh = 'detail'
       }
   }