Merge branch 'cygx_12.0' of http://8.136.199.33:3000/hongze/hongze_cygx

controllers/yanxuan_special.go

@@ -161,12 +161,14 @@ func (this *YanxuanSpecialController) Detail() {
 	}
 	if item.CompanyTags != "" {
 		resp.Tags += item.CompanyTags
+		resp.CompanyTags = append(resp.CompanyTags, item.CompanyTags)
 	}
 	if item.IndustryTags != "" {
 		if resp.Tags != "" {
 			resp.Tags += ","
 		}
 		resp.Tags += item.IndustryTags
+		resp.IndustryTags = append(resp.IndustryTags, item.IndustryTags)
 	}
 
 	go services.AddSpecialRecord(this.User, specialId)

services/cygx_yanxuan_special.go

@@ -76,9 +76,7 @@ func SendWxMsgSpecialFollow(specialId int) (err error) {
 		openIdArr = append(openIdArr, v.OpenId)
 	}
 	redirectUrl := ""
-	if utils.RunMode == "release" {
-		redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_DETAIL + strconv.Itoa(specialId)
-	}
+	redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_DETAIL + strconv.Itoa(specialId)
 	sendInfo := new(SendWxTemplate)
 	sendInfo.First = first
 	sendInfo.Keyword1 = keyword1
@@ -143,9 +141,7 @@ func SendReviewTemplateMsgAdmin(specialId int) (err error) {
 		openIdArr = append(openIdArr, v.OpenId)
 	}
 	redirectUrl := ""
-	if utils.RunMode == "release" {
-		redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_ENABLE_DETAIL + strconv.Itoa(specialId)
-	}
+	redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_ENABLE_DETAIL + strconv.Itoa(specialId)
 	sendInfo := new(SendWxTemplate)
 	sendInfo.Keyword1 = keyword1
 	sendInfo.Keyword2 = keyword2
@@ -199,14 +195,10 @@ func SendWxMsgSpecialAuthor(specialId, status int) (err error) {
 	keyword1 = "研选专栏内容审核"
 	if status == 1 {
 		keyword2 = "已通过审核，点击查看详情"
-		if utils.RunMode == "release" {
-			redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_DETAIL + strconv.Itoa(specialId)
-		}
+		redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_DETAIL + strconv.Itoa(specialId)
 	} else {
 		keyword2 = "未通过审核，点击查看驳回原因"
-		if utils.RunMode == "release" {
-			redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_CENTER
-		}
+		redirectUrl = utils.WX_MSG_PATH_YX_SPECIAL_CENTER
 	}
 	keyword3 = "-"
 	openIdArr := make([]string, 0)

utils/constants.go

@@ -184,8 +184,8 @@ const (
 	WX_MSG_PATH_YX_SURVEY_DETAIL         = "pages-purchaser/survey/surveyDetail?surveyId="                //用户提交研选调研需求
 	WX_MSG_PATH_APPLY_COLLECTION_DETAIL  = "reportPages/bulletinDetail/bulletinDetail?id="                //精选看板申请详情页
 	WX_MSG_PATH_YX_SPECIAL_DETAIL        = "pages-purchaser/noteAndViewpoint/noteAndViewpoint?id="        //研选专栏详情
-	WX_MSG_PATH_YX_SPECIAL_ENABLE_DETAIL = "pages-purchaser/toExamine/toExamine?id="                      //研选专栏审核详情页面
-	WX_MSG_PATH_YX_SPECIAL_CENTER        = "pages-purchaser/contentAllPage/contentAllPage"                //研选专栏内容中心
+	WX_MSG_PATH_YX_SPECIAL_ENABLE_DETAIL = "pages-purchaser/toExamine/toExamine?isMessage=模板&id="         //研选专栏审核详情页面
+	WX_MSG_PATH_YX_SPECIAL_CENTER        = "pages-purchaser/contentAllPage/contentAllPage?Status=4"       //研选专栏内容中心
 )
 
 //2：文章详情  https://web.hzinsights.com/material/info/8436  小程序路径：/pageMy/reportDetail/reportDetail?id=