Forráskód Böngészése

活动添加图片

xingzai 3 éve
szülő
commit
32bbb9333a
2 módosított fájl, 3 hozzáadás és 29 törlés
  1. 3 2
      models/activity.go
  2. 0 27
      routers/commentsRouter_controllers.go

+ 3 - 2
models/activity.go

@@ -154,6 +154,7 @@ type CygxActivityList struct {
 	Label                   string `description:"主题标签"`
 	IsShowSustainable       bool   `description:"是否展示限免标签"`
 	ImgUrl                  string `description:"图片链接"`
+	ImgUrlText              string `description:"图片链接文字"`
 	ActivityType            int    `description:"活动线上线下类型 1线上,0 线下"`
 }
 
@@ -167,7 +168,7 @@ type GetCygxActivityListRep struct {
 //列表
 func GetActivityListAll(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*CygxActivityList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT art.* ,t.activity_type,c.image_url as  img_url,
+	sql := `SELECT art.* ,t.activity_type,t.img_url_text,c.image_url as  img_url,
 		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
 		( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num,
 		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.user_id = ?  AND m.is_cancel = 0  ) AS is_cancel_meeting_reminder
@@ -220,7 +221,7 @@ func GetScheduleCount(condition string, uid int) (count int, err error) {
 //我的日程列表
 func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*CygxActivityList, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT art.*,t.activity_type,c.image_url as  img_url,
+	sql := `SELECT art.*,t.activity_type,t.img_url_text,c.image_url as  img_url,
 			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 AND s.do_fail_type = 0) AS is_signup,
             ( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND  s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num ,
 			( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.is_cancel = 0 AND m.user_id = ? ) AS is_cancel_meeting_reminder

+ 0 - 27
routers/commentsRouter_controllers.go

@@ -169,33 +169,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"],
-        beego.ControllerComments{
-            Method: "Detaisl",
-            Router: "/look/detaisl",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"],
-        beego.ControllerComments{
-            Method: "Industry",
-            Router: "/look/industry",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
-    beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleCommonController"],
-        beego.ControllerComments{
-            Method: "ListApi",
-            Router: "/look/listApi",
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"] = append(beego.GlobalControllerRouter["hongze/hongze_cygx/controllers:ArticleController"],
         beego.ControllerComments{
             Method: "AddStopTime",