Compare commits

..

No commits in common. "9bbbf334ac6ae6f8f3362bb44742aaae7b42581b" and "fcd5afbe13b866b2d44655c083c8d83d6d8aa3c3" have entirely different histories.

2 changed files with 5 additions and 4 deletions

View File

@ -16,7 +16,7 @@ func New(param Params) *Button {
func (b *Button) CouponButton() []*response.Button {
return []*response.Button{
{Url: b.param.Str(config.ServiceVipExpireUrl), Type: config.ButtonInput},
{Text: b.param.Str(config.ServiceCouponSubmitButton), Type: config.ButtonClick},
{Text: "提交", Type: config.ButtonClick},
{Text: b.param.Str(config.ButtonTxtContractCustomer), Type: config.ButtonClick},
}
}

View File

@ -137,15 +137,16 @@ func (u *User) PkgCheck() *response.Response {
Button(New(u.params).LackButton()...)
}
// 先判断是否强制更新expireCheck 已设置强制更新文案且不可关闭,直接返回
// 先判断是否强制更新
if resp = u.expireCheck(userPkg, u.params.Int(config.ServiceForceUpdateDay)); resp != nil {
resp.Closable(false).Title(u.params.Str(config.ServiceForceUpdateNotice))
return resp
}
// 判断是否提示更新:覆盖为更新提示文案,且允许关闭
// 判断是否提示更新
if resp = u.expireCheck(userPkg, u.params.Int(config.ServiceUpdateBeforeDay)); resp != nil {
msg := fmt.Sprintf(u.params.Str(config.ServiceUpdateNotice), time.Unix(userPkg.Pkg.ExpireTime, 0).Format("2006-01-02"))
resp.Closable(true).Message(msg)
resp.Closable(true).Title(msg)
return resp
}