Merge branch 'release' into dev4.6.3.17

src/jfw/front/swordfish.go

@@ -150,7 +150,10 @@ func (m *Front) PcAjaxReq() {
 			_, _, _, pcAjaxFlag, secondFlag, count, totalPage, list = bidsearch.SearchData("pc", m.Request, currentPage, util.ObjToString(m.GetSession("userId")), secondKWS, s_word, area, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, start, bidsearch.SearchPageSize_PC, true, queryItems, field, notkey, isPayedUser)
 		}
 	}
-	secondList, totalPage, _ = bidsearch.LisetData(1, currentPage, list, secondFlag, config.Seoconfig, isPayedUser) //只有前20条
+	_secondList, _totalPage, _ := bidsearch.LisetData(1, currentPage, list, secondFlag, config.Seoconfig, isPayedUser) //只有前20条
+	if secondFlag == "T" {
+		secondList, totalPage = _secondList, _totalPage
+	}
 	m.ServeJson(map[string]interface{}{
 		"limitFlag":     false,
 		"status":        isLimit,