关键词一系列问题

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

@@ -128,33 +128,6 @@
             tokens = token;
         }else{
             tokens = token.split("_")[0];
-            window.onload = function(){
-                backListen();
-            };
-            // 监听浏览器回退事件
-            function backListen () {
-                if (window.history && window.history.pushState) {
-                    $(window).on('popstate', function () { // 点击后退会触发popstate事件
-                        var hashLocation = location.hash; // 获取点击后的页面的hash值
-                        var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
-                        var hashName = hashSplit[1]; // 取数组的第一个
-
-                        // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
-                        if (hashName !== '') {
-                            var hash = window.location.hash;
-                            if (hash === '') { // 如果当前页面没有哈希值
-
-                                sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
-
-                                // 强行回退一步，就不用多点一次了😎
-                                history.go(-1); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
-                            }
-                        }
-                    });
-                    // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
-                    window.history.pushState('forward', null, '#');
-                }
-            }
         }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
@@ -170,25 +143,27 @@
                         for(var y in appendedArr){
                             shtml +=
                                 `<li>
-                                        <div class="one">
-                                            <div>
-                                                <span>
-                                                    <p class="key">${ appendedArr[y] }</p>
-                                                </span>
-                                            </div>
-                                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                        </div>
-                                        <div class="modify">
-                                            <span class="ios-user-select" contentEditable="true">${ appendedArr[y] }</span>
-                                            <button class="deleteKey">删除</button>
-                                            <button class="ascertainKey">确定</button>
+                                    <div class="one">
+                                        <div>
+                                            <span>
+                                                <p class="key">${ appendedArr[y] }</p>
+                                            </span>
                                         </div>
-                                    </li>`
+                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                                    </div>
+                                    <div class="modify">
+                                        <span class="ios-user-select" contentEditable="true">${ appendedArr[y] }</span>
+                                        <button class="deleteKey">删除</button>
+                                        <button class="ascertainKey">确定</button>
+                                    </div>
+                                </li>`
                         }
                     }
                 }
             }
             $('.showKeyWord > ul').prepend(shtml);
+            $(".enter.addKeyWord").hide();
+            $(".showKeyWord").show();
         }else{
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
                 var keyWord = localStorage.keyWord;
@@ -203,20 +178,20 @@
                             for(var m in appendeds){
                                 html +=
                                     `<li>
-                                <div class="one">
-                                    <div>
-                                        <span>
-                                            <p class="key">${ appendeds[m] }</p>
-                                        </span>
-                                    </div>
-                                    <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                </div>
-                                <div class="modify">
-                                    <span contentEditable="true">${ appendeds[m] }</span>
-                                    <button class="deleteKey">删除</button>
-                                    <button class="ascertainKey">确定</button>
+                            <div class="one">
+                                <div>
+                                    <span>
+                                        <p class="key">${ appendeds[m] }</p>
+                                    </span>
                                 </div>
-                            </li>`
+                                <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                            </div>
+                            <div class="modify">
+                                <span contentEditable="true">${ appendeds[m] }</span>
+                                <button class="deleteKey">删除</button>
+                                <button class="ascertainKey">确定</button>
+                            </div>
+                        </li>`
                             }
                         }
                     }
@@ -251,8 +226,12 @@
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
                 var keyWord = tokens;
-                sessionStorage.removeItem("keyWord");
-                window.location.href="/jyapp/front/dataExport/appendedInput?keyWord="+keyWord;
+                // sessionStorage.removeItem("keyWord");
+                if(token.indexOf("_in")===-1){
+                    window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord;
+                }else{
+                    window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord+"_in";
+                }
             });
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -280,7 +259,7 @@
             });
 
             // 添加 按钮的点击事件
