xiugai

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

@@ -297,6 +297,13 @@ $(function(){
                     jQueryDOM.remove();
                     sessionStorage.removeItem("keyWord");
                     $(".addKeyWord").show();
+                    $(".btnChoose").hide();
+                    $(".appended").text("添加 附加词");
+                    $(".exclude").text("添加 排除词");
+                    //
+                    $(".appended").prop("disabled", true);
+                    $(".exclude").prop("disabled", true);
+                    //
                     hasWords()
                 }
             }]

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

@@ -298,6 +298,13 @@ $(function(){
                     jQueryDOM.remove();
                     sessionStorage.removeItem("keyWord");
                     $(".addKeyWord").show();
+                    $(".btnChoose").hide();
+                    $(".appended").text("添加 附加词");
+                    $(".exclude").text("添加 排除词");
+                    //
+                    $(".appended").prop("disabled", true);
+                    $(".exclude").prop("disabled", true);
+                    //
                     hasWords()
                 }
             }]

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

@@ -110,11 +110,20 @@
     </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"}}70"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}78"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
-        location.href=document.referrer;
-        alert("666666");
+        $(function(){
+            var isinitpage = false;
+            $(window).bind("pageshow", function(event){
+                if(event.originalEvent.persisted){
+                    IOSsession();
+                }
+            });
+            if(!isinitpage) {
+                isinitpage = true;
+            }
+        });
         var keyWordArr = [];
         if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
             var keyWord = localStorage.keyWord;
@@ -227,40 +236,43 @@
 
         }
         //
-        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-            var turn = $('.addkeyWord input.enterOne').val();
-            var keys = JSON.parse(sessionStorage.keyWord);
-            for(var a in keys){
-                if (keys[a].keyWord === turn){
-                    $(".btnChoose").show();
-                    //数量
-                    var str = "";
-                    var strs = "";
-                    if(keys[a].appended !== undefined){
-                        var appended = keys[a].appended.length;
-                        if(appended < 1){
-                            str =  "添加 附加词";
+        function IOSsession() {
+            if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+                var turn = $('.addkeyWord input.enterOne').val();
+                var keys = JSON.parse(sessionStorage.keyWord);
+                for(var a in keys){
+                    if (keys[a].keyWord === turn){
+                        $(".btnChoose").show();
+                        //数量
+                        var str = "";
+                        var strs = "";
+                        if(keys[a].appended !== undefined){
+                            var appended = keys[a].appended.length;
+                            if(appended < 1){
+                                str =  "添加 附加词";
+                            }else{
+                                str = "编辑 附加词 ("+appended+")";
+                            }
                         }else{
-                            str = "编辑 附加词 ("+appended+")";
+                            str =  "添加 附加词";
                         }
-                    }else{
-                        str =  "添加 附加词";
-                    }
-                    $(".addAdjunctWord").text(str);
-                    if(keys[a].exclude !== undefined){
-                        var exclude =keys[a].exclude.length;
-                        if(exclude < 1){
-                            strs = "添加 排除词";
+                        $(".addAdjunctWord").text(str);
+                        if(keys[a].exclude !== undefined){
+                            var exclude =keys[a].exclude.length;
+                            if(exclude < 1){
+                                strs = "添加 排除词";
+                            }else{
+                                strs = "编辑 排除词 ("+exclude+")";
+                            }
                         }else{
-                            strs = "编辑 排除词 ("+exclude+")";
+                            strs = "添加 排除词";
                         }
-                    }else{
-                        strs = "添加 排除词";
+                        $(".addExclusion").text(strs);
                     }
-                    $(".addExclusion").text(strs);
                 }
             }
         }
+        IOSsession();
         //
         if($(".enterOne").val()!==""){
             $('.enter.addkeyWord .btnChoose .appended').prop("disabled", false);

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

@@ -75,6 +75,18 @@
 <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
 <script>
     initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
+    $(function(){
+        var isinitpage = false;
+        $(window).bind("pageshow", function(event){
+            if(event.originalEvent.persisted){
+                IOSsession();
+            }
+        });
+        if(!isinitpage) {
+            isinitpage = true;
+        }
+    });
+
     var keyWordArr = [];
     if(localStorage.keyWord !== "" && localStorage.keyWord !== undefined){
         var keyWord = localStorage.keyWord;
@@ -178,40 +190,43 @@
 
     });
 
-    if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
-        var turn = $('.addkeyWord input.enterOne').val();
-        var keys = JSON.parse(sessionStorage.keyWord);
-        for(var a in keys){
-            if (keys[a].keyWord === turn){
-                $(".btnChoose").show();
-                //数量
-                var str = "";
-                var strs = "";
-                if(keys[a].appended !== undefined){
-                    var appended = keys[a].appended.length;
-                    if(appended < 1){
-                        str =  "添加 附加词";
+    function IOSsession() {
+        if(sessionStorage.keyWord!==""&&sessionStorage.keyWord!==undefined){
+            var turn = $('.addkeyWord input.enterOne').val();
+            var keys = JSON.parse(sessionStorage.keyWord);
+            for(var a in keys){
+                if (keys[a].keyWord === turn){
+                    $(".btnChoose").show();
+                    //数量
+                    var str = "";
+                    var strs = "";
+                    if(keys[a].appended !== undefined){
+                        var appended = keys[a].appended.length;
+                        if(appended < 1){
+                            str =  "添加 附加词";
+                        }else{
+                            str = "编辑 附加词 ("+appended+")";
+                        }
                     }else{
-                        str = "编辑 附加词 ("+appended+")";
+                        str =  "添加 附加词";
                     }
-                }else{
-                    str =  "添加 附加词";
-                }
-                $(".addAdjunctWord").text(str);
-                if(keys[a].exclude !== undefined){
-                    var exclude =keys[a].exclude.length;
-                    if(exclude < 1){
-                        strs = "添加 排除词";
+                    $(".addAdjunctWord").text(str);
+                    if(keys[a].exclude !== undefined){
+                        var exclude =keys[a].exclude.length;
+                        if(exclude < 1){
+                            strs = "添加 排除词";
+                        }else{
+                            strs = "编辑 排除词 ("+exclude+")";
+                        }
                     }else{
-                        strs = "编辑 排除词 ("+exclude+")";
+                        strs = "添加 排除词";
                     }
-                }else{
-                    strs = "添加 排除词";
+                    $(".addExclusion").text(strs);
                 }
-                $(".addExclusion").text(strs);
             }
         }
     }
+    IOSsession();
 
 
     if($(".enterOne").val()!==""){