Merge branch 'small_242'

controllers/user_login.go

@@ -1044,12 +1044,29 @@ func (this *UserLoginController) BaseInfo() {
 		return
 	}
 
+	logoCnMini, e := models.GetBusinessConfByKey("LogoCNMini")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
+		return
+	}
+
+	logoEnMini, e := models.GetBusinessConfByKey("LogoENMini")
+	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"`
+		LogoCnMini   *models.BusinessConf `description:"中文logoMini"`
+		LogoEnMini   *models.BusinessConf `description:"英文logoMini"`
 	}
 
 	resp := BaseInfoResp{
@@ -1058,6 +1075,8 @@ func (this *UserLoginController) BaseInfo() {
 		TabName:  tabName,
 		LogoCn:   logoCn,
 		LogoEn:   logoEn,
+		LogoCnMini:   logoCnMini,
+		LogoEnMini:   logoEnMini,
 	}
 
 	br.Data = resp