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

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
momo 2023-09-27 11:11:52 +08:00
commit 6eccd11386
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/template_switch_info/template_switch.go
View File

@ -9,6 +9,7 @@ type GetTemplateSwitchInfoRsp struct {
Id int64 `json:"id"` Id int64 `json:"id"`
Material string `json:"material"` Material string `json:"material"`
MaterialData MaterialData `json:"material_data"` MaterialData MaterialData `json:"material_data"`
CombineIsVisible bool `json:"combine_is_visible"` //合图总开关是否开启
} }
type MaterialData struct { type MaterialData struct {
QRcode QRcode `json:"QRcode"` QRcode QRcode `json:"QRcode"`
@ -68,6 +69,7 @@ func GetTemplateSwitchInfo(templateId int64, templateJsonStr *string, templateMa
Material: "/image/logo/aHnT1_rzubdwax_scale.png", Material: "/image/logo/aHnT1_rzubdwax_scale.png",
}, },
}, },
CombineIsVisible: false,
} }
if templateJsonStr == nil || *templateJsonStr == "" { if templateJsonStr == nil || *templateJsonStr == "" {
return returnData return returnData
@ -78,7 +80,7 @@ func GetTemplateSwitchInfo(templateId int64, templateJsonStr *string, templateMa
return returnData return returnData
} }
for _, v := range templateJsonInfo.MaterialList { for _, v := range templateJsonInfo.MaterialList {
if v.Type == "combine" && !v.Visible { if v.Type == "combine" {
return GetTemplateSwitchInfoRsp{ return GetTemplateSwitchInfoRsp{
Id: templateId, Id: templateId,
Material: templateMaterialImg, Material: templateMaterialImg,
@ -87,6 +89,7 @@ func GetTemplateSwitchInfo(templateId int64, templateJsonStr *string, templateMa
Material: "/image/logo/aHnT1_rzubdwax_scale.png", Material: "/image/logo/aHnT1_rzubdwax_scale.png",
}, },
}, },
CombineIsVisible: v.Visible,
} }
} }
switch v.Tag { switch v.Tag {