Merge branch 'release/v4.10.5_wh' of qmx/jy into release/v4.10.5

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

@@ -259,9 +259,8 @@ func getAccountVipAttr(session *httpsession.Session, powerRes *pcc.CheckResp) (r
 				}
 			}
 		}
-
 		if gconv.Int64(session.Get("positionType")) == 0 {
-			rData = append(rData, &VipDetail{Name: "超级订阅", EndTime: powerRes.Vip.GetEndTime(), Attr: g.Map{
+		rData = append(rData, &VipDetail{Name: "超级订阅", EndTime: powerRes.Vip.GetEndTime(), Attr: g.Map{
 				"renew":   powerRes.Vip.Upgrade == 1,
 				"upgrade": powerRes.Vip.Upgrade == 0 || powerRes.Vip.Areacount != -1,
 				"buyMsg":  buyMsg,
@@ -270,10 +269,8 @@ func getAccountVipAttr(session *httpsession.Session, powerRes *pcc.CheckResp) (r
 			rData = append(rData, &VipDetail{Name: "超级订阅", EndTime: powerRes.Vip.GetEndTime(), Attr: g.Map{
 				"renew":   qutil.If(gconv.Int64(session.Get("positionType")) == 0, true, powerRes.Vip.Upgrade == 1 && buyed),
 				"upgrade": (powerRes.Vip.Upgrade == 0 || powerRes.Vip.Areacount != -1) && buyed,
-				"buyMsg":  buyMsg,
-			}})
-		}
-
+			"buyMsg":  buyMsg,
+		}})
 	}
 	if powerRes.Free.PpStatus > 0 && len(rData) == 0 {
 		rData = append(rData, &VipDetail{Name: "省份订阅包", EndTime: powerRes.Free.GetPpEndTime(), Attr: g.Map{