-            $('.addkeyWord .btn .save').on('click', function(){
+            $('.addkeyWord .btn button').on('click', function(){
                 var appended = $('.addkeyWord input.enterOne').val();
                 if(appendedArr===undefined){
                     appendedArr = [];
@@ -308,22 +287,22 @@
                     }
                 }
                 sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
+                // localStorage.keyWord = JSON.stringify(keyWordArr);
                 var html = `<li>
-                                    <div class="one">
-                                        <div>
-                                            <span>
-                                                <p class="key">${ appended }</p>
-                                            </span>
-                                        </div>
-                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                    </div>
-                                    <div class="modify">
-                                        <span contentEditable="true">${ appended }</span>
-                                        <button class="deleteKey">删除</button>
-                                        <button class="ascertainKey">确定</button>
+                                <div class="one">
+                                    <div>
+                                        <span>
+                                            <p class="key">${ appended }</p>
+                                        </span>
                                     </div>
-                                </li>`;
+                                    <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                                </div>
+                                <div class="modify">
+                                    <span contentEditable="true">${ appended }</span>
+                                    <button class="deleteKey">删除</button>
+                                    <button class="ascertainKey">确定</button>
+                                </div>
+                            </li>`;
                 $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
@@ -335,6 +314,7 @@
                 buttonDOM.style.opacity = .5;
                 buttonDOM.setAttribute("disabled", true)
             });
+
             // 编辑
             $(".showKeyWord").on('click', '.editKeyWord',function(e){
                 $('.modify span').each(function(item){
@@ -344,6 +324,8 @@
                 // console.log($(this).parent().siblings().find('span').text())
                 $(this).parent().hide();
                 $(this).parent().siblings().css('display','block')
+                //
+                $(".addKeyWord").hide();
             });
 
             // 编辑 删除
@@ -356,9 +338,10 @@
                     }
                 }
                 sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
+                // localStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
-                hasWords()
+                $(".addKeyWord").show();
+                hasWords();
                 // console.log('删除附加词:',$(this).parent().find('span').text())
             });
             // 编辑 确定
@@ -375,14 +358,13 @@
                         }
                     });
                     return
-                }else if(appended.length >= 20){
-                    var s = $(this).siblings('span').text().slice(0,19);
-                    $(this).siblings('span').text(s);
-
+                }else if($(this).parent().find("span").text().length >= 20){
+                    var s = $(this).parent().find("span").text().slice(0,19);
+                    $(this).parent().find("span").text(s);
                     weui.toast('附加词不能超过20字', {
                         duration: 2000,
                         className: 'text-overflow100',
-                        callback: function(){ console.log('close') }
+                        callback: function(){}
                     });
                     return
                 }else{
@@ -397,10 +379,12 @@
                         }
                     }
                     sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                    localStorage.keyWord = JSON.stringify(keyWordArr);
+                    // localStorage.keyWord = JSON.stringify(keyWordArr);
                     $(this).parent().siblings().find('.key').text(appended);
                     $(this).parent().hide().siblings().show()
                 }
+                //
+                $(".addKeyWord").show();
             });
 
             //去空格方法
@@ -412,11 +396,11 @@
             $('.modify span').keydown(function(){
                 var olength = $(this).text().replace(/\s+/g,'').length;
                 // console.log(olength)
-                if(olength >= 100){
+                if(olength >= 20){
                     $('.fontLength').show();
-                    var s = $(this).text().slice(0,100);
+                    var s = $(this).text().slice(0,19);
                     $(this).text(s);
-                    weui.toast('附加词不能超过100字', {
+                    weui.toast('附加词不能超过20字', {
                         duration: 2000,
                         className: 'text-overflow100',
                         callback: function(){ console.log('close') }
@@ -427,9 +411,6 @@
             $('.addkeyWord .btn .close').on('click', function () {
                 window.history.back();
             });
-            $(".app-back").on("click", function () {
-                history.back();
-            });
             function keepLastIndex(obj) {
                 if (window.getSelection) {//ie11 10 9 ff safari
                     obj.focus(); //解决ff不获取焦点无法定位问题
@@ -444,7 +425,10 @@
                     range.select();
                 }
             }
-        })
+        });
+        $(".app-back").on("click", function () {
+            history.back();
+        });
 
     </script>
 </body>

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

@@ -102,6 +102,12 @@
         var appendedArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        var tokens = "";
+        if(token.indexOf("_in")===-1){
+            tokens = token;
+        }else{
+            tokens = token.split("_")[0];
+        }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -119,7 +125,7 @@
             for(var i in keyWordArr) {
                 var keyWords = keyWordArr[i].keyWord;
                 var appendeds = keyWordArr[i].appended;
-                if (keyWords === token) {
+                if (keyWords === tokens) {
                     appendedArr = appendeds;
                 }
             }
@@ -136,11 +142,11 @@
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
             $('.addkeyWord input.enterOne').on('input', function() {
-                if ($(this).val().length >= 100) {
-                    var s = $(this).val().slice(0,99);
+                if ($(this).val().length >= 20) {
+                    var s = $(this).val().slice(0,19);
                     $(this).val(s);
 
-                    weui.toast('附加词不能超过100字', {
+                    weui.toast('附加词不能超过20字', {
                         duration: 2000,
                         className: 'text-overflow100',
                         callback: function(){ console.log('close') }
@@ -176,28 +182,34 @@
                 }
                 appendedArr.push(appended);
                 for(var i in keyWordArr){
-                    if(keyWordArr[i].keyWord === token){
+                    if(keyWordArr[i].keyWord === tokens){
                         keyWordArr[i].appended = appendedArr
                     }
                 }
                 if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
                     for(var m in keyWordsArr){
-                        if(keyWordsArr[m].keyWord === token){
+                        if(keyWordsArr[m].keyWord === tokens){
                             keyWordsArr[m].appended = appendedArr
                         }
                     }
-                    keyWordArr.push(keyWordsArr[0]);
-                    for (var x = 0; x < keyWordArr.length; x++) {
-                        for (var j =x+1; j <keyWordArr.length; ) {
-                            if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
-                                keyWordArr.splice(j, 1);
-                            }
-                            else j++;
-                        }
-                    }
+                    // alert(JSON.stringify(keyWordsArr));
+                    // alert(JSON.stringify(keyWordsArr.pop()));
+                    // alert(JSON.stringify(keyWordArr));
+                    // keyWordArr.push(keyWordsArr.pop());
+                    // alert(JSON.stringify(keyWordArr));
+                    // for (var x = 0; x < keyWordArr.length; x++) {
+                    //     for (var j =x+1; j <keyWordArr.length; ) {
+                    //         if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
+                    //             keyWordArr.splice(j, 1);
+                    //         }
+                    //         else j++;
+                    //     }
+                    // }
+                }
+                sessionStorage.keyWord = JSON.stringify(keyWordsArr);
+                if(token.indexOf("_in")===-1){
+                    localStorage.keyWord = JSON.stringify(keyWordArr);
                 }
-                sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
                 window.history.back();
             });
 
@@ -225,10 +237,10 @@
             $('.addkeyWord .btn .close').on('click', function () {
                 window.history.back();
             });
-            $(".app-back").on("click", function () {
-                history.back();
-            });
-        })
+        });
+        $(".app-back").on("click", function () {
+            history.back();
+        });
 
     </script>
 <!--百度统计end-->

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

@@ -128,33 +128,6 @@
             tokens = token;
         }else{
             tokens = token.split("_")[0];
-            window.onload = function(){
-                backListen();
-            };
-            // 监听浏览器回退事件
-            function backListen () {
-                if (window.history && window.history.pushState) {
-                    $(window).on('popstate', function () { // 点击后退会触发popstate事件
-                        var hashLocation = location.hash; // 获取点击后的页面的hash值
-                        var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
-                        var hashName = hashSplit[1]; // 取数组的第一个
-
-                        // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
-                        if (hashName !== '') {
-                            var hash = window.location.hash;
-                            if (hash === '') { // 如果当前页面没有哈希值
-
-                                sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
-
-                                // 强行回退一步，就不用多点一次了😎
-                                history.go(-1); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
-                            }
-                        }
-                    });
-                    // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
-                    window.history.pushState('forward', null, '#');
-                }
-            }
         }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
@@ -170,25 +143,27 @@
                         for(var y in excludeArr){
                             shtml +=
                                 `<li>
-                                    <div class="one">
-                                        <div>
-                                            <span>
-                                                <p class="key">${ excludeArr[y] }</p>
-                                            </span>
-                                        </div>
-                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                    </div>
-                                    <div class="modify">
-                                        <span class="ios-user-select" contentEditable="true">${ excludeArr[y] }</spanclass>
-                                        <button class="deleteKey">删除</button>
-                                        <button class="ascertainKey">确定</button>
+                                <div class="one">
+                                    <div>
+                                        <span>
+                                            <p class="key">${ excludeArr[y] }</p>
+                                        </span>
                                     </div>
-                                </li>`
+                                    <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                                </div>
+                                <div class="modify">
+                                    <span class="ios-user-select" contentEditable="true">${ excludeArr[y] }</span>
+                                    <button class="deleteKey">删除</button>
+                                    <button class="ascertainKey">确定</button>
+                                </div>
+                            </li>`
                         }
                     }
                 }
             }
             $('.showKeyWord > ul').prepend(shtml);
