Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

src/jfw/modules/app/src/web/staticres/jyapp/dataExport/css/dataExport.css

@@ -50,7 +50,7 @@ html .page .progress .p-item .p-item-icon {
 }
 html .page .progress .p-item .p-item-icon i {
   color: #fff;
-  font-size: .11rem;
+  font-size: .25rem;
 }
 html .page .progress .p-item .icon-gray {
   background: #DCDADD;

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

@@ -8,7 +8,7 @@
     <title>数据导出</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/dataExport.css?v={{Msg "seo" "version"}}3">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/jyapp/dataExport/css/dataExport.css?v={{Msg "seo" "version"}}6">
     <link rel="stylesheet" type="text/css" href="/jyapp/css/font.css?v={{Msg "seo" "version"}}" />
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/js/jquery.js"></script>

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

@@ -228,9 +228,9 @@
                 var keyWord = tokens;
                 // sessionStorage.removeItem("keyWord");
                 if(token.indexOf("_in")===-1){
-                    window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord;
+                    window.location.href="/jyapp/front/dataExport/appendedInput?keyWord="+keyWord;
                 }else{
-                    window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord+"_in";
+                    window.location.href="/jyapp/front/dataExport/appendedInput?keyWord="+keyWord+"_in";
                 }
             });
 

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

@@ -228,9 +228,9 @@
                 var keyWord = tokens;
                 // sessionStorage.removeItem("keyWord");
                 if(token.indexOf("_in")===-1){
-                    window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord;
+                    window.location.href="/jyapp/front/dataExport/excludeInput?keyWord="+keyWord;
                 }else{
-                    window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord+"_in";
+                    window.location.href="/jyapp/front/dataExport/excludeInput?keyWord="+keyWord+"_in";
                 }
             });
 

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

@@ -271,7 +271,7 @@
             var keys = JSON.parse(sessionStorage.keyWord);
             for(var i in keys){
                 if(keys[i].keyWord===keyWord){
-                    window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
+                    window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord;
                     return
                 }
             }
@@ -279,7 +279,7 @@
         //
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
+        window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord;
     });
     $(".exclude").on('click', function () {
         var keyWord = $(this).parent().prev().val();
@@ -290,7 +290,7 @@
             var keys = JSON.parse(sessionStorage.keyWord);
             for(var i in keys){
                 if(keys[i].keyWord===keyWord){
-                    window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
+                    window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord;
                     return
                 }
             }
@@ -298,7 +298,7 @@
         //
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
+        window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord;
     });
     $(".app-back").on("click", function () {
         history.back();

src/web/staticres/wx_dataExport/css/dataExport.css

@@ -50,7 +50,7 @@ html .page .progress .p-item .p-item-icon {
 }
 html .page .progress .p-item .p-item-icon i {
   color: #fff;
-  font-size: .11rem;
+  font-size: .25rem;
 }
 html .page .progress .p-item .icon-gray {
   background: #DCDADD;

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

@@ -9,7 +9,7 @@
     <title>数据导出</title>
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}3">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/dataExport.css?v={{Msg "seo" "version"}}8">
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/rem.js?v={{Msg "seo" "version"}}"></script>
     {{include "/common/weixin.html"}}
     <script src="/js/jquery.js"></script>