|
@@ -310,7 +310,7 @@ func PublicSearch(userId, selectType, publishtime string, bidSearchOldUserLimit
|
|
|
func IntegratedData(platform string, s_word, secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, secondFlag, area, publishtime, subtype, buyerclass, notkey string, queryItems []string, list *[]map[string]interface{}) (string, string, string, string, *[]map[string]interface{}) {
|
|
|
var pcAjaxFlag string
|
|
|
secondSearch := false
|
|
|
- var secRel *[]map[string]interface{}
|
|
|
+ var secRel *[]map[string]interface{} = list
|
|
|
for _, item := range queryItems {
|
|
|
if item == "title" {
|
|
|
secondSearch = true
|
|
@@ -440,14 +440,15 @@ func SearchData(platform string, request *http.Request, currentPage int, userId,
|
|
|
count, totalPage, list = GetPcBidSearchData(s_word, area, publishtime, subtype, industry, minprice, maxprice, winner, buyerclass, hasBuyerTel, hasWinnerTel, start, pageSize, isGetCount, queryItems, field, notkey, isPayedUser)
|
|
|
}
|
|
|
|
|
|
- listSize := 0
|
|
|
- if list != nil {
|
|
|
- listSize = len(*list)
|
|
|
- }
|
|
|
if len([]rune(s_word)) > 3 && int(count) < SearchPageSize_PC && start == number {
|
|
|
var paramList *[]map[string]interface{} = list
|
|
|
s_word, pcAjaxFlag, secondFlag, second, list = IntegratedData(platform, s_word, secondKWS, industry, minprice, maxprice, hasBuyerTel, hasWinnerTel, secondFlag, area, publishtime, subtype, buyerclass, notkey, queryItems, paramList)
|
|
|
}
|
|
|
+
|
|
|
+ listSize := 0
|
|
|
+ if list != nil {
|
|
|
+ listSize = len(*list)
|
|
|
+ }
|
|
|
public.SaveUserSearchLog(request, userId, -1, platform, "超级搜索", map[string]interface{}{
|
|
|
"search_word": util.If(platform == "app" || platform == "wx", searchvalue, s_word),
|
|
|
"search_area": area,
|