+            $(".enter.addKeyWord").hide();
+            $(".showKeyWord").show();
         }else{
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
                 var keyWord = localStorage.keyWord;
@@ -203,20 +178,20 @@
                             for(var m in excludes){
                                 html +=
                                     `<li>
-                                    <div class="one">
-                                        <div>
-                                            <span>
-                                                <p class="key">${ excludes[m] }</p>
-                                            </span>
-                                        </div>
-                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                    </div>
-                                    <div class="modify">
-                                        <span contentEditable="true">${ excludes[m] }</span>
-                                        <button class="deleteKey">删除</button>
-                                        <button class="ascertainKey">确定</button>
+                                <div class="one">
+                                    <div>
+                                        <span>
+                                            <p class="key">${ excludes[m] }</p>
+                                        </span>
                                     </div>
-                                </li>`
+                                    <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                                </div>
+                                <div class="modify">
+                                    <span contentEditable="true">${ excludes[m] }</span>
+                                    <button class="deleteKey">删除</button>
+                                    <button class="ascertainKey">确定</button>
+                                </div>
+                            </li>`
                             }
                         }
                     }
@@ -251,8 +226,12 @@
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
                 var keyWord = tokens;
-                sessionStorage.removeItem("keyWord");
-                window.location.href="/jyapp/front/dataExport/excludeInput?keyWord="+keyWord;
+                // sessionStorage.removeItem("keyWord");
+                if(token.indexOf("_in")===-1){
+                    window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord;
+                }else{
+                    window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord+"_in";
+                }
             });
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -280,7 +259,7 @@
             });
 
             // 添加 按钮的点击事件
-            $('.addkeyWord .btn .save').on('click', function(){
+            $('.addkeyWord .btn button').on('click', function(){
                 var exclude = $('.addkeyWord input.enterOne').val();
                 if(excludeArr===undefined){
                     excludeArr = [];
@@ -307,23 +286,23 @@
                         }
                     }
                 }
-                localStorage.keyWord = JSON.stringify(keyWordArr);
+                // localStorage.keyWord = JSON.stringify(keyWordArr);
                 sessionStorage.keyWord = JSON.stringify(keyWordsArr);
                 var html = `<li>
-                                        <div class="one">
-                                            <div>
-                                                <span>
-                                                    <p class="key">${ exclude }</p>
-                                                </span>
-                                            </div>
-                                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                                        </div>
-                                        <div class="modify">
-                                            <span contentEditable="true">${ exclude }</span>
-                                            <button class="deleteKey">删除</button>
-                                            <button class="ascertainKey">确定</button>
+                                    <div class="one">
+                                        <div>
+                                            <span>
+                                                <p class="key">${ exclude }</p>
+                                            </span>
                                         </div>
-                                    </li>`;
+                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                                    </div>
+                                    <div class="modify">
+                                        <span contentEditable="true">${ exclude }</span>
+                                        <button class="deleteKey">删除</button>
+                                        <button class="ascertainKey">确定</button>
+                                    </div>
+                                </li>`;
                 $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
@@ -341,10 +320,11 @@
                 $('.modify span').each(function(item){
                     $('.modify span')[0].contentEditable = true
                 });
-                keepLastIndex(e.target);
+                keepLastIndex(e.target)
                 // console.log($(this).parent().siblings().find('span').text())
                 $(this).parent().hide();
-                $(this).parent().siblings().css('display','block')
+                $(this).parent().siblings().css('display','block');
+                $(".addKeyWord").hide();
             });
 
             // 编辑 删除
@@ -356,9 +336,10 @@
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
-                localStorage.keyWord = JSON.stringify(keyWordArr);
+                // localStorage.keyWord = JSON.stringify(keyWordArr);
                 sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
+                $(".addKeyWord").show();
                 hasWords()
                 // console.log('删除附加词:',$(this).parent().find('span').text())
             })
@@ -396,12 +377,12 @@
                             keyWordArr[m].exclude = excludeArr
                         }
                     }
