Merge branch 'tab_name'

controllers/user_login.go

@@ -1004,9 +1004,9 @@ func (this *UserLoginController) CheckUserLdap() {
 	br.Msg = "操作成功"
 }
 
-// ICPLicense
-// @Title icp备案信息
-// @Description icp备案信息
+// BaseInfo
+// @Title 基础信息
+// @Description 基础信息
 // @Success 200 Ret=200 获取成功
 // @router /base_info [get]
 func (this *UserLoginController) BaseInfo() {
@@ -1032,18 +1032,28 @@ func (this *UserLoginController) BaseInfo() {
 		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
 		return
 	}
+
+	tabName, e := models.GetBusinessConfByKey("TabName")
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
+		return
+	}
+
 	type BaseInfoResp struct {
-		Icp      *models.BusinessConf `description:"手机号"`
-		ETATitle *models.BusinessConf `description:"邮箱"`
+		Icp      *models.BusinessConf `description:"Icp信息"`
+		ETATitle *models.BusinessConf `description:"eta系统名称"`
+		TabName  *models.BusinessConf `description:"tab页名称"`
 	}
 
 	resp := BaseInfoResp{
 		Icp:      icp,
 		ETATitle: title,
+		TabName: tabName,
 	}
 
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-}
+}