feat：完善项目

app/api/website/controller/activity.go

@@ -2,6 +2,7 @@ package controller
 
 import (
 	"SciencesServer/app/api/website/model"
+	config2 "SciencesServer/app/basic/config"
 	"SciencesServer/app/basic/controller"
 	model2 "SciencesServer/app/common/model"
 	"SciencesServer/app/service"
@@ -9,6 +10,7 @@ import (
 	"SciencesServer/config"
 	"errors"
 	"fmt"
+	"strings"
 	"time"
 )
 
@@ -31,7 +33,8 @@ type (
 	ActivityDetail struct {
 		ID string `json:"id"`
 		*model.ActivityInstanceDetail
-		JoinStatus bool `json:"join_status"`
+		Industry string `json:"industry"`
+		IsJoin   bool   `json:"is_join"`
 	}
 )
 
@@ -70,21 +73,21 @@ func (c *Activity) Instance(title, industry string, status, page, pageSize int)
 	list := make([]*ActivityInfo, 0)
 
 	for _, v := range out {
+		v.Image.Image = v.Image.Analysis(config.SystemConfig[config.SysImageDomain])
+
 		data := &ActivityInfo{
 			ID: v.GetEncodeID(), ActivityInstanceInfo: v, IsJoin: v.JoinID > 0, Status: 2,
 		}
-
-		if now.After(v.BeginAt) {
+		if now.Before(v.BeginAt) {
 			data.Status = 1
 			goto CONTINUE
 		}
 
-		if now.Before(v.FinishAt) {
+		if now.After(v.FinishAt) {
 			data.Status = 3
 			goto CONTINUE
 		}
 	CONTINUE:
-
 		list = append(list, data)
 	}
 	return &controller.ReturnPages{Data: list, Count: count}, nil
@@ -99,12 +102,19 @@ func (c *Activity) Detail(id uint64) (*ActivityDetail, error) {
 	if err != nil {
 		return nil, err
 	}
-	mActivityInstance.Image.Image = mActivityInstance.Image.Analysis(config.SystemConfig[config.SysImageDomain])
+	out.Image.Image = out.Image.Analysis(config.SystemConfig[config.SysImageDomain])
+
+	industrys := make([]string, 0)
+
+	for _, v := range out.GetIndustryAttribute() {
+		industrys = append(industrys, config2.GetIndustryInfo(v, "-", "-"))
+	}
 
 	return &ActivityDetail{
 		ID:                     out.GetEncodeID(),
 		ActivityInstanceDetail: out,
-		JoinStatus:             out.JoinID > 0.,
+		Industry:               strings.Join(industrys, "；"),
+		IsJoin:                 out.JoinID > 0.,
 	}, nil
 }