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

src/jfw/modules/app/src/web/staticres/jyapp/vipsubscribe/js/common.js

@@ -47,9 +47,18 @@ function getAreaClassArr(area){
         provinceArr.push(i)
       }
     }
-    return [provinceArr,cityArr]
+    return [SortArr(provinceArr),SortArr(cityArr)]
 }
 
+//对数组进行排序（拼音）
+function SortArr(arr){
+	arr = arr.sort(function compareFunction(item1, item2) {
+	    return item1.localeCompare(item2);
+	});
+	return arr
+}
+
+
 /* vip订阅价格
 	area:地区 {}
 	industry:行业 []

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

@@ -172,9 +172,9 @@ func (a *AfterPay) SetUserInfo() error {
 			saveData["o_vipjy.i_matchway"] = i_matchway
 		} else if a.GetString("pageType") == "keyWords" {
 			classify_index := a.GetString("classify_index")
-			classify_name := a.GetString("classify_name")
+			classify_name := strings.Trim(a.GetString("classify_name"), " ")
 			kws_index := a.GetString("kws_index")
-			kws_name := a.GetString("kws_name")
+			kws_name := strings.Trim(a.GetString("kws_name"), " ")
 			actionType := a.GetString("actionType")
 			kwscount := a.GetString("kwscount")
 			addtion_kws := a.GetSlice("addition_kws")
@@ -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/common.js

@@ -31,6 +31,24 @@ function getParam(name) {
   return context == null || context == "" || context == "undefined" ? "" : context;
 }
 
+//省份 城市 分类
+function getAreaClassArr_index(area){
+	let cityArr=[];//城市
+    let provinceArr=[];//省份
+    for(var i in area) {
+      let citys=area[i]
+      if(citys.length>0){
+        cityArr = cityArr.concat(citys);
+        provinceArr.push(i+"("+cityArr.join("、")+")")
+      }else{
+    	if(i=="全国"){
+			continue
+		}
+        provinceArr.push(i)
+      }
+    }
+    return SortArr(provinceArr)
+}
 
 //省份 城市 分类
 function getAreaClassArr(area){
@@ -47,9 +65,18 @@ function getAreaClassArr(area){
         provinceArr.push(i)
       }
     }
-    return [provinceArr,cityArr]
+    return [SortArr(provinceArr),SortArr(cityArr)]
+}
+
+//对数组进行排序（拼音）
+function SortArr(arr){
+	arr = arr.sort(function compareFunction(item1, item2) {
+	    return item1.localeCompare(item2);
+	});
+	return arr
 }
 
+
 /* vip订阅价格
 	area:地区 {}
 	industry:行业 []

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
 			}
@@ -71,7 +71,7 @@ var reloadFunc = function(){
 			if($(".showKeyWord li").length>0){
 	        	_index =  Number($(".showKeyWord li:first").find(".editKeyWord").attr("dataIndex")) + Number(1);
 			}
-	        classify_name = $('.classify-r .classify-detail').text();
+	        classify_name = $.trim($('.classify-r .classify-detail').text());
 	        //保存关键词
 	        kws_count = parseInt(kws_count) + 1;
 	        if(kws_count>300){
@@ -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()!=""){
@@ -282,7 +282,7 @@ var reloadFunc = function(){
     })
     // 关键词分类 - 确定按钮点击事件
     $('.classify-edit-pop .dialog__btn_confirm').on('click', function() {
-        classify_name = $('input.classify-keyword').val();
+        classify_name = $.trim($('input.classify-keyword').val());
         // 去空格
         classify_name = classify_name.trim();
         if (classify_name.length === 0) {

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&&sessionStorage.getItem(userId+"_searchTime")!=""){
 					firstTime = sessionStorage.getItem(userId+"_searchTime");
+				}
+				if(sessionStorage.getItem(userId+"_selectCity")!=null&&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,
@@ -855,7 +855,7 @@
             $('.classify-list').on('click', '.classify-item', function() {
                 // 添加一条空历史记录
                 history.pushState({id:1}, "","");
-                classify_name = $(this).find('.classify-item-l').text();
+                classify_name = $.trim($(this).find('.classify-item-l').text());
                 classify_index = $(this).index();
 				kws_index = 0;
                 //展示此关键词信息

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

@@ -11,6 +11,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/rem.js?v={{Msg "seo" "version"}}"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/weui.min.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/css/base.css?v={{Msg "seo" "version"}}" />
     <link rel="stylesheet" type="text/css" href="{{Msg "seo" "cdn"}}/vipsubscribe/iconfont/iconfont.css?v={{Msg "seo" "version"}}" />
@@ -288,8 +289,13 @@
 							}else{
 				                $('.switch').removeClass('checked')
 				            }
-	                        $("._area").text(_vipData["o_area"]);
-	                        $("._buyerClass").text(_vipData["a_buyerclass"]);
+							//地区
+							var area = _vipData["o_area"];
+							var _area = getAreaClassArr_index(area)
+	                        $("._area").text(_area.join("、"));
+							//行业
+							var buyerclass =  SortArr(_vipData["a_buyerclass"]);
+	                        $("._buyerClass").text(buyerclass.join("、"));
 	                        $("._cycleCount").text(_vipData["cycle"]);
 	                        $("._activeDate").text(_userData["l_vip_starttime"]+" - "+_userData["l_vip_endtime"]);
 	                        if(_vipData["a_infotype"]==""){

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;
 						}