fix

controller/pc/pc.go

@@ -182,7 +182,7 @@ func ClassifyDetailBanner(c *gin.Context) {
 			Stage:             chapterItem.Stage,
 			ImgUrl:            "",
 			Type:              "报告合集",
-			ShowType: 1,
+			ShowType:          1,
 		}
 		bannerResp = resp
 	} else {
@@ -196,7 +196,7 @@ func ClassifyDetailBanner(c *gin.Context) {
 			return
 		}
 
-		if reportInfo.State != 2 {
+		if reportInfo.State != 2 && reportInfo.State != 6 {
 			response.Fail("报告未发布", c)
 			return
 		}
@@ -296,49 +296,49 @@ func ClassifyDetailBanner(c *gin.Context) {
 	//	"黑色百家谈": utils.ALIYUN_YBIMG_HOST + "wxy.png",
 	//}
 	authorMap := map[string]string{
-		"白昕":  utils.ALIYUN_YBIMG_HOST + "bx.png",
-		"曹阳":  utils.ALIYUN_YBIMG_HOST + "cy.png",
-		"曾硕":  utils.ALIYUN_YBIMG_HOST + "zs.png",
-		"曾滢月": utils.ALIYUN_YBIMG_HOST + "zyy.png",
-		"程品":  utils.ALIYUN_YBIMG_HOST + "cp.png",
-		"高雯宇": utils.ALIYUN_YBIMG_HOST + "gwy.png",
-		"高昕":  utils.ALIYUN_YBIMG_HOST + "gx.png",
-		"高吟":  utils.ALIYUN_YBIMG_HOST + "gy.png",
-		"陈聪聪": utils.ALIYUN_YBIMG_HOST + "ccc.png",
-		"何凯":  utils.ALIYUN_YBIMG_HOST + "hk.png",
-		"黄鑫":  utils.ALIYUN_YBIMG_HOST + "hx.png",
-		"黄逸赟": utils.ALIYUN_YBIMG_HOST + "hyy.png",
-		"黄溢":  utils.ALIYUN_YBIMG_HOST + "hy.png",
-		"李灵":  utils.ALIYUN_YBIMG_HOST + "ll.png",
-		"林秋馨": utils.ALIYUN_YBIMG_HOST + "lqx.png",
-		"刘鼎邦": utils.ALIYUN_YBIMG_HOST + "ldb.png",
-		"钱鹏":  utils.ALIYUN_YBIMG_HOST + "qp.png",
-		"刘艺羡": utils.ALIYUN_YBIMG_HOST + "lyx.png",
-		"戚明之": utils.ALIYUN_YBIMG_HOST + "qmz.png",
-		"秦钏":  utils.ALIYUN_YBIMG_HOST + "qc.png",
-		"施琪":  utils.ALIYUN_YBIMG_HOST + "sq.png",
-		"王存响": utils.ALIYUN_YBIMG_HOST + "wcx.png",
-		"王沛":  utils.ALIYUN_YBIMG_HOST + "wp.png",
-		"苏畅":  utils.ALIYUN_YBIMG_HOST + "sc.png",
-		"史瑾璇": utils.ALIYUN_YBIMG_HOST + "sjx.png",
-		"王亚丹": utils.ALIYUN_YBIMG_HOST + "wyd.png",
-		"虞风":  utils.ALIYUN_YBIMG_HOST + "yf.png",
-		"魏忻悦": utils.ALIYUN_YBIMG_HOST + "wxy.png",
-		"王艺滢": utils.ALIYUN_YBIMG_HOST + "wyy.png",
-		"姚昕泽": utils.ALIYUN_YBIMG_HOST + "yxz.png",
-		"章左昊": utils.ALIYUN_YBIMG_HOST + "zzh.png",
-		"李晓瞳": utils.ALIYUN_YBIMG_HOST + "lxt.png",
+		"白昕":           utils.ALIYUN_YBIMG_HOST + "bx.png",
+		"曹阳":           utils.ALIYUN_YBIMG_HOST + "cy.png",
+		"曾硕":           utils.ALIYUN_YBIMG_HOST + "zs.png",
+		"曾滢月":          utils.ALIYUN_YBIMG_HOST + "zyy.png",
+		"程品":           utils.ALIYUN_YBIMG_HOST + "cp.png",
+		"高雯宇":          utils.ALIYUN_YBIMG_HOST + "gwy.png",
+		"高昕":           utils.ALIYUN_YBIMG_HOST + "gx.png",
+		"高吟":           utils.ALIYUN_YBIMG_HOST + "gy.png",
+		"陈聪聪":          utils.ALIYUN_YBIMG_HOST + "ccc.png",
+		"何凯":           utils.ALIYUN_YBIMG_HOST + "hk.png",
+		"黄鑫":           utils.ALIYUN_YBIMG_HOST + "hx.png",
+		"黄逸赟":          utils.ALIYUN_YBIMG_HOST + "hyy.png",
+		"黄溢":           utils.ALIYUN_YBIMG_HOST + "hy.png",
+		"李灵":           utils.ALIYUN_YBIMG_HOST + "ll.png",
+		"林秋馨":          utils.ALIYUN_YBIMG_HOST + "lqx.png",
+		"刘鼎邦":          utils.ALIYUN_YBIMG_HOST + "ldb.png",
+		"钱鹏":           utils.ALIYUN_YBIMG_HOST + "qp.png",
+		"刘艺羡":          utils.ALIYUN_YBIMG_HOST + "lyx.png",
+		"戚明之":          utils.ALIYUN_YBIMG_HOST + "qmz.png",
+		"秦钏":           utils.ALIYUN_YBIMG_HOST + "qc.png",
+		"施琪":           utils.ALIYUN_YBIMG_HOST + "sq.png",
+		"王存响":          utils.ALIYUN_YBIMG_HOST + "wcx.png",
+		"王沛":           utils.ALIYUN_YBIMG_HOST + "wp.png",
+		"苏畅":           utils.ALIYUN_YBIMG_HOST + "sc.png",
+		"史瑾璇":          utils.ALIYUN_YBIMG_HOST + "sjx.png",
+		"王亚丹":          utils.ALIYUN_YBIMG_HOST + "wyd.png",
+		"虞风":           utils.ALIYUN_YBIMG_HOST + "yf.png",
+		"魏忻悦":          utils.ALIYUN_YBIMG_HOST + "wxy.png",
+		"王艺滢":          utils.ALIYUN_YBIMG_HOST + "wyy.png",
+		"姚昕泽":          utils.ALIYUN_YBIMG_HOST + "yxz.png",
+		"章左昊":          utils.ALIYUN_YBIMG_HOST + "zzh.png",
+		"李晓瞳":          utils.ALIYUN_YBIMG_HOST + "lxt.png",
 		"弘则FICC无锡调研团队": utils.ALIYUN_YBIMG_HOST + "qp.png",
-		"弘则能化组": utils.ALIYUN_YBIMG_HOST + "qmz.png",
-		"弘则有色团队": utils.ALIYUN_YBIMG_HOST + "qp.png",
-		"弘则黑色团队": utils.ALIYUN_YBIMG_HOST + "wp.png",
-		"弘则宏观团队": utils.ALIYUN_YBIMG_HOST + "zzh.png",
-		"张立舟": utils.ALIYUN_YBIMG_HOST + "zlz.png",
-		"郑露": utils.ALIYUN_YBIMG_HOST + "zl.png",
-		"酒子怡": utils.ALIYUN_YBIMG_HOST + "jzy.png",
+		"弘则能化组":        utils.ALIYUN_YBIMG_HOST + "qmz.png",
+		"弘则有色团队":       utils.ALIYUN_YBIMG_HOST + "qp.png",
+		"弘则黑色团队":       utils.ALIYUN_YBIMG_HOST + "wp.png",
+		"弘则宏观团队":       utils.ALIYUN_YBIMG_HOST + "zzh.png",
+		"张立舟":          utils.ALIYUN_YBIMG_HOST + "zlz.png",
+		"郑露":           utils.ALIYUN_YBIMG_HOST + "zl.png",
+		"酒子怡":          utils.ALIYUN_YBIMG_HOST + "jzy.png",
 	}
 
-	if parentClassify.ShowType == 1 || parentClassify.ShowType == 3{
+	if parentClassify.ShowType == 1 || parentClassify.ShowType == 3 {
 		bannerResp.ImgUrl = parentClassify.YbRightBanner
 	} else if url, ok := authorMap[bannerResp.ReportAuthor]; ok {
 		bannerResp.ImgUrl = url
@@ -390,7 +390,7 @@ func Recommend(c *gin.Context) {
 			return
 		}
 
-		if reportInfo.State != 2 {
+		if reportInfo.State != 2 && reportInfo.State != 6 {
 			response.Fail("报告未发布", c)
 			return
 		}
@@ -673,10 +673,10 @@ func PcLogin(c *gin.Context) {
 		item, err := msg_code.GetMsgCode(req.Mobile, req.SmsCode)
 		if err != nil {
 			if err == utils.ErrNoRow {
-				response.Fail("校验验证码失败，Err:" + err.Error(), c)
+				response.Fail("校验验证码失败，Err:"+err.Error(), c)
 				return
 			} else {
-				response.Fail("校验验证码失败，Err:" + err.Error(), c)
+				response.Fail("校验验证码失败，Err:"+err.Error(), c)
 				return
 			}
 		}
@@ -690,7 +690,7 @@ func PcLogin(c *gin.Context) {
 			if err == utils.ErrNoRow {
 				isAdd = true
 			} else {
-				response.Fail("根据手机号获取用户信息失败，Err:" + err.Error(), c)
+				response.Fail("根据手机号获取用户信息失败，Err:"+err.Error(), c)
 				return
 			}
 		}
@@ -717,10 +717,10 @@ func PcLogin(c *gin.Context) {
 		item, err := msg_code.GetMsgCode(req.Email, req.SmsCode)
 		if err != nil {
 			if err == utils.ErrNoRow {
-				response.Fail("校验验证码失败，Err:" + err.Error(), c)
+				response.Fail("校验验证码失败，Err:"+err.Error(), c)
 				return
 			} else {
-				response.Fail("校验验证码失败，Err:" + err.Error(), c)
+				response.Fail("校验验证码失败，Err:"+err.Error(), c)
 				return
 			}
 		}
@@ -733,7 +733,7 @@ func PcLogin(c *gin.Context) {
 			if err == utils.ErrNoRow {
 				isAdd = true
 			} else {
-				response.Fail("根据邮箱获取用户信息失败,Err:" + err.Error(), c)
+				response.Fail("根据邮箱获取用户信息失败,Err:"+err.Error(), c)
 				return
 			}
 		}
@@ -743,7 +743,7 @@ func PcLogin(c *gin.Context) {
 			userId = int(wxUser.UserID)
 		}
 	} else {
-		response.Fail("无效的登录方式,loginType:" + strconv.Itoa(req.LoginType), c)
+		response.Fail("无效的登录方式,loginType:"+strconv.Itoa(req.LoginType), c)
 	}
 	if isAdd {
 		user := new(wx_user.WxUser)
@@ -763,13 +763,13 @@ func PcLogin(c *gin.Context) {
 		user.RegisterPlatform = 2
 		if req.IsFreeLogin {
 			user.IsFreeLogin = 1
-		}else {
+		} else {
 			user.IsFreeLogin = 0
 		}
 
 		lastId, err := user.Add()
 		if err != nil {
-			response.Fail("登录失败,新增客户信息失败,Err:" + err.Error(), c)
+			response.Fail("登录失败,新增客户信息失败,Err:"+err.Error(), c)
 			return
 		}
 		fmt.Println("lastId：", lastId)
@@ -788,7 +788,7 @@ func PcLogin(c *gin.Context) {
 			session.AccessToken = token
 			err = session.Create()
 			if err != nil {
-				response.Fail("登录失败，新增用户session信息失败:" + err.Error(), c)
+				response.Fail("登录失败，新增用户session信息失败:"+err.Error(), c)
 				return
 			}
 		}
@@ -797,13 +797,13 @@ func PcLogin(c *gin.Context) {
 		user.UserID = uint64(userId)
 		if req.IsFreeLogin {
 			user.IsFreeLogin = 1
-		}else {
+		} else {
 			user.IsFreeLogin = 0
 		}
 
 		err := user.Update([]string{"is_free_login"})
 		if err != nil {
-			response.Fail("登录失败,修改登录信息失败,Err:" + err.Error(), c)
+			response.Fail("登录失败,修改登录信息失败,Err:"+err.Error(), c)
 			return
 		}
 	}
@@ -814,13 +814,13 @@ func PcLogin(c *gin.Context) {
 
 	err := wx_user.ModifyFirstLogin(uint64(userId))
 	if err != nil {
-		response.Fail("登录失败，判断权限失败:" + err.Error(), c)
+		response.Fail("登录失败，判断权限失败:"+err.Error(), c)
 		return
 	}
 	var token string
 	tokenItem, err := session.GetTokenByUid(userId)
 	if err != nil && err != utils.ErrNoRow {
-		response.Fail("登录失败，获取token失败:" + err.Error(), c)
+		response.Fail("登录失败，获取token失败:"+err.Error(), c)
 		return
 	}
 
@@ -838,7 +838,7 @@ func PcLogin(c *gin.Context) {
 			session.AccessToken = token
 			err = session.Create()
 			if err != nil {
-				response.Fail("登录失败，新增用户session信息失败:" + err.Error(), c)
+				response.Fail("登录失败，新增用户session信息失败:"+err.Error(), c)
 				return
 			}
 		}
@@ -921,4 +921,4 @@ func GetEmailCode(c *gin.Context) {
 	}
 
 	response.Ok("获取验证码成功", c)
-}
+}

services/activity/activity.go

@@ -174,7 +174,7 @@ func GetActivityDetail(activityId, userId int) (detail *yb_activity.ActivityDeta
 				err = errors.New("获取新报告详情失败, Err: " + e.Error())
 				return
 			}
-			if newReport.State != 2 {
+			if newReport.State != 2 && newReport.State != 6 {
 				detail.ReportLink = ""
 			}
 		} else {

services/report/report.go

@@ -393,8 +393,7 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 		err = errors.New("报告不存在")
 		return
 	}
-
-	if reportInfo.State != 2 {
+	if reportInfo.State != 2 && reportInfo.State != 6 {
 		err = errors.New("报告未发布")
 		return
 	}