关键词优化

src/jfw/modules/app/src/config.json

@@ -6,7 +6,7 @@
     "influxdb": "jy_logs",
     "elasticsearch": "http://192.168.3.11:9800",
     "elasticPoolSize": 30,
-    "redisaddrs": "other=192.168.3.18:3379,push=192.168.3.18:3379,pushcache_1=192.168.3.18:2001,pushcache_2_a=192.168.3.18:2002,pushcache_2_b=192.168.3.18:2003,sso=192.168.3.18:3379,session=192.168.3.18:3379,recovery=192.168.3.18:3379",
+    "redisaddrs": "other=192.168.3.207:3379,push=192.168.3.207:3379,pushcache_1=192.168.3.207:2001,pushcache_2_a=192.168.3.207:2002,pushcache_2_b=192.168.3.207:2003,sso=192.168.3.207:3379,session=192.168.3.207:3379,recovery=192.168.3.207:3379",
     "webport": "89",
     "weixinrpc": "127.0.0.1:8083",
     "cassandra": {
@@ -32,7 +32,7 @@
         "passWord": "Topnet123"
     },
     "agreement": "http",
-    "webdomain": "http://web-jydev-ws.jianyu360.cn",
+    "webdomain": "http://web-jydev-xzh.jianyu360.cn",
     "redirect": {
         "wxpushlist": "/jyapp/wxpush/bidinfo/%s",
         "newInfoFollow": "/jyapp/followent/newInfo/%s",

src/jfw/modules/app/src/web/staticres/jyapp/wx_dataExport/js/keyWord.js

@@ -20,13 +20,14 @@ $(function(){
             $(".showKeyWord").show();
         }
     }
-    hasWords()
-    
+    hasWords();
+
     //添加按钮
     $(".addKeyWord i").on('click',function(){
         $(".addkeyWord").show();
         $(".showKeyWord").hide();
-    })
+        sessionStorage.removeItem("keyWord")
+    });
 
     // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
     $('.addkeyWord input.enterOne').on('input', function() {
@@ -42,16 +43,22 @@ $(function(){
             return
         }
 
-        var buttonDOM = $(this).siblings()[1].children[0]
+        var buttonDOM = $(this).siblings()[1].children[0];
         if ($(this).val().length >= 1) {
-            buttonDOM.style.opacity = 1
-            buttonDOM.removeAttribute("disabled")
+            buttonDOM.style.opacity = 1;
+            buttonDOM.removeAttribute("disabled");
+            //
+            $(this).next().find(".appended").prop("disabled", false);
+            $(this).next().find(".exclude").prop("disabled", false);
         } else {
-            buttonDOM.style.opacity = .5
-            buttonDOM.setAttribute("disabled", true)
+            buttonDOM.style.opacity = .5;
+            buttonDOM.setAttribute("disabled", true);
+            //
+            $(this).next().find(".appended").prop("disabled", true);
+            $(this).next().find(".exclude").prop("disabled", true);
         }
-    })
-    
+    });
+
     // $('.exclusion input.enterOne').on('input', function() {
     //     var buttonDOM = $(this).siblings().find('button')[0]
     //     if ($(this).val().length >= 1) {
