Merge branch 'dev/v4.8.70_wmh' of qmx/jy into feature/v4.8.70

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -525,11 +525,11 @@
             $.ajax({
         type: 'get',
         url: '/subscribepay/dataExportPack/screenList',
-        async:false,
+        async:sessionStorage.getItem('goScreen') != '1'?false:true,
         success: function (res) { 
           if(res.data && res.data.length > 0){
             $('.sc-num').text(res.data.length)
-            if(sessionStorage.getItem('goScreen') == '2'){
+            if(sessionStorage.getItem('goScreen') != '1'){ // 非设置筛选条件相关的页面回来使用接口数据回显
                 localStorage.removeItem('date') 
             localStorage.removeItem('areaHtml') 
             localStorage.removeItem('city') 

src/web/templates/weixin/dataExport/dataExport.html

@@ -545,11 +545,11 @@
            $.ajax({
         type: 'get',
         url: '/subscribepay/dataExportPack/screenList',
-        async:false,
+        async:sessionStorage.getItem('goScreen') != '1'?false:true,
         success: function (res) { 
           if(res.data && res.data.length > 0){
             $('.sc-num').text(res.data.length)
-            if(sessionStorage.getItem('goScreen') == '2'){
+            if(sessionStorage.getItem('goScreen') != '1'){
             localStorage.removeItem('date') 
             localStorage.removeItem('areaHtml') 
             localStorage.removeItem('city')