超级订阅预览和大会员预览

src/jfw/modules/app/src/web/templates/big-member/page_bigvip_viewpage.html

@@ -240,14 +240,14 @@
 						var keysTemp = keys[n];
 						var isReplace = true;
 						var titleTemp = title;
-						//for(var m=0;m<keysTemp.length;m++){
-                        var _titleTemp = keyWordHighlight(titleTemp,keysTemp,'<font class="keyword">$1</font>');
-						if(titleTemp == _titleTemp){
-							isReplace = false;
-							//break;
+						for(var m=0;m<keysTemp.split("++").length;m++){
+              var _titleTemp = keyWordHighlight(titleTemp,keysTemp.split("++")[m],'<font class="keyword">$1</font>');
+  						if(titleTemp == _titleTemp){
+  							isReplace = false;
+  							break;
+  						}
+  						titleTemp = _titleTemp;
 						}
-						titleTemp = _titleTemp;
-						//}
 						if(isReplace){
 							title = titleTemp;
 						}

src/jfw/modules/app/src/web/templates/vipsubscribe/vip_viewPage.html

@@ -241,14 +241,14 @@
 						var keysTemp = keys[n];
 						var isReplace = true;
 						var titleTemp = title;
-						//for(var m=0;m<keysTemp.length;m++){
-                        var _titleTemp = keyWordHighlight(titleTemp,keysTemp,'<font class="keyword">$1</font>');
-						if(titleTemp == _titleTemp){
-							isReplace = false;
-							//break;
+						for(var m=0;m<keysTemp.split("++").length;m++){
+              var _titleTemp = keyWordHighlight(titleTemp,keysTemp.split("++")[m],'<font class="keyword">$1</font>');
+  						if(titleTemp == _titleTemp){
+  							isReplace = false;
+  							break;
+  						}
+  						titleTemp = _titleTemp;
 						}
-						titleTemp = _titleTemp;
-						//}
 						if(isReplace){
 							title = titleTemp;
 						}

src/jfw/modules/bigmember/src/util/view.go

@@ -48,9 +48,15 @@ func SubViewDatas(userId, allquery string, pageNum int) (keys []interface{}, lis
 		return
 	}
 	for _, v := range sql.Keyword {
+		var keys_one []string
 		for _, k := range v.Keyword {
-			keys = append(keys, k)
+			keys_one = append(keys_one, k)
 		}
+		//dev3.5 附加词也要高亮
+		for _, k := range v.Appended {
+			keys_one = append(keys_one, k)
+		}
+		keys = append(keys, strings.Join(keys_one, "++"))
 	}
 	qstr := GetMemberViewSql(sql)
 	list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, (pageNum-1)*view_pageSize, view_pageSize, 0, false)

src/jfw/modules/subscribepay/src/util/vrew.go

@@ -47,9 +47,15 @@ func SubViewDatas(userId, allquery string, pageNum int) (keys []interface{}, lis
 	}
 	sql := GetSqlObjFromId(userId)
 	for _, v := range sql.Keyword {
+		var keys_one []string
 		for _, k := range v.Keyword {
-			keys = append(keys, k)
+			keys_one = append(keys_one, k)
 		}
+		//dev3.5 附加词也要高亮
+		for _, k := range v.Appended {
+			keys_one = append(keys_one, k)
+		}
+		keys = append(keys, strings.Join(keys_one, "++"))
 	}
 	qstr := GetVIPViewSql(sql)
 	list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSearch_sort, bidSearch_field, (pageNum-1)*view_pageSize, view_pageSize, 0, false)

src/web/staticres/vipsubscribe/js/keyset-list.js

@@ -193,7 +193,7 @@ var keySet = new Vue({
             _this.footerReminderShow = true
           } else {
             // 清除订阅页面缓存
-            _this.clearHistoryPushDataCache()
+            //_this.clearHistoryPushDataCache()//dev3.5 免费用户搜索列表进入订阅设置 此处清除列表缓存，ios客户端返回后重新请求数据 页面缓存导致数据重复。
           }
 
           // 下次DOM更新后初始化Swiper

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

@@ -248,14 +248,14 @@
 						var keysTemp = keys[n];
 						var isReplace = true;
 						var titleTemp = title;
-						//for(var m=0;m<keysTemp.length;m++){
-						var _titleTemp = keyWordHighlight(titleTemp,keysTemp,'<font class="keyword">$1</font>');
-						if(titleTemp == _titleTemp){
-							isReplace = false;
-							//break;
+						for(var m=0;m<keysTemp.split("++").length;m++){
+              var _titleTemp = keyWordHighlight(titleTemp,keysTemp.split("++")[m],'<font class="keyword">$1</font>');
+  						if(titleTemp == _titleTemp){
+  							isReplace = false;
+  							break;
+  						}
+  						titleTemp = _titleTemp;
 						}
-						titleTemp = _titleTemp;
-						//}
 						if(isReplace){
 							title = titleTemp;
 						}