Merge branch 'cygx_10.5' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/config.go

@@ -251,22 +251,27 @@ func (this *BaseConfigController) ResearchIntroduce() {
 		this.ServeJSON()
 	}()
 
-	detail, err := models.GetConfigByCode("research_introduce_img_url")
+	conf, err := models.GetConfigByCode("research_introduce_img_url")
 	if err != nil {
 		br.Msg = "获取数据失败"
 		br.ErrMsg = "买方研选产品介绍信息失败，Err:" + err.Error()
 		return
 	}
-	resp := new(models.ConfigImgListResp)
-	list := strings.Split(detail.ConfigValue, "{|}")
-	if len(list) == 0 {
-		list = make([]string, 0)
+	if conf.ConfigValue == "" {
+		br.Msg = "获取失败"
+		br.ErrMsg = "买方研选产品介绍信息失败"
+		return
+	}
+	list := new(*models.ConfigImgListResp)
+	if err = json.Unmarshal([]byte(conf.ConfigValue), &list); err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "买方研选产品介绍信配置值解析失败, Err: " + err.Error()
+		return
 	}
-	resp.List = list
 	br.Msg = "获取成功！"
 	br.Ret = 200
 	br.Success = true
-	br.Data = resp
+	br.Data = list
 }
 
 // @Title 买方研选报价单（无需token）
@@ -279,22 +284,27 @@ func (this *BaseConfigController) ResearchQuotation() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	detail, err := models.GetConfigByCode("research_quotation_img_url")
+	conf, err := models.GetConfigByCode("research_quotation_img_url")
 	if err != nil {
 		br.Msg = "获取数据失败"
-		br.ErrMsg = "买方研选报价单信息失败，Err:" + err.Error()
+		br.ErrMsg = "买方研选产品介绍信息失败，Err:" + err.Error()
 		return
 	}
-	resp := new(models.ConfigImgListResp)
-	list := strings.Split(detail.ConfigValue, "{|}")
-	if len(list) == 0 {
-		list = make([]string, 0)
+	if conf.ConfigValue == "" {
+		br.Msg = "获取失败"
+		br.ErrMsg = "买方研选产品介绍信息失败"
+		return
+	}
+	list := new(*models.ConfigImgListResp)
+	if err = json.Unmarshal([]byte(conf.ConfigValue), &list); err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "买方研选产品介绍信配置值解析失败, Err: " + err.Error()
+		return
 	}
-	resp.List = list
 	br.Msg = "获取成功！"
 	br.Ret = 200
 	br.Success = true
-	br.Data = resp
+	br.Data = list
 }
 
 // @Title 买方研选升级新资源海报（无需token）

models/config.go

@@ -45,7 +45,12 @@ type ConfigResp struct {
 }
 
 type ConfigImgListResp struct {
-	List []string
+	List []*ConfigImgResp
+}
+
+type ConfigImgResp struct {
+	Img    string `description:"图片"`
+	Height string `description:"高度"`
 }
 
 type ConfigImgHbResp struct {