Merge branch 'dev4.6.3.7' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.7

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

@@ -652,7 +652,8 @@ func (s *Front) EntnichePushList() error {
 			s.SetSession("entUserId", entUserId)
 		}
 	}
-	return s.Redirect("/page_entniche/home?f=push&selectTime=" + s.GetString("selectTime"))
+	return s.Redirect("/jyapp/swordfish/historypush?f=push&t=entniche&pushtime=" + s.GetString("selectTime"))
+	//return s.Redirect("/page_entniche/home?f=push&selectTime=" + s.GetString("selectTime"))
 }
 
 //删除模板缓存

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

@@ -424,6 +424,8 @@ func (f *Front) Historypush() error {
 	if f.GetString("f") == "push" {
 		if f.GetString("t") == "member" {
 			f.SetSession(jy.SwitchService.SessionKey, jy.SwitchService.Member)
+		} else if f.GetString("t") == "entniche" {
+			f.SetSession(jy.SwitchService.SessionKey, jy.SwitchService.Entniche)
 		} else {
 			f.SetSession(jy.SwitchService.SessionKey, jy.SwitchService.Vip)
 		}

src/web/staticres/js/pur-search-index-pc.js

@@ -1083,7 +1083,7 @@ var vm = new Vue({
                 dataType: 'json',
                 success: function (r) {
                   if (r.error_code == 0 && r.data) {
-                    $('.tags-box').slideToggle()
+                    // $('.tags-box').slideToggle()
                     _this.getList(_this.listState.pageNum)
                     _this.follow = false
                     _this.claim = false