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

src/web/templates/weixin/historypush.html

@@ -161,6 +161,7 @@
 					}
 				});
 				if(firstPage!=null&&firstPage.length>0){
+					$(".findnull_").hide();
 					$("#list").css("visibility","hidden");
 					dataCache = dataCache.concat(firstPage);
 					structureHtml(firstPage,true);
@@ -571,6 +572,7 @@
 				$(".loading_").css("display","none");
 				return;
 			}
+			$(".findnull_").hide();
 			$("#list").css("visibility","hidden");
 			//dataCache = firstPage;
 			$("#list").html("");
@@ -779,6 +781,7 @@
 			/**/
 			overflow: hidden;
 			height:100vh;
+			overflow-y:scroll;
 		}
 		.buyerclass {
 		    border: 1px solid #CFAD89;
@@ -917,6 +920,7 @@
   	<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 = {}
@@ -1084,12 +1088,14 @@
             });
             // 选择地区
             $('#showArea').on('click', function (){
+				_scrollTop = scrollTop;
+            	$(".subscribe").toggleClass('overClass');
+				$(".subscribe").scrollTop(_scrollTop);
 				if(sessionStorage.getItem(userId+"_selectCityName")==""||sessionStorage.getItem(userId+"_selectCityName")==undefined){
 					$(this).find("span").toggleClass("current");
 				}
             	$('.area_container').slideToggle();
             	$('.screen').toggle();
-            	$(".subscribe").toggleClass('overClass');
             })
             // 地区省份选择的操作
             $('.province .p_item').click(function(){
@@ -1117,9 +1123,9 @@
             })
             //
             $('.screen').click(function(){
-				 $('#showArea').find("span").toggleClass("current");
-            	$('.area_container').slideUp();
             	$(".subscribe").toggleClass('overClass');
+				$('#showArea').find("span").toggleClass("current");
+            	$('.area_container').slideUp();
             	$('.screen').hide();
             })
             // 地区选择确认按钮

src/web/templates/weixin/vipsubscribe/keyWord.html

@@ -448,7 +448,6 @@
         }
         //修改关键词内容
         function toSetKws(){
-			console.log(kws_index)
             //分类列表进入
             if(kws_index==-1){
                 var edhtml = '<input type="text" class="enterOne" placeholder="请输入关键词" maxlength="20">'
@@ -571,13 +570,13 @@
         //跳转附加词
         function toappendkey(th){
             if(!$('.enter.addkeyWord').is(':hidden')){
-                if($('.addkeyWord input.enterOne').val()==""){
+                if($.trim($('.addkeyWord input.enterOne').val())==""){
                     return
                 }
                 kws_index = -1
                 kws_name = $.trim($('.addkeyWord input.enterOne').val());
             }else{
-               if($(th).parent(".modify").find("textarea").val()==""){
+               if($.trim($(th).parent(".modify").find("textarea").val())==""){
                  return
                }
                 kws_name = $.trim($(th).parent(".modify").find("textarea").val());
@@ -589,13 +588,13 @@
         //
         function tonotkey(th){
             if(!$('.enter.addkeyWord').is(':hidden')){
-                if($('.addkeyWord input.enterOne').val()==""){
+                if($.trim($('.addkeyWord input.enterOne').val())==""){
                     return
                 }
                 kws_index = -1
                 kws_name = $.trim($('.addkeyWord input.enterOne').val());
             }else{
-               if($(th).parent(".modify").find("textarea").val()==""){
+               if($.trim($(th).parent(".modify").find("textarea").val())==""){
                  return
                }
                 kws_name = $.trim($(th).parent(".modify").find("textarea").val());
@@ -840,7 +839,11 @@
                 $(".add-keyword-container .addNewKeyword i").hide();
                 $('.add-keyword-container').show();
                 $('.all-classify-column').hide();
-                
+                //
+				kws_index = 0;
+				modifyFlag = false;
+				addition_kws = [];
+				not_kws = [];
                 // 显示添加关键词的输入框
                 $(".enter.addkeyWord").find(".btnChoose button").eq(0).html('添加 附加词');
                 $(".enter.addkeyWord").find(".btnChoose button").eq(1).html('添加 排除词');