fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
laodaming 2023-11-23 15:04:17 +08:00
parent 34d6b01ce6
commit d986228964
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/websocket/internal/logic/ws_render_image.go
View File

@ -223,14 +223,18 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
}
//qrcode不需要依赖合图组开关
if switchInfo.SwitchInfo.QRcode.IfShow && switchInfo.SwitchInfo.QRcode.UserDisabled {
combineReq.Qrcode = &switchInfo.SwitchInfo.QRcode.DefaultValue
if renderImageData.RenderData.Qrcode == "" {
combineReq.Qrcode = &switchInfo.SwitchInfo.QRcode.Text
} else {
combineReq.Qrcode = &renderImageData.RenderData.Qrcode
}
}
//合图组开关开启
if switchInfo.CombineIsVisible {
//开启slogan
if switchInfo.SwitchInfo.Slogan.IfShow && switchInfo.SwitchInfo.Slogan.UserDisabled {
if renderImageData.RenderData.Slogan == "" {
combineReq.Slogan = &switchInfo.SwitchInfo.Slogan.DefaultValue
combineReq.Slogan = &switchInfo.SwitchInfo.Slogan.Text
} else {
combineReq.Slogan = &renderImageData.RenderData.Slogan
}
@ -238,7 +242,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
//开启website
if switchInfo.SwitchInfo.Website.IfShow && switchInfo.SwitchInfo.Website.UserDisabled {
if renderImageData.RenderData.Website == "" {
combineReq.Website = &switchInfo.SwitchInfo.Website.DefaultValue
combineReq.Website = &switchInfo.SwitchInfo.Website.Text
} else {
combineReq.Website = &renderImageData.RenderData.Website
}
@ -246,7 +250,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
//开启address
if switchInfo.SwitchInfo.Address.IfShow && switchInfo.SwitchInfo.Address.UserDisabled {
if renderImageData.RenderData.Address == "" {
combineReq.Address = &switchInfo.SwitchInfo.Address.DefaultValue
combineReq.Address = &switchInfo.SwitchInfo.Address.Text
} else {
combineReq.Address = &renderImageData.RenderData.Address
}
@ -254,7 +258,7 @@ func (w *wsConnectItem) renderImage(renderImageData websocket_data.RenderImageRe
//开启Phone
if switchInfo.SwitchInfo.Phone.IfShow && switchInfo.SwitchInfo.Phone.UserDisabled {
if renderImageData.RenderData.Phone == "" {
combineReq.Phone = &switchInfo.SwitchInfo.Phone.DefaultValue
combineReq.Phone = &switchInfo.SwitchInfo.Phone.Text
} else {
combineReq.Phone = &renderImageData.RenderData.Phone
}

10
utils/template_switch_info/template_switch.go
View File

@ -23,31 +23,26 @@ type QRcode struct {
IfShow bool `json:"if_show"`
UserDisabled bool `json:"user_disabled"`
Text string `json:"text"`
DefaultValue string `json:"default_value"`
}
type Website struct {
IfShow bool `json:"if_show"`
UserDisabled bool `json:"user_disabled"`
Text string `json:"text"`
DefaultValue string `json:"default_value"`
}
type Address struct {
IfShow bool `json:"if_show"`
UserDisabled bool `json:"user_disabled"`
Text string `json:"text"`
DefaultValue string `json:"default_value"`
}
type Slogan struct {
IfShow bool `json:"if_show"`
UserDisabled bool `json:"user_disabled"`
Text string `json:"text"`
DefaultValue string `json:"default_value"`
}
type Phone struct {
IfShow bool `json:"if_show"`
UserDisabled bool `json:"user_disabled"`
Text string `json:"text"`
DefaultValue string `json:"default_value"`
}
type Logo struct {
Material string `json:"material"`
@ -72,23 +67,18 @@ func GetTemplateSwitchInfo(templateId int64, templateJsonStr *string, templateMa
SwitchInfo: SwitchInfo{
QRcode: QRcode{
UserDisabled: true,
DefaultValue: "your qrcode",
},
Website: Website{
UserDisabled: true,
DefaultValue: "your website",
},
Address: Address{
UserDisabled: true,
DefaultValue: "your address",
},
Phone: Phone{
UserDisabled: true,
DefaultValue: "your phone",
},
Slogan: Slogan{
UserDisabled: true,
DefaultValue: "your slogan",
},
Logo: Logo{
Material: "/image/logo/aHnT1_rzubdwax_scale.png",