|
@@ -65,7 +65,6 @@ func (this *ArticleController) Detail() {
|
|
}
|
|
}
|
|
detail := new(models.ArticleDetail)
|
|
detail := new(models.ArticleDetail)
|
|
hasPermission := 0
|
|
hasPermission := 0
|
|
- hasFree := 0
|
|
|
|
var haveResearch bool
|
|
var haveResearch bool
|
|
//判断是否已经申请过
|
|
//判断是否已经申请过
|
|
applyCount, err := models.GetApplyRecordCount(uid)
|
|
applyCount, err := models.GetApplyRecordCount(uid)
|
|
@@ -90,6 +89,7 @@ func (this *ArticleController) Detail() {
|
|
br.ErrMsg = "判断是否已申请过试用失败,Err:" + err.Error()
|
|
br.ErrMsg = "判断是否已申请过试用失败,Err:" + err.Error()
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+ resp.IsSpecialArticle = true
|
|
if !havePower {
|
|
if !havePower {
|
|
hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermission(user)
|
|
hasPermission, sellerName, sellerMobile, popupMsg, err := services.GetUserHasPermission(user)
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -139,10 +139,9 @@ func (this *ArticleController) Detail() {
|
|
} else {
|
|
} else {
|
|
hasPermission = 2
|
|
hasPermission = 2
|
|
}
|
|
}
|
|
- hasFree = 2
|
|
|
|
|
|
+
|
|
goto Loop
|
|
goto Loop
|
|
} else {
|
|
} else {
|
|
- hasFree = 1
|
|
|
|
var articlePermissionPermissionName string
|
|
var articlePermissionPermissionName string
|
|
if detail.CategoryId > 0 {
|
|
if detail.CategoryId > 0 {
|
|
articlePermission, err := models.GetArticlePermission(detail.CategoryId)
|
|
articlePermission, err := models.GetArticlePermission(detail.CategoryId)
|
|
@@ -404,10 +403,8 @@ Loop:
|
|
detail.ReportLink += "?token=" + chartUserTokenByMobile
|
|
detail.ReportLink += "?token=" + chartUserTokenByMobile
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
resp.HasPermission = hasPermission
|
|
resp.HasPermission = hasPermission
|
|
resp.HaveResearch = haveResearch
|
|
resp.HaveResearch = haveResearch
|
|
- resp.HasFree = hasFree
|
|
|
|
resp.Detail = detail
|
|
resp.Detail = detail
|
|
if user.Mobile != "" {
|
|
if user.Mobile != "" {
|
|
resp.Mobile = user.Mobile
|
|
resp.Mobile = user.Mobile
|