Merge branch 'cygx_8.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -1051,7 +1051,7 @@ func (this *ActivityCoAntroller) Detail() {
 			}
 		}
 		//8.5 买方研选的活动去掉限免标签
-		if strings.Contains(activityInfo.ChartPermissionName, "研选"){
+		if strings.Contains(activityInfo.ChartPermissionName, "研选") {
 			activityInfo.IsShowSustainable = false
 		}
 		//处理按钮是否展示问题

models/activity.go

@@ -1021,7 +1021,7 @@ func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pa
 	}
 	if filter == 1 {
 		sqlJiontable = ` INNER JOIN cygx_activity_video AS av ON av.activity_id = art.activity_id `
-	} else if filter == 2{
+	} else if filter == 2 {
 		sqlJiontable = ` INNER JOIN cygx_activity_voice AS ac ON ac.activity_id = art.activity_id `
 	}
 

services/activity_my_schedule.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
@@ -101,11 +102,12 @@ func GetScheduleAndSpecilList(user *models.WxUserItem, condition string, startSi
 				if resultTimeStart.After(time.Now()) {
 					list[k].ActiveState = strconv.Itoa(1)
 				} else if time.Now().After(resultTimeEnd) {
-					list[k].ActiveState = strconv.Itoa(2)
-				} else {
 					list[k].ActiveState = strconv.Itoa(3)
+				} else {
+					list[k].ActiveState = strconv.Itoa(2)
 				}
 			}
+			fmt.Println(list[k].ActiveState)
 		}
 	}
 	items = list

services/activity_special.go

@@ -105,7 +105,7 @@ func GetActivityLabelSpecialList(user *models.WxUserItem, isPower int, chartPerm
 		}
 	}
 	var pars []interface{}
-	condition = ` AND art.publish_status = 1  AND art.label != '' `
+	condition = ` AND art.publish_status = 1  AND art.label != ''  AND art.is_offline = 0 `
 
 	//行业名称
 	if isPower == 1 {