xiugai

src/jfw/front/swordfish.go

@@ -420,19 +420,19 @@ func (m *Front) WxsearchlistPaging() {
 	userId, _ := m.GetSession("userId").(string)
 	var list *[]map[string]interface{}
 	var secRel *[]map[string]interface{}
+	var b_word, a_word, s_word, secondFlag, secondKWS string
+	var secondList []map[string]interface{}
+	var limitFlag, hasNextPage bool
+	isLimit := 1
 	pageNum, _ := m.GetInteger("pageNum")
+	var keys []interface{}
+	var arrs []string
 	if userId != "" && pageNum <= bidsearch.SearchMaxPageNum_WX {
 		//历史记录和订阅查询
 		one, _ := mongodb.FindById("user", userId, `{"o_jy":1}`)
 		history := redis.GetStr("other", "s_"+userId)
-		arrs := strings.Split(history, ",")
+		arrs = strings.Split(history, ",")
 		searchvalue := strings.TrimSpace(m.GetString("searchvalue"))
-		var b_word, a_word string
-		isLimit := 1
-		limitFlag := false
-		secondKWS := ""
-		secondFlag := ""
-		var secondList []map[string]interface{}
 		if searchvalue != "" {
 			filed := ""
 			if pageNum == 1 {
@@ -477,7 +477,6 @@ func (m *Front) WxsearchlistPaging() {
 				}
 			}
 			if isLimit == 1 {
-				s_word := ""
 				if limitFlag {
 					if pageNum == 1 {
 						list, b_word, a_word, s_word = bidsearch.GetWxsearchlistData(searchvalue, scope, publishtime, subtype, industry, minprice, maxprice, "", buyerclass, hasBuyerTel, hasWinnerTel, pageNum, public.Lst.TotalPage*bidsearch.SearchPageSize_WX, queryItems, filed, notkey)
@@ -552,38 +551,40 @@ func (m *Front) WxsearchlistPaging() {
 			}
 			redis.Del("other", "s_"+userId)
 			redis.Put("other", "s_"+userId, strings.Join(arrs, ","), -1)
+			if list != nil && len(*list) == bidsearch.SearchPageSize_WX {
+				hasNextPage = true
+			}
+			if isPayedUser && pageNum >= bidsearch.SearchMaxPageNum_PayUser {
+				hasNextPage = false
+			} else if !isPayedUser && pageNum >= bidsearch.SearchMaxPageNum_WX {
+				hasNextPage = false
+			} else if limitFlag {
+				hasNextPage = false
+			}
 		}
-		m.T["history"] = arrs
-
 		if one != nil && len(*one) > 0 {
 			o_jy, _ := (*one)["o_jy"].(map[string]interface{})
 			a_key, _ := o_jy["a_key"].([]interface{})
-			var keys []interface{}
 			for _, v := range a_key {
 				keyMap, _ := v.(map[string]interface{})
 				key, _ := keyMap["key"].([]interface{})
 				keys = append(keys, key)
 			}
-			m.T["msgset"] = keys
-		}
-		hasNextPage := list != nil && len(*list) == bidsearch.SearchPageSize_WX && pageNum < bidsearch.SearchMaxPageNum_WX
-		if limitFlag {
-			hasNextPage = false
 		}
-		m.ServeJson(map[string]interface{}{
-			"limitFlag":     limitFlag,
-			"status":        isLimit,
-			"list":          list,
-			"hasNextPage":   hasNextPage,
-			"history":       m.T["history"],
-			"msgset":        m.T["msgset"],
-			"interceptWord": a_word,
-			"keyWord":       b_word,
-			"secondFlag":    secondFlag,
-			"secondList":    secondList,
-			"secondKWS":     secondKWS,
-		})
 	}
+	m.ServeJson(map[string]interface{}{
+		"limitFlag":     limitFlag,
+		"status":        isLimit,
+		"list":          list,
+		"hasNextPage":   hasNextPage,
+		"history":       arrs,
+		"msgset":        keys,
+		"interceptWord": a_word,
+		"keyWord":       b_word,
+		"secondFlag":    secondFlag,
+		"secondList":    secondList,
+		"secondKWS":     secondKWS,
+	})
 }
 
 //微信端删除历史搜索

src/jfw/modules/subscribepay/src/timetask/timetask.go

@@ -252,7 +252,7 @@ func checkIsExpire() {
 					},
 				})
 				if delSess != nil {
-					for _, pushColl := range []string{"pushspace", "pushspace_temp", "pushspace_vip", "pushspace_fail", "pushspace_project"} {
+					for _, pushColl := range []string{"pushspace", "pushspace_temp", "pushspace_vip", "pushspace_project"} {
 						_, err := delSess.DB("push").C(pushColl).RemoveAll(map[string]interface{}{"userid": _id})
 						if err != nil {
 							log.Println("用户", _id, "已到期删除", pushColl, "表数据出错", err)

src/web/staticres/js/wxSupersearch.js

@@ -982,7 +982,7 @@ var SuperSearch = {
               // 每次数据插入，必须重置
               SuperSearch.appendListHtml(html);
               //没有下一页了||跟pc端保持一致 最多显示500条
-              if(!data.hasNextPage||SuperSearch.reqParam["pageNum"]==10){
+              if(!data.hasNextPage){
                 SuperSearch.noMoreData();
                 return;
               }