Browse Source

no message

xingzai 2 years ago
parent
commit
3e8b1a4758
3 changed files with 24 additions and 23 deletions
  1. 20 21
      controllers/activity.go
  2. 1 0
      controllers/article.go
  3. 3 2
      models/article.go

+ 20 - 21
controllers/activity.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/medivhzhan/weapp/v2"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_clpt/models"
 	"hongze/hongze_clpt/services"
@@ -1343,26 +1342,26 @@ func (this *ActivityController) AskAdd() {
 		return
 	}
 	content := req.Content
-	itemToken, err := services.WxGetToken()
-	if err != nil {
-		br.Msg = "GetWxAccessToken Err:" + err.Error()
-		return
-	}
-	if itemToken.AccessToken == "" {
-		br.Msg = "accessToken is empty"
-		return
-	}
-	commerr, err := weapp.MSGSecCheck(itemToken.AccessToken, content)
-	if err != nil {
-		br.Msg = "内容校验失败!"
-		br.ErrMsg = "内容校验失败,Err:" + err.Error()
-		return
-	}
-	if commerr.ErrCode != 0 {
-		br.Msg = "内容违规,请重新提交!"
-		br.ErrMsg = "颜文字内容违规,Err:" + commerr.ErrMSG
-		return
-	}
+	//itemToken, err := services.WxGetToken()
+	//if err != nil {
+	//	br.Msg = "GetWxAccessToken Err:" + err.Error()
+	//	return
+	//}
+	//if itemToken.AccessToken == "" {
+	//	br.Msg = "accessToken is empty"
+	//	return
+	//}
+	//commerr, err := weapp.MSGSecCheck(itemToken.AccessToken, content)
+	//if err != nil {
+	//	br.Msg = "内容校验失败!"
+	//	br.ErrMsg = "内容校验失败,Err:" + err.Error()
+	//	return
+	//}
+	//if commerr.ErrCode != 0 {
+	//	br.Msg = "内容违规,请重新提交!"
+	//	br.ErrMsg = "颜文字内容违规,Err:" + commerr.ErrMSG
+	//	return
+	//}
 	activityId := req.ActivityId
 	activityInfo, errInfo := models.GetAddActivityInfoById(activityId)
 	if activityInfo == nil {

+ 1 - 0
controllers/article.go

@@ -247,6 +247,7 @@ Loop:
 		detail.IsSpecialArticle = true
 	}
 	resp.HasPermission = hasPermission
+	resp.IsSpecialArticle = detail.IsSpecialArticle
 	resp.Detail = detail
 	br.Ret = 200
 	br.Success = true

+ 3 - 2
models/article.go

@@ -40,8 +40,9 @@ type SellerResp struct {
 }
 
 type ArticleDetailResp struct {
-	Detail        *ArticleDetail
-	HasPermission int `description:"1:有该行业权限,正常展示,2:无该行业权限,不存在权益客户下,3:无该品类权限,已提交过申请,4:无该行业权限,未提交过申请,5:潜在客户,未提交过申请,6:潜在客户,已提交过申请"`
+	Detail           *ArticleDetail
+	IsSpecialArticle bool `description:"是否属于专项调研报告"`
+	HasPermission    int  `description:"1:有该行业权限,正常展示,2:无该行业权限,不存在权益客户下,3:无该品类权限,已提交过申请,4:无该行业权限,未提交过申请,5:潜在客户,未提交过申请,6:潜在客户,已提交过申请"`
 }
 
 func GetArticleDetailById(articleId int) (item *ArticleDetail, err error) {