预览

src/jfw/modules/subscribepay/src/service/afterPay.go

@@ -282,33 +282,33 @@ func (a *AfterPay) GetUserInfo() error {
 			data := qutil.ObjToMap((*userData)["o_vipjy"])
 			i_vip_status := qutil.IntAll((*userData)["i_vip_status"])
 			//区域
-			_area := qutil.ObjToMap((*data)["o_area"].(interface{}))
-			var area = ""
-			for k, v := range *_area {
-				if len(v.([]interface{})) == 0 {
-					area += k + "、"
-				} else {
-					for _, _v := range v.([]interface{}) {
-						area += _v.(string) + "、"
-					}
-				}
-			}
-			if area == "" {
-				(*data)["o_area"] = "全国"
-			} else {
-				(*data)["o_area"] = strings.TrimRight(area, "、")
-			}
+			//			_area := qutil.ObjToMap((*data)["o_area"].(interface{}))
+			//			var area = ""
+			//			for k, v := range *_area {
+			//				if len(v.([]interface{})) == 0 {
+			//					area += k + "、"
+			//				} else {
+			//					for _, _v := range v.([]interface{}) {
+			//						area += _v.(string) + "、"
+			//					}
+			//				}
+			//			}
+			//			if area == "" {
+			//				(*data)["o_area"] = "全国"
+			//			} else {
+			//				(*data)["o_area"] = strings.TrimRight(area, "、")
+			//			}
 			//采购行业
-			_buyClass := (*data)["a_buyerclass"].([]interface{})
-			var buyClass = ""
-			for _, v := range _buyClass {
-				buyClass += v.(string) + "、"
-			}
-			if buyClass == "" {
-				(*data)["a_buyerclass"] = "全行业"
-			} else {
-				(*data)["a_buyerclass"] = strings.TrimRight(buyClass, "、")
-			}
+			//			_buyClass := (*data)["a_buyerclass"].([]interface{})
+			//			var buyClass = ""
+			//			for _, v := range _buyClass {
+			//				buyClass += v.(string) + "、"
+			//			}
+			//			if buyClass == "" {
+			//				(*data)["a_buyerclass"] = "全行业"
+			//			} else {
+			//				(*data)["a_buyerclass"] = strings.TrimRight(buyClass, "、")
+			//			}
 			//有效日期
 			var _starttime = (*userData)["l_vip_starttime"]
 			(*userData)["l_vip_starttime"] = strings.Replace(qutil.FormatDateWithObj(&_starttime, qutil.Date_Short_Layout), "-", ".", -1)

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

@@ -30,7 +30,7 @@ var reloadFunc = function(){
     // 添加keyWords检查输入框内是否有文字，如果有才能点击添加按钮
     $('.content .addkeyWord input.enterOne').on('input', function () {
         var buttonDOM = $(this).siblings()[1].children[1]
-        if ($(this).val().length >= 1) {
+        if ($.trim($(this).val()).length >= 1) {
             buttonDOM.style.opacity = 1
             buttonDOM.removeAttribute("disabled")
         } else {
@@ -42,7 +42,7 @@ var reloadFunc = function(){
     // 添加 确认按钮的点击事件
     $('.content .addkeyWord .btn button:nth-child(2)').on('click', function () {
 		setTimeout(function(){
-	        var keyWord = $('.addkeyWord input.enterOne').val();
+	        var keyWord = $.trim($('.addkeyWord input.enterOne').val());
 			if(keyWord==""){
 				return
 			}
@@ -162,7 +162,7 @@ var reloadFunc = function(){
     })
     // 编辑
     $(".showKeyWord").on('click', '.editKeyWord', function (e) {
-        kws_name = $(this).parent().find('.key').text();
+        kws_name = $.trim($(this).parent().find('.key').text());
         //当前关键词数组的位置 是数组的总长度-当前所在的位置-1 数组正序索引
         kws_index = $('.showKeyWord li').length - $(this).parent().parent("li").index() -1;
         if($(this).prev('div').find(".addition").text()!=""){

src/web/templates/weixin/historypush.html

@@ -122,8 +122,10 @@
 				showPage();
 			}else{
 				userId = sessionStorage.userId;
-				if(sessionStorage.getItem(userId+"_searchTime")!=null||sessionStorage.getItem(userId+"_selectCity")){
+				if(sessionStorage.getItem(userId+"_searchTime")!=null){
 					firstTime = sessionStorage.getItem(userId+"_searchTime");
+				}
+				if(sessionStorage.getItem(userId+"_selectCity")){
 					selectCity = sessionStorage.getItem(userId+"_selectCity");
 				}
 				$.ajax({
@@ -237,7 +239,7 @@
 		//页面渲染处理
 		function showPage(){
 			//时间渲染
-			if(firstTime!=""&&firstTime!=null){
+			if(firstTime!=null&&firstTime!=""&&firstTime.length>=10){
 				var _formatDate = formatDate(firstTime/1000,"2");
 				date = formatDate(firstTime/1000,"1");
 				$('#showDatePicker .time_result').html(_formatDate).addClass('current');
@@ -772,6 +774,7 @@
 		    -webkit-box-orient: vertical;
 		}
 		.overClass{
+			/**/
 			overflow: hidden;
 			height:100vh;
 		}

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

@@ -575,12 +575,12 @@
                     return
                 }
                 kws_index = -1
-                kws_name = $('.addkeyWord input.enterOne').val();
+                kws_name = $.trim($('.addkeyWord input.enterOne').val());
             }else{
                if($(th).parent(".modify").find("textarea").val()==""){
                  return
                }
-                kws_name = $(th).parent(".modify").find("textarea").val();
+                kws_name = $.trim($(th).parent(".modify").find("textarea").val());
             }
 			history.replaceState("","","/front/vipsubscribe/toSetKeyWordPage?page=243")
             setSesstion();
@@ -593,12 +593,12 @@
                     return
                 }
                 kws_index = -1
-                kws_name = $('.addkeyWord input.enterOne').val();
+                kws_name = $.trim($('.addkeyWord input.enterOne').val());
             }else{
                if($(th).parent(".modify").find("textarea").val()==""){
                  return
                }
-                kws_name = $(th).parent(".modify").find("textarea").val();
+                kws_name = $.trim($(th).parent(".modify").find("textarea").val());
             }
 			history.replaceState("","","/front/vipsubscribe/toSetKeyWordPage?page=243")
             setSesstion();
@@ -638,7 +638,7 @@
         function saveK(th){
 			setTimeout(function(){
 	            var $this = $(th);
-	            kws_name = $(th).siblings('textarea').val();
+	            kws_name =  $.trim($(th).siblings('textarea').val());
 				if(kws_name==""){
 	                weui.toast('您设置的关键词不能为空，请调整后再添加。', {
 	                    duration: 2000,

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

@@ -74,6 +74,7 @@
 				type: 'post',
 				url: '/subscribepay/afterPay/getPushView',
 				data: reqParam,
+				async: false,
 				dataType: 'json',
 				success: function(data){
 					if(data["list"] == null || data["list"].length == 0){
@@ -187,14 +188,14 @@
 						var keysTemp = keys[n];
 						var isReplace = true;
 						var titleTemp = title;
-						for(var m=0;m<keysTemp.length;m++){
-							var _titleTemp = keyWordHighlight(titleTemp,keysTemp[m],'<font class="keyword">$1</font>');
-							if(titleTemp == _titleTemp){
-								isReplace = false;
-								break;
-							}
-							titleTemp = _titleTemp;
+						//for(var m=0;m<keysTemp.length;m++){
+						var _titleTemp = keyWordHighlight(titleTemp,keysTemp,'<font class="keyword">$1</font>');
+						if(titleTemp == _titleTemp){
+							isReplace = false;
+							//break;
 						}
+						titleTemp = _titleTemp;
+						//}
 						if(isReplace){
 							title = titleTemp;
 						}