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

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

@@ -118,8 +118,10 @@
             $(window).bind("pageshow", function(event){
                 if(event.originalEvent.persisted){
                     IOSsession();
-                    $(".appended").prop("disabled", true)
-                    $(".exclued").prop("disabled", true)
+                    var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
+            		buttonDOM.prop("disabled", false);
+            		var buttonDOMM = $('.enter.addkeyWord .btnChoose .exclude');
+            		buttonDOMM.prop("disabled", false);
                 }
             });
             if(!isinitpage) {

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

@@ -80,6 +80,10 @@
         $(window).bind("pageshow", function(event){
             if(event.originalEvent.persisted){
                 IOSsession();
+                var buttonDOM = $('.enter.addkeyWord .btnChoose .appended');
+        		buttonDOM.prop("disabled", false);
+        		var buttonDOMM = $('.enter.addkeyWord .btnChoose .exclude');
+        		buttonDOMM.prop("disabled", false);
             }
         });
         if(!isinitpage) {