-                    localStorage.keyWord = JSON.stringify(keyWordArr);
+                    // localStorage.keyWord = JSON.stringify(keyWordArr);
                     sessionStorage.keyWord = JSON.stringify(keyWordArr);
                     $(this).parent().siblings().find('.key').text(exclude);
                     $(this).parent().hide().siblings().show()
                 }
-
+                $(".addKeyWord").show();
             });
 
             //去空格方法
@@ -413,11 +394,11 @@
             $('.modify span').keydown(function(){
                 var olength = $(this).text().replace(/\s+/g,'').length;
                 // console.log(olength)
-                if(olength >= 100){
+                if(olength >= 20){
                     $('.fontLength').show();
-                    var s = $(this).text().slice(0,100);
+                    var s = $(this).text().slice(0,19);
                     $(this).text(s);
-                    weui.toast('附加词不能超过100字', {
+                    weui.toast('排除词不能超过20字', {
                         duration: 2000,
                         className: 'text-overflow100',
                         callback: function(){ console.log('close') }
@@ -426,10 +407,7 @@
             });
 
             $('.addkeyWord .btn .close').on('click', function () {
-                history.back();
-            });
-            $(".app-back").on("click", function () {
-                history.back();
+                window.history.back();
             });
             function keepLastIndex(obj) {
                 if (window.getSelection) {//ie11 10 9 ff safari
@@ -446,6 +424,9 @@
                 }
             }
         })
+        $(".app-back").on("click", function () {
+            history.back();
+        });
 
     </script>
 <!--百度统计end-->

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

@@ -114,6 +114,12 @@
         var excludeArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        var tokens = "";
+        if(token.indexOf("_in")===-1){
+            tokens = token;
+        }else{
+            tokens = token.split("_")[0];
+        }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -131,7 +137,7 @@
             for(var i in keyWordArr){
                 var keyWords = keyWordArr[i].keyWord;
                 var excludes = keyWordArr[i].exclude;
-                if(keyWords === token){
+                if(keyWords === tokens){
                     excludeArr = excludes;
                 }
             }
@@ -171,7 +177,7 @@
             });
 
             // 添加 按钮的点击事件
-            $('.addkeyWord .btn .save').on('click', function(){
+            $('.addkeyWord .btn button').on('click', function(){
                 var exclude = $('.addkeyWord input.enterOne').val();
                 if(excludeArr===undefined){
                     excludeArr = [];
@@ -188,28 +194,30 @@
                 }
                 excludeArr.push(exclude);
                 for(var i in keyWordArr){
-                    if(keyWordArr[i].keyWord === token){
+                    if(keyWordArr[i].keyWord === tokens){
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
                 if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
                     for(var m in keyWordsArr){
-                        if(keyWordsArr[m].keyWord === token){
+                        if(keyWordsArr[m].keyWord === tokens){
                             keyWordsArr[m].exclude = excludeArr
                         }
                     }
-                    keyWordArr.push(keyWordsArr[0]);
-                    for (var x = 0; x < keyWordArr.length; x++) {
-                        for (var j =x+1; j <keyWordArr.length; ) {
-                            if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
-                                keyWordArr.splice(j, 1);
-                            }
-                            else j++;
-                        }
-                    }
+                    // keyWordArr.push(keyWordsArr[0]);
+                    // for (var x = 0; x < keyWordArr.length; x++) {
+                    //     for (var j =x+1; j <keyWordArr.length; ) {
+                    //         if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
+                    //             keyWordArr.splice(j, 1);
+                    //         }
+                    //         else j++;
+                    //     }
+                    // }
+                }
+                sessionStorage.keyWord = JSON.stringify(keyWordsArr);
+                if(token.indexOf("_in")===-1){
+                    localStorage.keyWord = JSON.stringify(keyWordArr);
                 }
-                sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
                 window.history.back();
             });
 
@@ -237,10 +245,10 @@
             $('.addkeyWord .btn .close').on('click', function () {
                 window.history.back();
             });
-            $(".app-back").on("click", function () {
-                history.back();
-            });
         })
+        $(".app-back").on("click", function () {
+            history.back();
+        });
 
     </script>
 <!--百度统计end-->

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

@@ -250,6 +250,42 @@
             }
             $('.showKeyWord > ul').prepend(keyWordHtml);
             //
+
+        }
+        //
+        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+            var turn = $('.addkeyWord input.enterOne').val();
+            var keys = JSON.parse(sessionStorage.keyWord);
+            for(var a in keys){
+                if (keys[a].keyWord === turn){
+                    $(".btnChoose").show();
+                    //数量
+                    var str = "";
+                    var strs = "";
+                    if(keys[a].appended !== undefined){
+                        var appended = keys[a].appended.length;
+                        if(appended < 1){
+                            str =  "添加 附加词";
+                        }else{
+                            str = "编辑 附加词 ("+appended+")";
+                        }
+                    }else{
+                        str =  "添加 附加词";
+                    }
+                    $(".addAdjunctWord").text(str);
+                    if(keys[a].exclude !== undefined){
+                        var exclude =keys[a].exclude.length;
+                        if(exclude < 1){
+                            strs = "添加 排除词";
+                        }else{
+                            strs = "编辑 排除词 ("+exclude+")";
+                        }
+                    }else{
+                        strs = "添加 排除词";
+                    }
+                    $(".addExclusion").text(strs);
+                }
+            }
         }
         //
         if($(".enterOne").val()!==""){
@@ -258,40 +294,58 @@
             $('.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');
             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 = "/jyapp/front/dataExport/appended?keyWord="+keyWord;
+            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
+                }
+            }
+            //
             var obj = [{"keyWord":keyWord}];
             sessionStorage.keyWord = JSON.stringify(obj);
-            window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord;
+            window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
         });
         //
         $(".showKeyWord").on('click', '.addAdjunctWord',function(e){
             var keyWord = $(this).parent().prev().find('.key').text();
             sessionStorage.removeItem("keyWord");
-            window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord;
+            window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord;
         });
         $(".showKeyWord").on('click', '.addExclusion',function(e){
             var keyWord = $(this).parent().prev().find('.key').text();
             sessionStorage.removeItem("keyWord");
-            window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord;
+            window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
         });
 
         $('.addkeyWord .btn .close').on('click', function () {
-            history.back();
-        });
-        //
-        $(".app-back").on("click", function () {
-            history.back();
+            window.history.back();
         });
         //
         $(".showKeyWord ul li .one").each(function () {
@@ -304,6 +358,9 @@
                 $(this).children().find("p.exclusion").parent().remove();
             }
         });
