wangfuduo
/
twin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: wangfuduo:9bbbf334ac6ae6f8f3362bb44742aaae7b42581b
Branches Tags
wangfuduo:master
wangfuduo:new
..
compare: wangfuduo:fcd5afbe13b866b2d44655c083c8d83d6d8aa3c3
Branches Tags
wangfuduo:master
wangfuduo:new

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

2 changed files with 5 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
app/api/service/button.go
View File

@ -16,7 +16,7 @@ func New(param Params) *Button {
func (b *Button) CouponButton() []*response.Button { func (b *Button) CouponButton() []*response.Button {
return []*response.Button{ return []*response.Button{
{Url: b.param.Str(config.ServiceVipExpireUrl), Type: config.ButtonInput}, {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}, {Text: b.param.Str(config.ButtonTxtContractCustomer), Type: config.ButtonClick},
} }
} }

7
app/api/service/user.go
View File

@ -137,15 +137,16 @@ func (u *User) PkgCheck() *response.Response {
Button(New(u.params).LackButton()...) Button(New(u.params).LackButton()...)
} }
// 先判断是否强制更新：expireCheck 已设置强制更新文案且不可关闭，直接返回 // 先判断是否强制更新
if resp = u.expireCheck(userPkg, u.params.Int(config.ServiceForceUpdateDay)); resp != nil { if resp = u.expireCheck(userPkg, u.params.Int(config.ServiceForceUpdateDay)); resp != nil {
resp.Closable(false).Title(u.params.Str(config.ServiceForceUpdateNotice))
return resp return resp
} }
// 判断是否提示更新：覆盖为更新提示文案，且允许关闭 // 判断是否提示更新
if resp = u.expireCheck(userPkg, u.params.Int(config.ServiceUpdateBeforeDay)); resp != nil { 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")) 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 return resp
} }