Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into yidong_12_21

controllers/activity.go

@@ -562,7 +562,6 @@ func (this *ActivityCoAntroller) ScheduleList() {
 		}
 		if strings.Contains(v.ChartPermissionName, "研选") && v.ActivityTypeId == 1 {
 			list[k].ActivityTypeName = "买方研选电话会"
-			//list[k].ImgUrlText = "https://hongze.oss-cn-shanghai.aliyuncs.com/static/images/202112/20211221/bIdfv8t86xrFRpDOeGGHXOmKEuKl.png"
 			list[k].ImgUrlText = utils.YAN_XUAN_IMG
 		}
 		if v.ActivityType == 0 {

controllers/chart.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"encoding/json"
-	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/services"
@@ -89,7 +88,6 @@ func (this *ChartController) Collection() {
 	var listCollection []*models.HomeChartListResp
 	var total int
 	//var err error
-	fmt.Println(user)
 	chartUserTokenByMobile, _ := services.GetUserTokenByMobile(mobile)
 	if chartUserTokenByMobile != "" {
 		list, err, _ := services.GetChartCollectionByApi(mobile, 9999, 0)
@@ -98,7 +96,6 @@ func (this *ChartController) Collection() {
 			br.ErrMsg = "获取图表分类失败 Err:" + err.Error()
 			return
 		}
-		fmt.Println(len(list))
 		var chartIds string
 		var condition string
 		var pars []interface{}
@@ -448,7 +445,7 @@ func (this *ChartController) Jidu() {
 	var total int
 	var err error
 	chartUserTokenByMobile, _ := services.GetUserTokenByMobile(mobile)
-	chartIds := "5424,5422,5423,5426"
+	chartIds := "5424,5587,5423,5589"
 	if chartUserTokenByMobile != "" {
 		var condition string
 		var pars []interface{}

models/activity.go

@@ -409,7 +409,8 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			art.activity_type_id,
 			art.limit_people_num,
 			1 AS source_type,
-			art.activity_time 
+			art.activity_time, 
+			art.city
 		FROM
 			cygx_activity AS art
 			INNER JOIN cygx_my_schedule AS my ON my.activity_id = art.activity_id
@@ -439,7 +440,8 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			"",
 			"",
 			2 AS source_type,
-			art.activity_time 
+			art.activity_time,
+			""
 		FROM
 			cygx_activity_special AS art
 			INNER JOIN cygx_activity_special_trip AS my ON my.activity_id = art.activity_id 

services/article.go

@@ -1812,7 +1812,6 @@ func ArticleAnnotation(item *models.HomeArticle) (annotation string) {
 	} else {
 		return
 	}
-
 	bodyText, _ := GetReportContentTextSubNew(annotation)
 	if bodyText == "" {
 		return
@@ -1826,6 +1825,7 @@ func ArticleAnnotation(item *models.HomeArticle) (annotation string) {
 		p := doc.Find("p")
 		p.Each(func(tk int, pd *goquery.Selection) {
 			pdText := pd.Text()
+			pdText = strings.Replace(pdText, " ", "", -1)
 			if pdText != "" {
 				textLen := strings.Index(docText, pdText)
 				mapDoc[(strings.Index(docText, pdText))] = pdText
@@ -1835,12 +1835,24 @@ func ArticleAnnotation(item *models.HomeArticle) (annotation string) {
 		li := doc.Find("li")
 		li.Each(func(tk int, li *goquery.Selection) {
 			liText := li.Text()
+			liText = strings.Replace(liText, " ", "", -1)
 			if liText != "" {
 				textLen := strings.Index(docText, liText)
 				mapDoc[(strings.Index(docText, liText))] = strconv.Itoa(tk+1) + "." + liText
 				mapSort = append(mapSort, textLen)
 			}
 		})
+
+		ul := doc.Find("ul")
+		ul.Each(func(tk int, ul *goquery.Selection) {
+			ulText := ul.Text()
+			ulText = strings.Replace(ulText, " ", "", -1)
+			if ulText != "" {
+				textLen := strings.Index(docText, ulText)
+				mapDoc[(strings.Index(docText, ulText))] = ulText
+				mapSort = append(mapSort, textLen)
+			}
+		})
 		if len(mapSort) == 0 {
 			return
 		} else {