Merge branch 'cygx_9.8' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -958,6 +958,9 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				if signupType == 1 {
 					go services.ActivityUserRemind(user, activityInfo, 1)
 					resp.PopupMsg = item.CountryCode + "-" + item.Mobile + "<br/>预约成功，已加入您的活动日程<br/><br/>想要及时获取活动时间变更通知，请关注【查研观向小助手】公众号"
+				} else if signupType == 4 {
+					go services.ActivityUserRemind(user, activityInfo, 4)
+					resp.PopupMsg = item.CountryCode + "-" + item.Mobile + "<br/>报名成功，请复制腾讯会议号打开腾讯会议app参会<br/><br/>想要及时获取活动时间变更通知，请关注【查研观向小助手】公众号"
 				} else {
 					go services.ActivityUserRemind(user, activityInfo, 4)
 					resp.PopupMsg = "报名成功，已加入您的活动日程<br/><br/>想要及时获取活动时间变更通知，请关注【查研观向小助手】公众号"

models/activity.go

@@ -1031,6 +1031,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			art.limit_people_num,
 			art.is_limit_people,
 			1 AS source_type,
+			art.is_yidong_conduct,
 			art.activity_time 
 		FROM
 			cygx_activity AS art
@@ -1060,6 +1061,7 @@ func GetActivitySpecialSearcheList(condition string, pars []interface{}, conditi
 			"",
 			"",
 			2 AS source_type,
+			"",
 			art.activity_time 
 		FROM
 			cygx_activity_special AS art