+        $(".app-back").on("click", function () {
+            history.back();
+        });
 
     </script>
 <!--百度统计end-->

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

@@ -118,17 +118,18 @@
         $(".problem").on('click', function () {
             $(".problemPop").css("display", 'flex');
         });
-
         // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
-        $('.addkeyWord input.enterOne').on('input', function() {
+        $('.addkeyWord input.enterOne').on('input', function () {
             if ($(this).val().length >= 20) {
-                var s = $(this).val().slice(0,19);
+                var s = $(this).val().slice(0, 19)
                 $(this).val(s)
 
                 weui.toast('关键词不能超过20字', {
                     duration: 2000,
                     className: 'text-overflow100',
-                    callback: function(){ console.log('close') }
+                    callback: function () {
+                        console.log('close')
+                    }
                 });
                 return
             }
@@ -153,6 +154,29 @@
         $('.addkeyWord .btn .save').on('click', function () {
             var keyWord = $('.addkeyWord input.enterOne').val();
             var Obj = {"keyWord": keyWord};
+            //
+            if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined) {
+                var keys = JSON.parse(sessionStorage.keyWord);
+                for (var i in keys) {
+                    if (keys[i].keyWord === keyWord) {
+                        for (var a in keyWordArr){
+                            if (keyWord === keyWordArr[a].keyWord){
+                                weui.toast('关键词重复了', {
+                                    duration: 2000,
+                                    className: 'text-overflow100',
+                                    callback: function(){}
+                                });
+                                return
+                            }
+                        }
+                        keyWordArr.push(keys[i]);
+                        localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+                        window.history.back();
+                        return
+                    }
+                }
+            }
+            //
             for (var a in keyWordArr){
                 if (keyWord === keyWordArr[a].keyWord){
                     weui.toast('关键词重复了', {
@@ -196,6 +220,42 @@
         })
     });
 
+    if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+        var turn = $('.addkeyWord input.enterOne').val();
+        var keys = JSON.parse(sessionStorage.keyWord);
+        for(var a in keys){
+            if (keys[a].keyWord === turn){
+                $(".btnChoose").show();
+                //数量
+                var str = "";
+                var strs = "";
+                if(keys[a].appended !== undefined){
+                    var appended = keys[a].appended.length;
+                    if(appended < 1){
+                        str =  "添加 附加词";
+                    }else{
+                        str = "编辑 附加词 ("+appended+")";
+                    }
+                }else{
+                    str =  "添加 附加词";
+                }
+                $(".addAdjunctWord").text(str);
+                if(keys[a].exclude !== undefined){
+                    var exclude =keys[a].exclude.length;
+                    if(exclude < 1){
+                        strs = "添加 排除词";
+                    }else{
+                        strs = "编辑 排除词 ("+exclude+")";
+                    }
+                }else{
+                    strs = "添加 排除词";
+                }
+                $(".addExclusion").text(strs);
+            }
+        }
+    }
+
+
     if($(".enterOne").val()!==""){
         $('.enter.addkeyWord .btnChoose .appended').prop("disabled", false);
         $('.enter.addkeyWord .btnChoose .exclude').prop("disabled", false);
@@ -208,7 +268,7 @@
         buttonDOM.prop("disabled", true);
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/jyapp/front/dataExport/appended?keyWord="+keyWord+"_in";
+        window.location.href = "/front/wx_dataExport/appended?keyWord="+keyWord+"_in";
     });
     $(".exclude").on('click', function () {
         var keyWord = $(this).parent().prev().val();
@@ -216,7 +276,7 @@
         buttonDOM.prop("disabled", true);
         var obj = [{"keyWord":keyWord}];
         sessionStorage.keyWord = JSON.stringify(obj);
-        window.location.href = "/jyapp/front/dataExport/exclude?keyWord="+keyWord+"_in";
+        window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord+"_in";
     });
     $(".app-back").on("click", function () {
         history.back();

src/web/staticres/wx_dataExport/js/keyWord.js

@@ -73,39 +73,142 @@ $(function(){
     // 添加 按钮的点击事件
     $('.addkeyWord .btn .save').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
-        var Obj = {"keyWord": keyWord};
-        keyWordArr.push(Obj);
-        localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
-        var html = `<li>
+        var keyWordHtml = "";
+        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+            var keys = JSON.parse(sessionStorage.keyWord);
+            for(var i in keys){
+                var append = keys[i].appended;
+                var exclude = keys[i].exclude;
+                if(keys[i].keyWord === keyWord){
+                    keyWordArr.push(keys[i]);
+                    localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+                    //
+                    if(append !== undefined && exclude === undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 附加词：</strong>
+                                    <p class="addition">${ append }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                    }else if(append === undefined && exclude !== undefined){
+                        keyWordHtml += `
+                    <li>
                         <div class="one">
                             <div>
                                 <span>
                                     <strong> 关键词：</strong>
-                                    <p class="key">${ keyWord }</p>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 排除词：</strong>
+                                    <p class="exclusion">${ exclude }</p>
                                 </span>
                             </div>
                             <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                         </div>
                         <div class="modify">
-                            <span contentEditable="true">${ keyWord }</span>
+                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
                             <button class="addAdjunctWord">编辑 附加词</button>
                             <button class="addExclusion">添加 排除词</button>
                             <button class="deleteKey">删除</button>
                             <button class="ascertainKey">确定</button>
                         </div>
-                    </li>`
+                    </li>`;
+                    }else if(append !== undefined && exclude !== undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                                <span>
+                                    <strong> 附加词：</strong>
+                                    <p class="addition">${ append }</p>
+                                </span>
+                                <span>
+                                    <strong> 排除词：</strong>
+                                    <p class="exclusion">${ exclude }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                    }else if(append === undefined && exclude === undefined){
+                        keyWordHtml += `
+                    <li>
+                        <div class="one">
+                            <div>
+                                <span>
+                                    <strong> 关键词：</strong>
+                                    <p class="key">${ keys[i].keyWord }</p>
+                                </span>
+                            </div>
+                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                        </div>
+                        <div class="modify">
+                            <span class="ios-user-select" contentEditable="true">${ keys[i].keyWord }</span>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
+                        </div>
+                    </li>`;
+                    }
+                    keyWordHtml = keyWordHtml.replace(/,/g, " ");
+                    //
+                    $('.showKeyWord > ul').prepend(keyWordHtml);
+                    // 隐藏
+                    $(".enter.addkeyWord").hide();
+                    $(".showKeyWord").show();
+                    $(".addKeyWord").show();
+                    $('.enter.addkeyWord > input').val('');
+                    var buttonDOM = $('.enter.addkeyWord .btn button')[0];
+                    buttonDOM.style.opacity = .5;
+                    buttonDOM.setAttribute("disabled", true);
+                    return
+                }
+            }
+        }
+        var Obj = {"keyWord": keyWord};
+        keyWordArr.push(Obj);
+        localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
         $('.showKeyWord > ul').prepend(html);
-        
         // 隐藏
         $(".enter.addkeyWord").hide();
         $(".showKeyWord").show();
         $(".addKeyWord").show();
-        $('.enter.addkeyWord > input').val('')
-        var buttonDOM = $('.enter.addkeyWord .btn button')[0]
-        buttonDOM.style.opacity = .5
-        buttonDOM.setAttribute("disabled", true)
+        $('.enter.addkeyWord > input').val('');
+        var buttonDOM = $('.enter.addkeyWord .btn button')[0];
+        buttonDOM.style.opacity = .5;
+        buttonDOM.setAttribute("disabled", true);
 
-    })
+    });
 
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord',function(e){
@@ -164,6 +267,7 @@ $(function(){
                     keyWordArr = keyWordArr.filter((e=>{return e.keyWord!==keyWord}));
                     localStorage.keyWord = JSON.stringify(keyWordArr);
                     jQueryDOM.remove();
+                    sessionStorage.removeItem("keyWord");
                     $(".addKeyWord").show();
                     hasWords()
                 }

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

@@ -101,32 +101,6 @@
             tokens = token;
         }else{
             tokens = token.split("_")[0];
-            window.onload = function(){
-                backListen();
-            };
-            // 监听浏览器回退事件
-            function backListen () {
-                if (window.history && window.history.pushState) {
-                    $(window).on('popstate', function () { // 点击后退会触发popstate事件
-                        var hashLocation = location.hash; // 获取点击后的页面的hash值
-                        var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
-                        var hashName = hashSplit[1]; // 取数组的第一个
-
-                        // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
-                        if (hashName !== '') {
-                            var hash = window.location.hash;
-                            if (hash === '') { // 如果当前页面没有哈希值
-
-                                sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
-
-                                history.go(-1);
-                            }
-                        }
-                    });
-                    // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
-                    window.history.pushState('forward', null, '#');
-                }
-            }
         }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
