瀏覽代碼

关键词

xuzhiheng 6 年之前
父節點
當前提交
423ec83c05

+ 7 - 7
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

@@ -294,7 +294,6 @@
             $('.enter.addkeyWord .btn > button').prop("disabled", false);
             $('.enter.addkeyWord .btn > button').css("opacity", 1);
         }
-        // $(".showKeyWord").on('click', '.append',function(e){
         $(".appended").on('click', function () {
             var keyWord = $(this).parent().prev().val();
             var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
@@ -314,17 +313,18 @@
             sessionStorage.keyWord = JSON.stringify(obj);
             window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
         });
-        // $(".showKeyWord").on('click', '.exclude',function(e){
         $(".exclude").on('click', function () {
             var keyWord = $(this).parent().prev().val();
             var buttonDOM = $('.enter.addkeyWord .btnChoose .exclude');
             buttonDOM.prop("disabled", true);
             //
-            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;
-                    return
+            if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+                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;
+                        return
+                    }
                 }
             }
             //

+ 24 - 2
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWordInput.html

@@ -266,17 +266,39 @@
         var keyWord = $(this).parent().prev().val();
         var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
         buttonDOM.prop("disabled", true);
+        //
+        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+            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;
+                    return
+                }
+            }
+        }
+        //
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord+"_in";
+        window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
     });
     $(".exclude").on('click', function () {
         var keyWord = $(this).parent().prev().val();
         var buttonDOM = $('.enter.addkeyWord .btnChoose .exclude');
         buttonDOM.prop("disabled", true);
+        //
+        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+            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;
+                    return
+                }
+            }
+        }
+        //
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord+"_in";
+        window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
     });
     $(".app-back").on("click", function () {
         history.back();

+ 7 - 7
src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -268,7 +268,6 @@
             $('.enter.addkeyWord .btn > button').prop("disabled", false);
             $('.enter.addkeyWord .btn > button').css("opacity", 1);
         }
-    // $(".showKeyWord").on('click', '.append',function(e){
         $(".appended").on('click', function () {
             var keyWord = $(this).parent().prev().val();
             var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
@@ -288,17 +287,18 @@
             sessionStorage.keyWord = JSON.stringify(obj);
             window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
         });
-        // $(".showKeyWord").on('click', '.exclude',function(e){
         $(".exclude").on('click', function () {
             var keyWord = $(this).parent().prev().val();
             var buttonDOM = $('.enter.addkeyWord .btnChoose .exclude');
             buttonDOM.prop("disabled", true);
             //
-            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;
-                    return
+            if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+                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;
+                        return
+                    }
                 }
             }
             //

+ 24 - 2
src/web/templates/weixin/dataExport/dataExport_keyWordInput.html

@@ -240,17 +240,39 @@
         var keyWord = $(this).parent().prev().val();
         var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
         buttonDOM.prop("disabled", true);
+        //
+        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+            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;
+                    return
+                }
+            }
+        }
+        //
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord+"_in";
+        window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
     });
     $(".exclude").on('click', function () {
         var keyWord = $(this).parent().prev().val();
         var buttonDOM = $('.enter.addkeyWord .btnChoose .exclude');
         buttonDOM.prop("disabled", true);
+        //
+        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+            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;
+                    return
+                }
+            }
+        }
+        //
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord+"_in";
+        window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
     });
 
 </script>