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

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

@@ -106,121 +106,124 @@ $(function(){
             for(var i in keys){
                 var append = keys[i].appended;
                 var exclude = keys[i].exclude;
-                keys[i].keyWord = keyWord;
-                // 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>
+                // keys[i].keyWord = keyWord;
+                if(keys[i].keyWord === turn){
+                    if(keyWord !== turn){
+                        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>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <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>
-                            <span>
-                                <strong> 排除词：</strong>
-                                <p class="exclusion">${ exclude }</p>
-                            </span>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <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>
-                            <span>
-                                <strong> 附加词：</strong>
-                                <p class="addition">${ append }</p>
-                            </span>
-                            <span>
-                                <strong> 排除词：</strong>
-                                <p class="exclusion">${ exclude }</p>
-                            </span>
+                    </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="exclusion">${ exclude }</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">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <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 class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <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">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <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">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <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
                 }
-                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};

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

@@ -744,7 +744,8 @@
             localStorage.removeItem("export_starttime");
             localStorage.removeItem("export_endtime");
             if(localStorage.areaHtml!==undefined&&localStorage.areaHtml!==""){
-                area = localStorage.areaHtml;
+                var areaHtml = localStorage.areaHtml;
+                area = areaHtml.replace(/、/g," ").replace(/(安徽||福建||广东||广西||贵州||甘肃||河北||湖北||黑龙江||海南||河南||湖南||吉林||江苏||江西||辽宁||内蒙古||宁夏||青海||陕西||山西||山东||四川||西藏||新疆||云南||浙江)\(/g,"").replace(/\)/g,"");
             }
             if(localStorage.province!==undefined&&localStorage.province!==""){
                 province = localStorage.province;
@@ -805,8 +806,8 @@
             localStorage.removeItem("date");
             localStorage.removeItem("province");
             localStorage.removeItem("city");
-            localStorage.removeItem("area");
             localStorage.removeItem("areaHtml");
+            localStorage.removeItem("area");
             localStorage.removeItem("industry");
             localStorage.removeItem("keyWord");
             localStorage.removeItem("price");

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

@@ -137,7 +137,7 @@
     </div>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/zepto.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/jyapp/dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}47"></script>
+    <script src="/jyapp/dataExport/js/keyWord.js?v={{Msg "seo" "version"}}48"></script>
     <script>
         $(window).bind("pageshow", function(event){
             if(event.originalEvent.persisted){
@@ -257,7 +257,7 @@
         }
         //
         if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-            var turn = $('.addkeyWord input.enterOne').val();
+            turn = $('.addkeyWord input.enterOne').val();
             var keys = JSON.parse(sessionStorage.keyWord);
             for(var a in keys){
                 if (keys[a].keyWord === turn){

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

@@ -157,23 +157,26 @@
             if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined) {
                 var keys = JSON.parse(sessionStorage.keyWord);
                 for (var i in keys) {
-                    keys[i].keyWord = keyWord;
-                    // 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
+                    // keys[i].keyWord = keyWord;
+                    if (keys[i].keyWord === turn) {
+                        if(keyWord !== turn){
+                            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
                     }
-                    keyWordArr.push(keys[i]);
-                    localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
-                    window.history.back();
-                    return
-                    // }
                 }
             }
             //
@@ -203,7 +206,7 @@
     });
 
     if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-        var turn = $('.addkeyWord input.enterOne').val();
+        turn = $('.addkeyWord input.enterOne').val();
         var keys = JSON.parse(sessionStorage.keyWord);
         for(var a in keys){
             if (keys[a].keyWord === turn){

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

@@ -98,121 +98,124 @@ $(function(){
             for(var i in keys){
                 var append = keys[i].appended;
                 var exclude = keys[i].exclude;
-                keys[i].keyWord = keyWord;
-                // 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>
+                // keys[i].keyWord = keyWord;
+                if(keys[i].keyWord === turn){
+                    if(keyWord !== turn){
+                        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>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <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>
-                            <span>
-                                <strong> 排除词：</strong>
-                                <p class="exclusion">${ exclude }</p>
-                            </span>
+                        <div class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <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>
-                            <span>
-                                <strong> 附加词：</strong>
-                                <p class="addition">${ append }</p>
-                            </span>
-                            <span>
-                                <strong> 排除词：</strong>
-                                <p class="exclusion">${ exclude }</p>
-                            </span>
+                    </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="exclusion">${ exclude }</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">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <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 class="modify">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <button class="addAdjunctWord">编辑 附加词</button>
+                            <button class="addExclusion">添加 排除词</button>
+                            <button class="deleteKey">删除</button>
+                            <button class="ascertainKey">确定</button>
                         </div>
-                        <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
-                    </div>
-                    <div class="modify">
-                        <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
-                        <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">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <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">
+                            <textarea  name=""  rows="1"  placeholder="" maxlength="">${ keys[i].keyWord}</textarea>
+                            <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
                 }
-                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};

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

@@ -694,7 +694,8 @@
             localStorage.removeItem("export_starttime");
             localStorage.removeItem("export_endtime");
             if(localStorage.areaHtml!==undefined&&localStorage.areaHtml!==""){
-                area = localStorage.areaHtml;
+                var areaHtml = localStorage.areaHtml;
+                area = areaHtml.replace(/、/g," ").replace(/(安徽||福建||广东||广西||贵州||甘肃||河北||湖北||黑龙江||海南||河南||湖南||吉林||江苏||江西||辽宁||内蒙古||宁夏||青海||陕西||山西||山东||四川||西藏||新疆||云南||浙江)\(/g,"").replace(/\)/g,"");
             }
             if(localStorage.province!==undefined&&localStorage.province!==""){
                 province = localStorage.province;
@@ -755,8 +756,8 @@
             localStorage.removeItem("date");
             localStorage.removeItem("province");
             localStorage.removeItem("city");
-            localStorage.removeItem("area");
             localStorage.removeItem("areaHtml");
+            localStorage.removeItem("area");
             localStorage.removeItem("industry");
             localStorage.removeItem("keyWord");
             localStorage.removeItem("price");

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

@@ -627,7 +627,7 @@
 					 $(this).toggleClass('selected').next('.tab_content:not(:animated)').slideToggle(500);
 					 // $(this).parent().siblings().children('.tab_content').slideUp(500)
 					 $(this).parent().siblings().children('.tab').removeClass('selected');
-
+					 console.log(document.body.scrollTop)
 				 });
 				 //
 				 $('.province .checkbox:not(.other)').on('change',function(){
@@ -635,8 +635,8 @@
 					// console.log(isCheckded);
 					if(isCheckded){
 						$(this).parents('.tab').siblings('.tab_content').find('.city').addClass('active')
-						isAllSelected()
-						getResult()
+						isAllSelected();
+						getResult();
 					}else{
 						$(this).parents('.tab').siblings('.tab_content').find('.city').removeClass('active')
 						isAllSelected()

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

@@ -110,7 +110,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"}}78"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}82"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         $(function(){
@@ -238,7 +238,7 @@
         //
         function IOSsession() {
             if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-                var turn = $('.addkeyWord input.enterOne').val();
+                turn = $('.addkeyWord input.enterOne').val();
                 var keys = JSON.parse(sessionStorage.keyWord);
                 for(var a in keys){
                     if (keys[a].keyWord === turn){

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

@@ -144,23 +144,26 @@
             if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined) {
                 var keys = JSON.parse(sessionStorage.keyWord);
                 for (var i in keys) {
-                    keys[i].keyWord = keyWord;
-                    // 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
+                    // keys[i].keyWord = keyWord;
+                    if (keys[i].keyWord === turn) {
+                        if(keyWord !== turn){
+                            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
                     }
-                    keyWordArr.push(keys[i]);
-                    localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
-                    window.history.back();
-                    return
-                    // }
                 }
             }
             //
@@ -192,7 +195,7 @@
 
     function IOSsession() {
         if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-            var turn = $('.addkeyWord input.enterOne').val();
+            turn = $('.addkeyWord input.enterOne').val();
             var keys = JSON.parse(sessionStorage.keyWord);
             for(var a in keys){
                 if (keys[a].keyWord === turn){