@@ -161,6 +135,8 @@
                 }
             }
             $('.showKeyWord > ul').prepend(shtml);
+            $(".enter.addKeyWord").hide();
+            $(".showKeyWord").show();
         }else{
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
                 var keyWord = localStorage.keyWord;
@@ -223,8 +199,12 @@
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
                 var keyWord = tokens;
-                sessionStorage.removeItem("keyWord");
-                window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord;
+                // sessionStorage.removeItem("keyWord");
+                if(token.indexOf("_in")===-1){
+                    window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord;
+                }else{
+                    window.location.href="/front/wx_dataExport/appendedInput?keyWord="+keyWord+"_in";
+                }
             });
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -280,7 +260,7 @@
                     }
                 }
                 sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
+                // localStorage.keyWord = JSON.stringify(keyWordArr);
                 var html = `<li>
                                 <div class="one">
                                     <div>
@@ -331,7 +311,7 @@
                     }
                 }
                 sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
+                // localStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
                 $(".addKeyWord").show();
                 hasWords();
@@ -372,7 +352,7 @@
                         }
                     }
                     sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                    localStorage.keyWord = JSON.stringify(keyWordArr);
+                    // localStorage.keyWord = JSON.stringify(keyWordArr);
                     $(this).parent().siblings().find('.key').text(appended);
                     $(this).parent().hide().siblings().show()
                 }

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

@@ -67,11 +67,18 @@
         <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
+        initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];
         var keyWordsArr = [];
         var appendedArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        var tokens = "";
+        if(token.indexOf("_in")===-1){
+            tokens = token;
+        }else{
+            tokens = token.split("_")[0];
+        }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -89,7 +96,7 @@
             for(var i in keyWordArr) {
                 var keyWords = keyWordArr[i].keyWord;
                 var appendeds = keyWordArr[i].appended;
-                if (keyWords === token) {
+                if (keyWords === tokens) {
                     appendedArr = appendeds;
                 }
             }
@@ -146,28 +153,34 @@
                 }
                 appendedArr.push(appended);
                 for(var i in keyWordArr){
-                    if(keyWordArr[i].keyWord === token){
+                    if(keyWordArr[i].keyWord === tokens){
                         keyWordArr[i].appended = appendedArr
                     }
                 }
                 if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
                     for(var m in keyWordsArr){
-                        if(keyWordsArr[m].keyWord === token){
+                        if(keyWordsArr[m].keyWord === tokens){
                             keyWordsArr[m].appended = appendedArr
                         }
                     }
-                    keyWordArr.push(keyWordsArr[0]);
-                    for (var x = 0; x < keyWordArr.length; x++) {
-                        for (var j =x+1; j <keyWordArr.length; ) {
-                            if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
-                                keyWordArr.splice(j, 1);
-                            }
-                            else j++;
-                        }
-                    }
+                    // alert(JSON.stringify(keyWordsArr));
+                    // alert(JSON.stringify(keyWordsArr.pop()));
+                    // alert(JSON.stringify(keyWordArr));
+                    // keyWordArr.push(keyWordsArr.pop());
+                    // alert(JSON.stringify(keyWordArr));
+                    // for (var x = 0; x < keyWordArr.length; x++) {
+                    //     for (var j =x+1; j <keyWordArr.length; ) {
+                    //         if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
+                    //             keyWordArr.splice(j, 1);
+                    //         }
+                    //         else j++;
+                    //     }
+                    // }
+                }
+                sessionStorage.keyWord = JSON.stringify(keyWordsArr);
+                if(token.indexOf("_in")===-1){
+                    localStorage.keyWord = JSON.stringify(keyWordArr);
                 }
-                sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
                 window.history.back();
             });
 

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

@@ -101,33 +101,6 @@
             tokens = token;
         }else{
             tokens = token.split("_")[0];
-            window.onload = function(){
-                backListen();
-            };
-        }
-        // 监听浏览器回退事件
-        function backListen () {
-            if (window.history && window.history.pushState) {
-                $(window).on('popstate', function () { // 点击后退会触发popstate事件
-                    var hashLocation = location.hash; // 获取点击后的页面的hash值
-                    var hashSplit = hashLocation.split("#!/"); // 将哈希值装进数组（这里可以在控制台打印看效果）
-                    var hashName = hashSplit[1]; // 取数组的第一个
-
-                    // 点击后的页面哈希值与上一个页面不同，借助这个区别可以判断是否离开了页面，从而做一些操作
-                    if (hashName !== '') {
-                        var hash = window.location.hash;
-                        if (hash === '') { // 如果当前页面没有哈希值
-
-                            sessionStorage.removeItem("flag"); // 这里我做了清除sessionStorage的操作
-
-                            // 强行回退一步，就不用多点一次了😎
-                            history.go(-1); // 直接跳过没有哈希值的页面，就不会出现要点两次才能回到真正的上一页了
-                        }
-                    }
-                });
-                // 将含有哈希值的页面，强行插入浏览器历史记录中，此时相当于该页面有两个url在历史记录中，一个是有hash的，一个是没有hash的。
-                window.history.pushState('forward', null, '#');
-            }
         }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
@@ -162,6 +135,8 @@
                 }
             }
             $('.showKeyWord > ul').prepend(shtml);
+            $(".enter.addKeyWord").hide();
+            $(".showKeyWord").show();
         }else{
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
                 var keyWord = localStorage.keyWord;
@@ -224,8 +199,12 @@
             // 添加按钮
             $(".addKeyWord i").on('click',function(){
                 var keyWord = tokens;
-                sessionStorage.removeItem("keyWord");
-                window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord;
+                // sessionStorage.removeItem("keyWord");
+                if(token.indexOf("_in")===-1){
+                    window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord;
+                }else{
+                    window.location.href="/front/wx_dataExport/excludeInput?keyWord="+keyWord+"_in";
+                }
             });
 
             // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
@@ -280,7 +259,7 @@
                         }
                     }
                 }
-                localStorage.keyWord = JSON.stringify(keyWordArr);
+                // localStorage.keyWord = JSON.stringify(keyWordArr);
                 sessionStorage.keyWord = JSON.stringify(keyWordsArr);
                 var html = `<li>
                                     <div class="one">
