Merge branch 'release' into dev4.6.3.9

src/jfw/front/wxkeyset.go

@@ -35,6 +35,10 @@ func (m *Front) WxKeyset(tpl string) error {
 	if (tpl == "index" || tpl == "filterset") && vipMsg.VipStatus <= 0 && vipMsg.Status <= 0 && isInTSguide(userid) { //仅免费用户跳转向导页面
 		return m.Redirect("/front/tenderSubscribe/guide")
 	}
+	//到新订阅设置
+	if vipMsg.IsUpgrade {
+		return m.Redirect("/front/vipsubscribe/toSubVipSetPage")
+	}
 	if tpl == "seniorset" {
 		data, ok := mongodb.FindById("user", userid, `{"o_jy":1}`)
 		if ok && data != nil && len(*data) > 0 {
@@ -46,23 +50,14 @@ func (m *Front) WxKeyset(tpl string) error {
 		}
 	}
 	s_surprise := ""
-	b_isNew := false
 	if tpl == "index" || tpl == "filterset" {
 		data, ok := mongodb.FindById("user", userid, `{"o_jy":1}`)
 		var o_jy map[string]interface{}
 		if ok && data != nil && len(*data) > 0 {
 			o_jy, _ = (*data)["o_jy"].(map[string]interface{})
 			s_surprise = util.ObjToString(o_jy["s_surprise"])
-			//"i_newfree":    1, //新免费用户=>新订阅设置页面 20211122
-			if util.IntAll(o_jy["i_newfree"]) > 0 {
-				b_isNew = true
-			}
 		}
 	}
-	//到新订阅设置
-	if b_isNew {
-		return m.Redirect("/front/vipsubscribe/toSubVipSetPage")
-	}
 	m.T["s_surprise"] = s_surprise
 	m.T["surprise"] = surprise
 	m.T["openid"] = se.EncodeString(util.ObjToString(m.GetSession("s_m_openid")))