@@ -62,7 +69,7 @@ $(function(){
     //         buttonDOM.setAttribute("disabled", true)
     //     }
     // })
-    
+
     // 添加 按钮的点击事件
     $('.addkeyWord .btn button').on('click', function(){
         var keyWord = $('.addkeyWord input.enterOne').val();
@@ -88,7 +95,7 @@ $(function(){
                         </div>
                     </li>`
         $('.showKeyWord > ul').prepend(html);
-        
+
         // 隐藏
         $(".addkeyWord").hide();
         $('.showKeyWord').show();
@@ -170,7 +177,7 @@ $(function(){
     //去空格方法
     String.prototype.trim = function(){
         return this.replace(/(^\s*)|(\s*$)/g, ' ');
-     }
+    }
 
     //关键词个数
     $('.modify span').keydown(function(){
@@ -194,5 +201,5 @@ $(function(){
     //     $('.exclusion').show();
     //     $('.showKeyWord').hide();
     // })
-    
+
 })

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

@@ -410,17 +410,17 @@
         });
         //回显
         //金额
-        if(localStorage.price){
+        if(localStorage.price!==undefined && localStorage.price!==""){
             var price = localStorage.price;
             $("#price").text(price);
         }
         //区域
-        if(localStorage.area){
+        if(localStorage.area!==undefined && localStorage.area!==""){
             var area = localStorage.area;
             $("#area").text(area);
         }
         //行业
-        if(localStorage.industry){
+        if(localStorage.industry!==undefined && localStorage.industry!==""){
             var industry = localStorage.industry.split(" ");
             var arr = [];
             for(var i in industry){
@@ -434,31 +434,30 @@
             $("#industry").text(arr.toString().replace(/,/g," "));
         }
         //关键词
-        if(localStorage.keyWord){
+        if(localStorage.keyWord!==undefined && localStorage.keyWord!==""){
             var keyWord = JSON.parse(localStorage.keyWord);
             for(var i in keyWord){
                 $("#keyWord").append(keyWord[i].keyWord + " ");
             }
         }
         //信息类型
-        if(localStorage.subType){
+        if(localStorage.subType!==undefined && localStorage.subType!==""){
             var subType = localStorage.subType;
             $("#subType").text(subType);
         }
-        //采购单位
-        if(localStorage.buyer){
+        if(localStorage.buyer!==undefined && localStorage.buyer!==""){
             var buyer = localStorage.buyer;
             var buyers = buyer.replace(/,/g," ");
             $("#buyer").text(buyers);
         }
         //中标单位
-        if(localStorage.winner){
+        if(localStorage.winner!==undefined && localStorage.winner!==""){
             var winner = localStorage.winner;
             var winners = winner.replace(/,/g," ");
             $("#winner").text(winners);
         }
         //时间
-        if(localStorage.date){
+        if(localStorage.date!==undefined && localStorage.date!==""){
             if(localStorage.index !== "-1"){
                 $(".chooseTime ul li.active").removeClass("active");
                 $(".chooseTime ul li").eq(localStorage.index).addClass("active");

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

@@ -89,43 +89,79 @@
     <script src="/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         var keyWordArr = [];
+        var keyWordsArr = [];
         var appendedArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
         //
-        if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
-            var keyWord = localStorage.keyWord;
-            keyWordArr = JSON.parse(keyWord);
-            var html = "";
-            for(var i in keyWordArr){
-                var keyWords = keyWordArr[i].keyWord;
-                var appendeds = keyWordArr[i].appended;
-                if(keyWords === token){
-                    appendedArr = appendeds;
-                    if(appendeds !== undefined){
-                        for(var m in appendeds){
-                            html +=
+        if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                keyWordArr = JSON.parse(localStorage.keyWord);
+            }
+            keyWordsArr = JSON.parse(sessionStorage.keyWord);
+            var shtml = "";
+            for(var x in keyWordsArr){
+                appendedArr = keyWordsArr[x].appended;
+                if(keyWordsArr[x].keyWord === token){
+                    if(appendedArr !== undefined){
+                        for(var y in appendedArr){
+                            shtml +=
                                 `<li>
-                            <div class="one">
-                                <div>
-                                    <span>
-                                        <p class="key">${ appendeds[m] }</p>
-                                    </span>
+                                        <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 contentEditable="true">${ appendedArr[y] }</span>
+                                            <button class="deleteKey">删除</button>
+                                            <button class="ascertainKey">确定</button>
+                                        </div>
+                                    </li>`
+                        }
+                    }
+                }
+            }
+            $('.showKeyWord > ul').prepend(shtml);
+        }else{
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                var keyWord = localStorage.keyWord;
+                keyWordArr = JSON.parse(keyWord);
+                var html = "";
+                for(var i in keyWordArr){
+                    var keyWords = keyWordArr[i].keyWord;
+                    var appendeds = keyWordArr[i].appended;
+                    if(keyWords === token){
+                        appendedArr = appendeds;
+                        if(appendeds !== undefined){
+                            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>
-                                <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>`
+                            </li>`
+                            }
                         }
                     }
                 }
+                $('.showKeyWord > ul').prepend(html);
             }
-            $('.showKeyWord > ul').prepend(html);
         }
+
         $(function(){
 
             $('.knowBtn').on('click',function(){
@@ -189,23 +225,39 @@
                         keyWordArr[i].appended = appendedArr
                     }
                 }
-                sessionStorage.appended = JSON.stringify(appendedArr);
+                if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+                    for(var m in keyWordsArr){
+                        if(keyWordsArr[m].keyWord === token){
+                            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++;
+                        }
+                    }
+                }
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 var html = `<li>
-                                <div class="one">
-                                    <div>
-                                        <span>
-                                            <p class="key">${ appended }</p>
-                                        </span>
+                                    <div class="one">
+                                        <div>
+                                            <span>
+                                                <p class="key">${ appended }</p>
+                                            </span>
+                                        </div>
+                                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
                                     </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>
-                            </li>`;
+                                    <div class="modify">
+                                        <span contentEditable="true">${ appended }</span>
+                                        <button class="deleteKey">删除</button>
+                                        <button class="ascertainKey">确定</button>
+                                    </div>
+                                </li>`;
                 $('.showKeyWord > ul').prepend(html);
 
                 // 隐藏
@@ -237,7 +289,7 @@
                         keyWordArr[i].appended = appendedArr
                     }
                 }
-                sessionStorage.appended = JSON.stringify(appendedArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
                 hasWords()
@@ -257,7 +309,7 @@
                         keyWordArr[m].appended = appendedArr
                     }
                 }
-                sessionStorage.appended = JSON.stringify(appendedArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parent().siblings().find('.key').text(appended);
                 $(this).parent().hide().siblings().show()

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

@@ -89,24 +89,57 @@
     <script src="/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         var keyWordArr = [];
+        var keyWordsArr = [];
         var excludeArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
         //
-        if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
-            var keyWord = localStorage.keyWord;
-            keyWordArr = JSON.parse(keyWord);
-            var html = "";
-            for(var i in keyWordArr){
-                var keyWords = keyWordArr[i].keyWord;
-                var excludes = keyWordArr[i].exclude;
-                if(keyWords === token){
-                    excludeArr = excludes;
-                    console.log(excludeArr)
-                    if(excludes !== undefined){
-                        for(var m in excludes){
-                            html +=
+        if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                keyWordArr = JSON.parse(localStorage.keyWord);
+            }
+            keyWordsArr = JSON.parse(sessionStorage.keyWord);
+            var shtml = "";
+            for(var x in keyWordsArr){
+                excludeArr = keyWordsArr[x].exclude;
+                if(keyWordsArr[x].keyWord === token){
+                    if(excludeArr !== undefined){
+                        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 contentEditable="true">${ excludeArr[y] }</span>
+                                    <button class="deleteKey">删除</button>
+                                    <button class="ascertainKey">确定</button>
+                                </div>
+                            </li>`
+                        }
+                    }
+                }
+            }
+            $('.showKeyWord > ul').prepend(shtml);
+        }else{
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                var keyWord = localStorage.keyWord;
+                keyWordArr = JSON.parse(keyWord);
+                var html = "";
+                for(var i in keyWordArr){
+                    var keyWords = keyWordArr[i].keyWord;
+                    var excludes = keyWordArr[i].exclude;
+                    if(keyWords === token){
+                        excludeArr = excludes;
+                        if(excludes !== undefined){
+                            for(var m in excludes){
+                                html +=
+                                    `<li>
                                 <div class="one">
                                     <div>
                                         <span>
@@ -121,12 +154,14 @@
                                     <button class="ascertainKey">确定</button>
                                 </div>
                             </li>`
+                            }
                         }
                     }
                 }
+                $('.showKeyWord > ul').prepend(html);
             }
-            $('.showKeyWord > ul').prepend(html);
         }
+
         $(function(){
 
             $('.knowBtn').on('click',function(){
@@ -190,8 +225,24 @@
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
-                sessionStorage.exclude = JSON.stringify(excludeArr);
+                if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+                    for(var m in keyWordsArr){
+                        if(keyWordsArr[m].keyWord === token){
+                            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++;
+                        }
+                    }
+                }
                 localStorage.keyWord = JSON.stringify(keyWordArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordsArr);
                 var html = `<li>
                                     <div class="one">
                                         <div>
@@ -238,8 +289,8 @@
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
-                sessionStorage.exclude = JSON.stringify(excludeArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
                 hasWords()
                 // console.log('删除附加词:',$(this).parent().find('span').text())
@@ -258,16 +309,16 @@
                         keyWordArr[m].exclude = excludeArr
                     }
                 }
-                sessionStorage.exclude = JSON.stringify(excludeArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parent().siblings().find('.key').text(exclude);
                 $(this).parent().hide().siblings().show()
-            })
+            });
 
             //去空格方法
             String.prototype.trim = function(){
                 return this.replace(/(^\s*)|(\s*$)/g, ' ');
-            }
+            };
 
             //附加词个数
             $('.modify span').keydown(function(){
@@ -275,8 +326,8 @@
                 // console.log(olength)
                 if(olength >= 100){
                     $('.fontLength').show();
-                    var s = $(this).text().slice(0,100)
-                    $(this).text(s)
+                    var s = $(this).text().slice(0,100);
+                    $(this).text(s);
                     weui.toast('附加词不能超过100字', {
                         duration: 2000,
                         className: 'text-overflow100',

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

@@ -221,13 +221,36 @@
             //
             $(".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;
             });
             $(".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;
             });
         }
+        //
+        if($(".enterOne").val()!==""){
+            $('.enter.addkeyWord .btnChoose .appended').prop("disabled", false);
+            $('.enter.addkeyWord .btnChoose .exclude').prop("disabled", false);
+            $('.enter.addkeyWord .btn > button').prop("disabled", false);
+            $('.enter.addkeyWord .btn > button').css("opacity", 1);
+        }
+        $(".appended").on('click', function () {
+            var keyWord = $(this).parent().prev().val();
+            var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
+            buttonDOM.prop("disabled", true);
+            var obj = [{"keyWord":keyWord}];
+            sessionStorage.keyWord = JSON.stringify(obj);
+            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);
+            window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
+        });
 
 
     </script>

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

@@ -20,13 +20,14 @@ $(function(){
             $(".showKeyWord").show();
         }
     }
-    hasWords()
+    hasWords();
     
     //添加按钮
     $(".addKeyWord i").on('click',function(){
         $(".addkeyWord").show();
         $(".showKeyWord").hide();
-    })
+        sessionStorage.removeItem("keyWord")
+    });
 
     // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
     $('.addkeyWord input.enterOne').on('input', function() {
@@ -42,15 +43,21 @@ $(function(){
             return
         }
 
-        var buttonDOM = $(this).siblings()[1].children[0]
+        var buttonDOM = $(this).siblings()[1].children[0];
         if ($(this).val().length >= 1) {
-            buttonDOM.style.opacity = 1
-            buttonDOM.removeAttribute("disabled")
+            buttonDOM.style.opacity = 1;
+            buttonDOM.removeAttribute("disabled");
+            //
+            $(this).next().find(".appended").prop("disabled", false);
+            $(this).next().find(".exclude").prop("disabled", false);
         } else {
-            buttonDOM.style.opacity = .5
-            buttonDOM.setAttribute("disabled", true)
+            buttonDOM.style.opacity = .5;
+            buttonDOM.setAttribute("disabled", true);
+            //
+            $(this).next().find(".appended").prop("disabled", true);
+            $(this).next().find(".exclude").prop("disabled", true);
         }
-    })
+    });
     
     // $('.exclusion input.enterOne').on('input', function() {
     //     var buttonDOM = $(this).siblings().find('button')[0]

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

@@ -368,17 +368,17 @@
         });
         //回显
         //金额
-        if(localStorage.price){
+        if(localStorage.price!==undefined && localStorage.price!==""){
             var price = localStorage.price;
             $("#price").text(price);
         }
         //区域
-        if(localStorage.area){
+        if(localStorage.area!==undefined && localStorage.area!==""){
             var area = localStorage.area;
             $("#area").text(area);
         }
         //行业
-        if(localStorage.industry){
+        if(localStorage.industry!==undefined && localStorage.industry!==""){
             var industry = localStorage.industry.split(" ");
             var arr = [];
             for(var i in industry){
@@ -392,30 +392,30 @@
             $("#industry").text(arr.toString().replace(/,/g," "));
         }
         //关键词
-        if(localStorage.keyWord){
+        if(localStorage.keyWord!==undefined && localStorage.keyWord!==""){
             var keyWord = JSON.parse(localStorage.keyWord);
             for(var i in keyWord){
                 $("#keyWord").append(keyWord[i].keyWord + " ");
             }
         }
         //信息类型
-        if(localStorage.subType){
+        if(localStorage.subType!==undefined && localStorage.subType!==""){
             var subType = localStorage.subType;
             $("#subType").text(subType);
         }
-        if(localStorage.buyer){
+        if(localStorage.buyer!==undefined && localStorage.buyer!==""){
             var buyer = localStorage.buyer;
             var buyers = buyer.replace(/,/g," ");
             $("#buyer").text(buyers);
         }
         //中标单位
-        if(localStorage.winner){
+        if(localStorage.winner!==undefined && localStorage.winner!==""){
             var winner = localStorage.winner;
             var winners = winner.replace(/,/g," ");
             $("#winner").text(winners);
         }
         //时间
-        if(localStorage.date){
+        if(localStorage.date!==undefined && localStorage.date!==""){
             if(localStorage.index !== "-1"){
                 $(".chooseTime ul li.active").removeClass("active");
                 $(".chooseTime ul li").eq(localStorage.index).addClass("active");

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

@@ -68,23 +68,57 @@
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         var keyWordArr = [];
+        var keyWordsArr = [];
         var appendedArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
         //
-        if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
-            var keyWord = localStorage.keyWord;
-            keyWordArr = JSON.parse(keyWord);
-            var html = "";
-            for(var i in keyWordArr){
-                var keyWords = keyWordArr[i].keyWord;
-                var appendeds = keyWordArr[i].appended;
-                if(keyWords === token){
-                    appendedArr = appendeds;
-                    if(appendeds !== undefined){
-                        for(var m in appendeds){
-                            html +=
+        if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                keyWordArr = JSON.parse(localStorage.keyWord);
+            }
+            keyWordsArr = JSON.parse(sessionStorage.keyWord);
+            var shtml = "";
+            for(var x in keyWordsArr){
+                appendedArr = keyWordsArr[x].appended;
+                if(keyWordsArr[x].keyWord === token){
+                    if(appendedArr !== undefined){
+                        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 contentEditable="true">${ appendedArr[y] }</span>
+                                        <button class="deleteKey">删除</button>
+                                        <button class="ascertainKey">确定</button>
+                                    </div>
+                                </li>`
+                        }
+                    }
+                }
+            }
+            $('.showKeyWord > ul').prepend(shtml);
+        }else{
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                var keyWord = localStorage.keyWord;
+                keyWordArr = JSON.parse(keyWord);
+                var html = "";
+                for(var i in keyWordArr){
+                    var keyWords = keyWordArr[i].keyWord;
+                    var appendeds = keyWordArr[i].appended;
+                    if(keyWords === token){
+                        appendedArr = appendeds;
+                        if(appendeds !== undefined){
+                            for(var m in appendeds){
+                                html +=
+                                    `<li>
                             <div class="one">
                                 <div>
                                     <span>
@@ -99,12 +133,14 @@
                                 <button class="ascertainKey">确定</button>
                             </div>
                         </li>`
+                            }
                         }
                     }
                 }
+                $('.showKeyWord > ul').prepend(html);
             }
-            $('.showKeyWord > ul').prepend(html);
         }
+
         $(function(){
 
             $('.knowBtn').on('click',function(){
@@ -168,7 +204,23 @@
                         keyWordArr[i].appended = appendedArr
                     }
                 }
-                sessionStorage.appended = JSON.stringify(appendedArr);
+                if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+                    for(var m in keyWordsArr){
+                        if(keyWordsArr[m].keyWord === token){
+                            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++;
+                        }
+                    }
+                }
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 var html = `<li>
                                 <div class="one">
@@ -216,7 +268,7 @@
                         keyWordArr[i].appended = appendedArr
                     }
                 }
-                sessionStorage.appended = JSON.stringify(appendedArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
                 hasWords()
@@ -236,7 +288,7 @@
                         keyWordArr[m].appended = appendedArr
                     }
                 }
-                sessionStorage.appended = JSON.stringify(appendedArr);
+                sessionStorage.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_exclude.html

@@ -68,24 +68,57 @@
     <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
     <script>
         var keyWordArr = [];
+        var keyWordsArr = [];
         var excludeArr = [];
         var url = location.href;
         var token = decodeURI(url.match(/=.*/)).replace("=", "");
         //
-        if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
-            var keyWord = localStorage.keyWord;
-            keyWordArr = JSON.parse(keyWord);
-            var html = "";
-            for(var i in keyWordArr){
-                var keyWords = keyWordArr[i].keyWord;
-                var excludes = keyWordArr[i].exclude;
-                if(keyWords === token){
-                    excludeArr = excludes;
-                    console.log(excludeArr)
-                    if(excludes !== undefined){
-                        for(var m in excludes){
-                            html +=
+        if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                keyWordArr = JSON.parse(localStorage.keyWord);
+            }
+            keyWordsArr = JSON.parse(sessionStorage.keyWord);
+            var shtml = "";
+            for(var x in keyWordsArr){
+                excludeArr = keyWordsArr[x].exclude;
+                if(keyWordsArr[x].keyWord === token){
+                    if(excludeArr !== undefined){
+                        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 contentEditable="true">${ excludeArr[y] }</span>
+                                    <button class="deleteKey">删除</button>
+                                    <button class="ascertainKey">确定</button>
+                                </div>
+                            </li>`
+                        }
+                    }
+                }
+            }
+            $('.showKeyWord > ul').prepend(shtml);
+        }else{
+            if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
+                var keyWord = localStorage.keyWord;
+                keyWordArr = JSON.parse(keyWord);
+                var html = "";
+                for(var i in keyWordArr){
+                    var keyWords = keyWordArr[i].keyWord;
+                    var excludes = keyWordArr[i].exclude;
+                    if(keyWords === token){
+                        excludeArr = excludes;
+                        if(excludes !== undefined){
+                            for(var m in excludes){
+                                html +=
+                                    `<li>
                                 <div class="one">
                                     <div>
                                         <span>
@@ -100,12 +133,14 @@
                                     <button class="ascertainKey">确定</button>
                                 </div>
                             </li>`
+                            }
                         }
                     }
                 }
+                $('.showKeyWord > ul').prepend(html);
             }
-            $('.showKeyWord > ul').prepend(html);
         }
+
         $(function(){
 
             $('.knowBtn').on('click',function(){
@@ -169,8 +204,24 @@
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
-                sessionStorage.exclude = JSON.stringify(excludeArr);
+                if(sessionStorage.keyWord!==undefined && sessionStorage.keyWord!==""){
+                    for(var m in keyWordsArr){
+                        if(keyWordsArr[m].keyWord === token){
+                            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++;
+                        }
+                    }
+                }
                 localStorage.keyWord = JSON.stringify(keyWordArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordsArr);
                 var html = `<li>
                                     <div class="one">
                                         <div>
@@ -217,8 +268,8 @@
                         keyWordArr[i].exclude = excludeArr
                     }
                 }
-                sessionStorage.exclude = JSON.stringify(excludeArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parents('li').remove();
                 hasWords()
                 // console.log('删除附加词:',$(this).parent().find('span').text())
@@ -237,16 +288,16 @@
                         keyWordArr[m].exclude = excludeArr
                     }
                 }
-                sessionStorage.exclude = JSON.stringify(excludeArr);
                 localStorage.keyWord = JSON.stringify(keyWordArr);
+                sessionStorage.keyWord = JSON.stringify(keyWordArr);
                 $(this).parent().siblings().find('.key').text(exclude);
                 $(this).parent().hide().siblings().show()
-            })
+            });
 
             //去空格方法
             String.prototype.trim = function(){
                 return this.replace(/(^\s*)|(\s*$)/g, ' ');
-            }
+            };
 
             //附加词个数
             $('.modify span').keydown(function(){
@@ -254,8 +305,8 @@
                 // console.log(olength)
                 if(olength >= 100){
                     $('.fontLength').show();
-                    var s = $(this).text().slice(0,100)
-                    $(this).text(s)
+                    var s = $(this).text().slice(0,100);
+                    $(this).text(s);
                     weui.toast('附加词不能超过100字', {
                         duration: 2000,
                         className: 'text-overflow100',

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

@@ -30,8 +30,8 @@
         <div class="enter addkeyWord">
             <input type="text" class="enterOne" placeholder="请输入关键词" />
             <div class="btnChoose" style="display:none;">
-                <button class="addAdjunctWord" disabled>添加 附加词</button>
-                <button class="addExclusion" disabled>添加 排除词</button>
+                <button class="addAdjunctWord appended" disabled>添加 附加词</button>
+                <button class="addExclusion exclude" disabled>添加 排除词</button>
             </div>
             <div class="btn">
                 <button disabled>确认</button>
@@ -89,7 +89,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"}}12"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}18"></script>
     <script>
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
@@ -202,14 +202,38 @@
             //
             $(".showKeyWord").on('click', '.addAdjunctWord',function(e){
                 var keyWord = $(this).parent().prev().find('.key').text();
+                sessionStorage.removeItem("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 = "/front/wx_dataExport/exclude?keyWord="+keyWord;
             });
         }
-
+        //
+        if($(".enterOne").val()!==""){
+            $('.enter.addkeyWord .btnChoose .appended').prop("disabled", false);
+            $('.enter.addkeyWord .btnChoose .exclude').prop("disabled", false);
+            $('.enter.addkeyWord .btn > button').prop("disabled", false);
+            $('.enter.addkeyWord .btn > button').css("opacity", 1);
+        }
+        $(".appended").on('click', function () {
+            var keyWord = $(this).parent().prev().val();
+            var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
+            buttonDOM.prop("disabled", true);
+            var obj = [{"keyWord":keyWord}];
+            sessionStorage.keyWord = JSON.stringify(obj);
+            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);
+            var obj = [{"keyWord":keyWord}];
+            sessionStorage.keyWord = JSON.stringify(obj);
+            window.location.href = "/front/wx_dataExport/exclude?keyWord="+keyWord;
+        });
 
     </script>
 </body>