@@ -330,7 +309,7 @@
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
-                localStorage.keyWord = JSON.stringify(keyWordArr);
+                // localStorage.keyWord = JSON.stringify(keyWordArr);
                 sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
                 $(".addKeyWord").show();
@@ -371,7 +350,7 @@
                             keyWordArr[m].exclude = excludeArr
                         }
                     }
-                    localStorage.keyWord = JSON.stringify(keyWordArr);
+                    // localStorage.keyWord = JSON.stringify(keyWordArr);
                     sessionStorage.keyWord = JSON.stringify(keyWordArr);
                     $(this).parent().siblings().find('.key').text(exclude);
                     $(this).parent().hide().siblings().show()

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

@@ -87,6 +87,12 @@
         var excludeArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
+        var tokens = "";
+        if(token.indexOf("_in")===-1){
+            tokens = token;
+        }else{
+            tokens = token.split("_")[0];
+        }
         //
         if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
             if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -104,7 +110,7 @@
             for(var i in keyWordArr){
                 var keyWords = keyWordArr[i].keyWord;
                 var excludes = keyWordArr[i].exclude;
-                if(keyWords === token){
+                if(keyWords === tokens){
                     excludeArr = excludes;
                 }
             }
@@ -161,28 +167,30 @@
                 }
                 excludeArr.push(exclude);
                 for(var i in keyWordArr){
-                    if(keyWordArr[i].keyWord === token){
+                    if(keyWordArr[i].keyWord === tokens){
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
                 if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
                     for(var m in keyWordsArr){
-                        if(keyWordsArr[m].keyWord === token){
+                        if(keyWordsArr[m].keyWord === tokens){
                             keyWordsArr[m].exclude = excludeArr
                         }
                     }
-                    keyWordArr.push(keyWordsArr[0]);
-                    for (var x = 0; x < keyWordArr.length; x++) {
-                        for (var j =x+1; j <keyWordArr.length; ) {
-                            if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
-                                keyWordArr.splice(j, 1);
-                            }
-                            else j++;
-                        }
-                    }
+                    // keyWordArr.push(keyWordsArr[0]);
+                    // for (var x = 0; x < keyWordArr.length; x++) {
+                    //     for (var j =x+1; j <keyWordArr.length; ) {
+                    //         if (keyWordArr[x].keyWord === keyWordArr[j].keyWord && keyWordArr[x].exclude === keyWordArr[j].exclude && keyWordArr[x].appended === keyWordArr[j].appended) {
+                    //             keyWordArr.splice(j, 1);
+                    //         }
+                    //         else j++;
+                    //     }
+                    // }
+                }
+                sessionStorage.keyWord = JSON.stringify(keyWordsArr);
+                if(token.indexOf("_in")===-1){
+                    localStorage.keyWord = JSON.stringify(keyWordArr);
                 }
-                sessionStorage.keyWord = JSON.stringify(keyWordArr);
-                localStorage.keyWord = JSON.stringify(keyWordArr);
                 window.history.back();
             });
 

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

