|
|
@@ -176,7 +176,6 @@ func GetYiDongToken() (token string, err error) {
|
|
|
|
|
|
//获取易董活动列表
|
|
|
func GetYiDongActivity(cont context.Context) (err error) {
|
|
|
- //func GetYiDongActivity() (err error) {
|
|
|
defer func() {
|
|
|
if err != nil {
|
|
|
fmt.Println(err)
|
|
|
@@ -255,10 +254,6 @@ func GetYiDongActivity(cont context.Context) (err error) {
|
|
|
item.ActivityTimeText = GetActivityTextTime(v.Start)
|
|
|
item.YidongActivityUrl = v.URL
|
|
|
item.ActivityJoinType = v.ActivityJoinType
|
|
|
- if v.IndustrySwName == "电力设备" {
|
|
|
- fmt.Println(item)
|
|
|
- }
|
|
|
- fmt.Println(v.IndustrySwName)
|
|
|
detailYidng, err := GetYiDongActivityDetail(v.ID)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
@@ -415,7 +410,7 @@ func GetActivityTextTime(timeYidong string) (timeText string) {
|
|
|
startTime := utils.StrTimeToTime(strTime)
|
|
|
week := utils.StrDateTimeToWeek(strTime)
|
|
|
timeStrYmd := startTime.Format(utils.FormatDate)
|
|
|
- timeStrHmm := startTime.Format(utils.FormatDateTimeNoSecond)
|
|
|
+ timeStrHmm := startTime.Format(utils.FormatTime)
|
|
|
timeYmd := utils.StrTimeToTime(timeStrYmd + " 12:00:00") //拼接当天中午12点的时间
|
|
|
var amOrPm string
|
|
|
if startTime.After(timeYmd) {
|
xingzai