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

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

@@ -16,6 +16,8 @@ $(function(){
             $(".enter.addkeyWord").show();
             $(".addKeyWord").hide();
             $(".showKeyWord").hide();
+            sessionStorage.removeItem("keyWord");
+            sessionStorage.removeItem("IOSsession");
         } else {
             $(".enter.addkeyWord").hide();
             $(".showKeyWord").show();
@@ -214,6 +216,7 @@ $(function(){
                     var buttonDOM = $('.enter.addkeyWord .btn button')[0];
                     buttonDOM.style.opacity = .5;
                     buttonDOM.setAttribute("disabled", true);
+                    sessionStorage.IOSsession = "ios";
                     return
                 }
             }
@@ -230,6 +233,7 @@ $(function(){
         var buttonDOM = $('.enter.addkeyWord .btn button')[0];
         buttonDOM.style.opacity = .5;
         buttonDOM.setAttribute("disabled", true);
+        sessionStorage.IOSsession = "ios";
 
     });
 

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

@@ -772,7 +772,8 @@
         }
         //
         if($("#keyword").text()===""){
-            sessionStorage.removeItem("keyWord")
+            sessionStorage.removeItem("keyWord");
+            sessionStorage.IOSsession = "";
         }
         //
         //筛选条件发送

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"}}85"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/keyWord.js?v={{Msg "seo" "version"}}86"></script>
     <script>
         initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});
         //回退刷新

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

@@ -184,7 +184,6 @@
             }
             keyWordArr.push(Obj);
             localStorage.setItem("keyWord", JSON.stringify(keyWordArr));
-            sessionStorage.IOSsession = "ios";
             window.history.back();
         });