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

src/web/staticres/vipsubscribe/js/keyWord.js

@@ -177,7 +177,7 @@ var reloadFunc = function(){
         }
         $('.enter.addkeyWord').hide()
         let oSpan = $(this).parent().siblings().children('textarea');
-        let val = $(oSpan).val()
+        let val =  $.trim($(oSpan).val());
         $(this).parent().hide()
         $(this).parent().siblings().show().parent().siblings().children('.modify').hide().siblings('.one').show()
         $(oSpan).val('').focus().val(val) 
@@ -306,7 +306,9 @@ var reloadFunc = function(){
         $('.classify-edit-pop').hide();
         $('input.classify-keyword').val('');
         if($(".showKeyWord li").length>0){
+			kws_name = classify_name;
             saveData('SC')
+			kws_name = "";
             a_items[classify_index]["s_item"] = classify_name;
         }
     })

src/web/templates/weixin/historypush.html

@@ -920,7 +920,6 @@
   	<script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
   	<script src="{{Msg "seo" "cdn"}}/dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}"></script>
   	<script type="text/javascript" charset="UTF-8">
-		var _scrollTop = 0;
   		function mapData(){
   			var _citySessionData = null
   			var _provinceArr = {}
@@ -1021,6 +1020,16 @@
         		ajaxFun("",selectCity);
         	}
         }
+		//
+		var _scrollTop = 0;
+		function scrollHtml(){
+			if($(".subscribe").hasClass('overClass')){
+				$(".subscribe").scrollTop(_scrollTop);
+			}else{
+				$("body").scrollTop(_scrollTop);
+				_scrollTop =0;
+			}
+		}
 		//禁止默认行为方法
 		function stopScroll(e) {
 		    e.preventDefault()
@@ -1088,9 +1097,11 @@
             });
             // 选择地区
             $('#showArea').on('click', function (){
-				_scrollTop = scrollTop;
+				if(_scrollTop==0){
+					_scrollTop = scrollTop;
+				}
             	$(".subscribe").toggleClass('overClass');
-				$(".subscribe").scrollTop(_scrollTop);
+				scrollHtml();
 				if(sessionStorage.getItem(userId+"_selectCityName")==""||sessionStorage.getItem(userId+"_selectCityName")==undefined){
 					$(this).find("span").toggleClass("current");
 				}
@@ -1124,6 +1135,7 @@
             //
             $('.screen').click(function(){
             	$(".subscribe").toggleClass('overClass');
+				scrollHtml();
 				$('#showArea').find("span").toggleClass("current");
             	$('.area_container').slideUp();
             	$('.screen').hide();