Browse Source

Tabbar加个版控

hsun 2 years ago
parent
commit
c0b9609e6d
2 changed files with 16 additions and 14 deletions
  1. 2 1
      controller/user/user.go
  2. 14 13
      logic/user/user.go

+ 2 - 1
controller/user/user.go

@@ -254,7 +254,8 @@ func Apply(c *gin.Context) {
 // @Router /user/get_tab_bar [get]
 func GetTabBar(c *gin.Context) {
 	userInfo := userService.GetInfoByClaims(c)
-	tabBarList, err := userLogic.GetUserTabBar(userInfo)
+	version := c.Request.Header.Get("version")
+	tabBarList, err := userLogic.GetUserTabBar(userInfo, version)
 
 	if err != nil {
 		response.Fail("获取失败", c)

+ 14 - 13
logic/user/user.go

@@ -342,21 +342,22 @@ func Apply(userId int, companyId int64, mobile, email string, applyInfo userReq.
 }
 
 // GetUserTabBar 获取用户小程序TabBar
-func GetUserTabBar(userInfo user.UserInfo) (list []string, err error) {
+func GetUserTabBar(userInfo user.UserInfo, version string) (list []string, err error) {
 	// user-我的; activity-活动; chart-图表; report-研报; buy-已购
-	list = []string{"activity", "user", "chart", "report"}
-
-	companyProduct, err := company_product.GetByCompany2ProductId(userInfo.CompanyID, 1)
-	if err != nil {
-		if err == utils.ErrNoRow {
-			err = nil
+	list = []string{"activity", "user", "chart"}
+	if version == "yb3.0" {
+		list = []string{"activity", "user", "chart", "report"}
+		companyProduct, tmpErr := company_product.GetByCompany2ProductId(userInfo.CompanyID, 1)
+		if tmpErr != nil {
+			if tmpErr == utils.ErrNoRow {
+				err = nil
+			}
+			return
+		}
+		// 已购仅付费用户可见
+		if strings.Contains("永续,正式", companyProduct.Status) {
+			list = append(list, "buy")
 		}
-		return
-	}
-	// 已购仅付费用户可见
-	if strings.Contains("永续,正式", companyProduct.Status) {
-		list = append(list, "buy")
 	}
-
 	return
 }