|
@@ -268,7 +268,7 @@ func (this *ReportController) IndustryList() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- if len(industrialManagementIds) >0 {
|
|
|
+ if len(industrialManagementIds) > 0 {
|
|
|
// 获取默认图配置
|
|
|
_, videoMap, _, _, e := services.GetMicroRoadShowDefaultImgConfig()
|
|
|
if e != nil {
|
|
@@ -284,13 +284,13 @@ func (this *ReportController) IndustryList() {
|
|
|
}
|
|
|
for _, v := range videoList {
|
|
|
tmp := &models.MicroVideoSimpleInfo{
|
|
|
- Id: v.VideoId,
|
|
|
- Title: "5min逻辑【"+v.IndustryName+"】解析",
|
|
|
- ResourceUrl: v.VideoUrl,
|
|
|
- BackgroundImg: v.ImgUrl,
|
|
|
- PlaySeconds: v.VideoDuration,
|
|
|
- DetailImgUrl: v.DetailImgUrl,
|
|
|
- ChartPermissionId: v.ChartPermissionId,
|
|
|
+ Id: v.VideoId,
|
|
|
+ Title: "5min逻辑【" + v.IndustryName + "】解析",
|
|
|
+ ResourceUrl: v.VideoUrl,
|
|
|
+ BackgroundImg: v.ImgUrl,
|
|
|
+ PlaySeconds: v.VideoDuration,
|
|
|
+ DetailImgUrl: v.DetailImgUrl,
|
|
|
+ ChartPermissionId: v.ChartPermissionId,
|
|
|
ChartPermissionName: v.ChartPermissionName,
|
|
|
}
|
|
|
if tmp.BackgroundImg == "" {
|
|
@@ -300,7 +300,6 @@ func (this *ReportController) IndustryList() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
nowTime := time.Now().Local()
|
|
|
threeMonBefore := nowTime.AddDate(0, -3, 0)
|
|
|
for k, v := range list {
|
|
@@ -471,7 +470,7 @@ func (this *ReportController) ArticleCategoryList() {
|
|
|
|
|
|
videoSimple := new(models.MicroVideoSimpleInfo)
|
|
|
// 权限
|
|
|
- var au *models.UserPermissionAuthInfo
|
|
|
+ var au *models.UserPermissionAuthInfo
|
|
|
video, err := models.GetMicroRoadshowVideoByIndustryId(industrialManagementId)
|
|
|
if err != nil {
|
|
|
if err.Error() != utils.ErrNoRow() {
|
|
@@ -479,9 +478,9 @@ func (this *ReportController) ArticleCategoryList() {
|
|
|
br.ErrMsg = "获取产业视频失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
videoSimple.Id = video.VideoId
|
|
|
- videoSimple.Title = "5min逻辑【"+video.IndustryName+"】解析"
|
|
|
+ videoSimple.Title = "5min逻辑【" + video.IndustryName + "】解析"
|
|
|
videoSimple.BackgroundImg = video.ImgUrl
|
|
|
videoSimple.DetailImgUrl = video.DetailImgUrl
|
|
|
if videoSimple.BackgroundImg == "" {
|
|
@@ -1357,17 +1356,18 @@ func (this *ReportController) IsShow() {
|
|
|
resp.LinkWxExplain = utils.LINK_WX_EXPLAIN
|
|
|
//resp.YanXuan_Explain = true
|
|
|
resp.IsShowFreeButton = IsShowFreeButton
|
|
|
- mobile := user.Mobile
|
|
|
- if mobile == "" {
|
|
|
- br.Ret = 200
|
|
|
- br.Success = true
|
|
|
- br.Data = resp
|
|
|
- return
|
|
|
- }
|
|
|
- total, _ := models.GetUserIsAdminCount(mobile)
|
|
|
- if total > 0 {
|
|
|
- resp.IsShowList = true
|
|
|
- }
|
|
|
+ //mobile := user.Mobile
|
|
|
+ //if mobile == "" {
|
|
|
+ // br.Ret = 200
|
|
|
+ // br.Success = true
|
|
|
+ // br.Data = resp
|
|
|
+ // return
|
|
|
+ //}
|
|
|
+ //total, _ := models.GetUserIsAdminCount(mobile)
|
|
|
+ //if total > 0 {
|
|
|
+ // resp.IsShowList = true
|
|
|
+ //}
|
|
|
+ resp.IsShowList = true
|
|
|
resp.SearchTxtList.SummarySearch = "全局搜索"
|
|
|
resp.SearchTxtList.ReportSearch = "全局搜索"
|
|
|
resp.SearchTxtList.YanXuanSearch = "全局搜索"
|
|
@@ -2799,14 +2799,14 @@ func (this *ReportController) SearchReportAndResource() {
|
|
|
}
|
|
|
for _, v := range videoList {
|
|
|
tmp := &models.MicroVideoSimpleInfo{
|
|
|
- Id: v.VideoId,
|
|
|
- Title: "5min逻辑【"+v.IndustryName+"】解析",
|
|
|
- ResourceUrl: v.VideoUrl,
|
|
|
- BackgroundImg: v.ImgUrl,
|
|
|
- PlaySeconds: v.VideoDuration,
|
|
|
- DetailImgUrl: v.DetailImgUrl,
|
|
|
+ Id: v.VideoId,
|
|
|
+ Title: "5min逻辑【" + v.IndustryName + "】解析",
|
|
|
+ ResourceUrl: v.VideoUrl,
|
|
|
+ BackgroundImg: v.ImgUrl,
|
|
|
+ PlaySeconds: v.VideoDuration,
|
|
|
+ DetailImgUrl: v.DetailImgUrl,
|
|
|
ChartPermissionName: v.ChartPermissionName,
|
|
|
- ChartPermissionId: v.ChartPermissionId,
|
|
|
+ ChartPermissionId: v.ChartPermissionId,
|
|
|
}
|
|
|
if tmp.BackgroundImg == "" {
|
|
|
tmp.BackgroundImg = videoMap[v.ChartPermissionId]
|