xiugai

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

@@ -106,120 +106,121 @@ $(function(){
             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">
-                            <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>
-                            <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>
-                            </div>
-                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                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>
                         </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>
+                        <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>
-                    </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>
+                        <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>
                         </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>
+                        <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>
-                    </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
+                        <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
+                // }
             }
         }
         var Obj = {"keyWord": keyWord};

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

@@ -157,22 +157,23 @@
             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
-                            }
+                    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
                         }
-                        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
+                    // }
                 }
             }
             //

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

@@ -98,120 +98,121 @@ $(function(){
             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">
-                            <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>
-                            <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>
-                            </div>
-                            <button class="editKeyWord"><i class="iconfont icon-xiugai"></i> 修改</button>
+                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>
                         </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>
+                        <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>
-                    </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>
+                        <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>
                         </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>
+                        <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>
-                    </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
+                        <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
+                // }
             }
         }
         var Obj = {"keyWord": keyWord};

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

@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
     <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/weui.min.css?v={{Msg "seo" "version"}}">
-    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}124">
+    <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/keyWord.css?v={{Msg "seo" "version"}}125">
     <script src="/js/jquery.js"></script>
     {{include "/common/weixin.html"}}
     <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
@@ -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"}}65"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}70"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         $(window).bind("pageshow", function(event){
@@ -335,8 +335,6 @@
         $(".showKeyWord").on('click', '.addAdjunctWord',function(e){
             var keyWord = $(this).parent().prev().find('.key').text();
             if (keyWord.length > 20) {
-                // var s = keyWord.slice(0,19);
-                // $('.addkeyWord input.enterOne').val(s)
 
                 weui.toast('关键词不能超过20字', {
                     duration: 2000,
@@ -351,8 +349,6 @@
         $(".showKeyWord").on('click', '.addExclusion',function(e){
             var keyWord = $(this).parent().prev().find('.key').text();
             if (keyWord.length > 20) {
-                // var s = keyWord.slice(0,19);
-                // $('.addkeyWord input.enterOne').val(s)
 
                 weui.toast('关键词不能超过20字', {
                     duration: 2000,

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

@@ -132,22 +132,23 @@
             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
-                            }
+                    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
                         }
-                        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
+                    // }
                 }
             }
             //