fix:订阅向导跳转携带当前请求参数

src/jfw/front/vipsubscribe.go

@@ -136,7 +136,7 @@ func (s *Subscribepay) ToSetPage() error {
 	userid := util.ObjToString(s.GetSession("userId"))
 	vipMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
 	if vipMsg.VipStatus <= 0 && vipMsg.Status <= 0 && isInTSguide(userid) { //仅免费用户跳转向导页面
-		return s.Redirect("/front/tenderSubscribe/guide")
+		return s.Redirect("/front/tenderSubscribe/guide?url=" + url.QueryEscape(s.Request.RequestURI))
 	} else if vipMsg.VipStatus <= 0 && !vipMsg.IsUpgrade {
 		if s.GetString("advertcode") != "" {
 			return s.Redirect("/wxkeyset/keyset/index?advertcode=" + s.GetString("advertcode"))

src/jfw/front/wxkeyset.go

@@ -5,6 +5,7 @@ import (
 	"jfw/config"
 	"jfw/public"
 	"jfw/wx"
+	"net/url"
 	"qfw/util"
 	"qfw/util/jy"
 	"regexp"
@@ -33,7 +34,7 @@ func (m *Front) WxKeyset(tpl string) error {
 	}
 	vipMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)
 	if (tpl == "index" || tpl == "filterset") && vipMsg.VipStatus <= 0 && vipMsg.Status <= 0 && isInTSguide(userid) { //仅免费用户跳转向导页面
-		return m.Redirect("/front/tenderSubscribe/guide")
+		return m.Redirect("/front/tenderSubscribe/guide?url=" + url.QueryEscape(m.Request.RequestURI))
 	}
 	//到新订阅设置
 	if vipMsg.VipStatus > 0 || vipMsg.IsUpgrade {

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

@@ -4,6 +4,7 @@ import (
 	. "app/jyutil"
 	"encoding/hex"
 	"jfw/public"
+	"net/url"
 	"qfw/util"
 	"qfw/util/jy"
 	"strings"
@@ -121,7 +122,7 @@ func (s *Subscribepay) ToSetPage() {
 	}
 	//仅免费用户跳转向导页面
 	if bigBaseMsg.Status <= 0 && bigBaseMsg.VipStatus <= 0 && isInTSguide(userid) {
-		s.Redirect("/jyapp/tenderSubscribe/guide")
+		s.Redirect("/jyapp/tenderSubscribe/guide?url=" + url.QueryEscape(s.Request.RequestURI))
 	}
 	s.Render("/vipsubscribe/vip_index_new.html")
 }

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

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"jfw/config"
 	"jfw/public"
+	"net/url"
 	"qfw/util"
 	"qfw/util/jy"
 	"regexp"
@@ -22,7 +23,7 @@ func (m *Front) WxKeyset(tpl string) error {
 	userid := util.ObjToString(m.GetSession("userId"))
 	surprise := m.GetSession("surprise")
 	if tpl == "index" && isInTSguide(userid) { //仅免费用户跳转向导页面
-		return m.Redirect("/jyapp/tenderSubscribe/guide")
+		return m.Redirect("/jyapp/tenderSubscribe/guide?url=" + url.QueryEscape(m.Request.RequestURI))
 	}
 	//到新订阅设置
 	vipMsg := jy.GetBigVipUserBaseMsg(userid, public.Mysql, public.MQFW)