Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into cygx_11.1.1

controllers/home.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hongze_clpt/models"
 	"hongze/hongze_clpt/services"
@@ -496,13 +495,14 @@ func (this *MobileHomeController) NewList() {
 		pageSize = utils.PageSize5
 	} else {
 		condition += ` AND source NOT IN ('activity','activityspecial','newchart') ` + conditionInit
-		conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
+		//conditionActivity, err := services.GetActivityonditionList(user, "", "", "", "1,2,3", "", 0, 0, "", 0, 1)
+		conditionActivity, err := services.ActivityConditioninitSql(user, "", 0)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 			return
 		}
-		conditionActivity += ` AND art.is_limit_people = 1 AND art.publish_status = 1 `
+		conditionActivity += `  AND art.publish_status = 1 `
 		var conditionOrder string
 		conditionOrder = ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
 		conditionActivity += conditionOrder
@@ -578,7 +578,7 @@ func (this *MobileHomeController) NewList() {
 			pars = append(pars, activityspecialIds)
 		}
 	}
-	fmt.Println("condition:", condition)
+
 	total, err = models.GetResourceDataCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"

services/resource_data.go

@@ -209,9 +209,11 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 			return
 		}
 		var activityListRersp []*models.ActivityListResp
-		for _, v := range activityList {
-			activityListRersp = append(activityListRersp, ActivityButtonShow(v, user, make([]string, 0)))
-		}
+		//for _, v := range activityList {
+		//	activityListRersp = append(activityListRersp, ActivityButtonShow(v, user, make([]string, 0)))
+		//}
+		var pArr []string
+		activityListRersp = ActivityArrButtonShow(activityList, user, pArr)
 		//处理不同的报名方式按钮回显
 		mapActivitySignup, e := GetActivitySignupResp(activityIds, user)
 		if e != nil {