Merge branch 'dev2.5.6' of http://192.168.3.207:10080/qmx/jy into dev2.5.6

src/jfw/modules/app/src/app/front/swordfish.go

@@ -860,7 +860,6 @@ func getHistorypush(lasttime, infotime int64, openid string, res []map[string]in
 				info["visit"] = vsidList
 				//				log.Println("info", info)
 				tmp := changeMapKeyForCass(info)
-				//		m.T["data"] = val
 				if ats, ok := tmp["o_pushinfo"].(map[string]interface{}); ok {
 					thistime = util.Int64All(tmp["l_date"])
 					count += len(ats)
@@ -1064,11 +1063,12 @@ func (m *Front) WxpushAjaxReq() error {
 	defer util.Catch()
 	vsid := m.GetString("vsid")
 	pdate := m.GetString("_id")
+	openid := m.Session().Get("s_m_openid")
 	//	log.Println("vsid", vsid)
 	//	log.Println("pdate", pdate)
 	if util.Int64All(pdate) > 0 {
 		visit := map[string]interface{}{
-			"openid": m.Session().Get("s_m_openid"),
+			"openid": openid,
 			"pdate":  pdate,
 			"vsid":   vsid,
 			"date":   time.Now(),

src/jfw/modules/app/src/web/templates/weixin/historypush.html

@@ -119,7 +119,7 @@ function initpage(){
 			noMoreData(wxflag,1);
 		}
 		$(window).scrollTop(scrollTop);
-		// sessionStorage.removeItem("historypushDataCache");
+		sessionStorage.removeItem("historypushDataCache");
 		sessionStorage.removeItem("historypushListCache");
 		sessionStorage.removeItem("historypushTableCache");
 		sessionStorage.removeItem("historypushLasttimeCache");
@@ -554,7 +554,7 @@ function setSessionStorage(){
 
 function setVisitedIndex(obj,eid){
 	// console.log(obj.hasClass("visited")+"--------");
-	if(obj.find("a.bt").hasClass("visit")||obj.hasClass("visited")){
+	if(obj.find("a.bt").hasClass("visited")||obj.hasClass("visited")){
 		return;
 	}
 	obj.find("a.bt").addClass("visited");