Merge branch 'dev3.6' of http://192.168.3.207:10080/qmx/jy into dev3.6

src/jfw/front/singleLogin.go

@@ -64,7 +64,7 @@ func (this *SingleLogin) SingleLogin() error {
 	openid := jyutil.Getopenid(this.GetString("code")) //获取用户openid
 	//登录成功跳转
 	if loginCreateSess(openid, this.Session()) {
-		return this.Redirect(qutil.ObjToString(data["href"]))
+		return this.Redirect(qutil.ObjToString(data["toHref"]))
 	}
 	//未关注跳转
 	if unHref := qutil.ObjToString(data["unHref"]); unHref != "" {

src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -162,14 +162,11 @@ func (p *CommonAction) IsPaySuccess() {
 func (d *CommonAction) GetwxSdkSign() {
 	var sign []string
 	url := d.GetString("url")
-	openId, _ := d.GetSession("s_m_openid").(string)
 	if url != "" {
 		sign = SignJSSDK(url)
 	}
 	d.ServeJson(map[string]interface{}{
-		"wxsdk":     sign,
-		"openid":    se.EncodeString(openId),
-		"webdomain": config.Config.WebDomain,
+		"wxsdk": sign,
 	})
 }