禁止为空

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")

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){

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

@@ -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){
@@ -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/vipsubscribe/keyWord.html

@@ -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"]==""){