@@ -112,7 +112,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}41"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}46"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         var keyWordArr = [];
@@ -226,7 +226,41 @@
             //
 
         }
-
+        //
+        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+            var turn = $('.addkeyWord input.enterOne').val();
+            var keys = JSON.parse(sessionStorage.keyWord);
+            for(var a in keys){
+                if (keys[a].keyWord === turn){
+                    $(".btnChoose").show();
+                    //数量
+                    var str = "";
+                    var strs = "";
+                    if(keys[a].appended !== undefined){
+                        var appended = keys[a].appended.length;
+                        if(appended < 1){
+                            str =  "添加 附加词";
+                        }else{
+                            str = "编辑 附加词 ("+appended+")";
+                        }
+                    }else{
+                        str =  "添加 附加词";
+                    }
+                    $(".addAdjunctWord").text(str);
+                    if(keys[a].exclude !== undefined){
+                        var exclude =keys[a].exclude.length;
+                        if(exclude < 1){
+                            strs = "添加 排除词";
+                        }else{
+                            strs = "编辑 排除词 ("+exclude+")";
+                        }
+                    }else{
+                        strs = "添加 排除词";
+                    }
+                    $(".addExclusion").text(strs);
+                }
+            }
+        }
         //
         if($(".enterOne").val()!==""){
             $('.enter.addkeyWord .btnChoose .appended').prop("disabled", false);
@@ -239,18 +273,38 @@
             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/appendedInput?keyWord="+keyWord;
+            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
+                }
+            }
+            //
             var obj = [{"keyWord":keyWord}];
             sessionStorage.keyWord = JSON.stringify(obj);
-            window.location.href = "/front/wx_dataExport/excludeInput?keyWord="+keyWord;
+            window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
         });
         //
         $(".showKeyWord").on('click', '.addAdjunctWord',function(e){

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

@@ -128,6 +128,29 @@
         $('.addkeyWord .btn .save').on('click', function () {
             var keyWord = $('.addkeyWord input.enterOne').val();
             var Obj = {"keyWord": keyWord};
+            //
+            if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined) {
+                var keys = JSON.parse(sessionStorage.keyWord);
+                for (var i in keys) {
+                    if (keys[i].keyWord === keyWord) {
+                        for (var a in keyWordArr){
+                            if (keyWord === keyWordArr[a].keyWord){
+                                weui.toast('关键词重复了', {
+                                    duration: 2000,
+                                    className: 'text-overflow100',
+                                    callback: function(){}
+                                });
+                                return
+                            }
+                        }
+                        keyWordArr.push(keys[i]);
+                        localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
+                        window.history.back();
+                        return
+                    }
+                }
+            }
+            //
             for (var a in keyWordArr){
                 if (keyWord === keyWordArr[a].keyWord){
                     weui.toast('关键词重复了', {
@@ -171,7 +194,40 @@
         })
     });
 
-
+    if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+        var turn = $('.addkeyWord input.enterOne').val();
+        var keys = JSON.parse(sessionStorage.keyWord);
+        for(var a in keys){
+            if (keys[a].keyWord === turn){
+                $(".btnChoose").show();
+                //数量
+                var str = "";
+                var strs = "";
+                if(keys[a].appended !== undefined){
+                    var appended = keys[a].appended.length;
+                    if(appended < 1){
+                        str =  "添加 附加词";
+                    }else{
+                        str = "编辑 附加词 ("+appended+")";
+                    }
+                }else{
+                    str =  "添加 附加词";
+                }
+                $(".addAdjunctWord").text(str);
+                if(keys[a].exclude !== undefined){
+                    var exclude =keys[a].exclude.length;
+                    if(exclude < 1){
+                        strs = "添加 排除词";
+                    }else{
+                        strs = "编辑 排除词 ("+exclude+")";
+                    }
+                }else{
+                    strs = "添加 排除词";
+                }
+                $(".addExclusion").text(strs);
+            }
+        }
+    }
 
 
     if($(".enterOne").val()!==""){