Merge branch 'logo'

controllers/user_login.go

@@ -1040,16 +1040,34 @@ func (this *UserLoginController) BaseInfo() {
 		return
 	}
 
+	logoCn, e := models.GetBusinessConfByKey("LogoCN")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
+		return
+	}
+
+	logoEn, e := models.GetBusinessConfByKey("LogoEN")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
+		return
+	}
+
 	type BaseInfoResp struct {
 		Icp      *models.BusinessConf `description:"Icp信息"`
 		ETATitle *models.BusinessConf `description:"eta系统名称"`
 		TabName  *models.BusinessConf `description:"tab页名称"`
+		LogoCn   *models.BusinessConf `description:"中文logo"`
+		LogoEn   *models.BusinessConf `description:"英文logo"`
 	}
 
 	resp := BaseInfoResp{
 		Icp:      icp,
 		ETATitle: title,
 		TabName:  tabName,
+		LogoCn:   logoCn,
+		LogoEn:   logoEn,
 	}
 
 	br.Data = resp