@@ -34,7 +34,7 @@ func GetRecommendOrgs() (RecommendOrgList, error) { | |||||
func getRecommendOrgInfos(e Engine) (RecommendOrgInfoList, error) { | func getRecommendOrgInfos(e Engine) (RecommendOrgInfoList, error) { | ||||
orgs := make(RecommendOrgInfoList, 0, 10) | orgs := make(RecommendOrgInfoList, 0, 10) | ||||
if err := e.Table(&RecommendOrg{}).Join("INNER", "`user`", "`user`.id = `recommend_org`.org_id"). | if err := e.Table(&RecommendOrg{}).Join("INNER", "`user`", "`user`.id = `recommend_org`.org_id"). | ||||
Find(&orgs); err != nil { | |||||
OrderBy("recommend_org.order").Find(&orgs); err != nil { | |||||
return orgs, err | return orgs, err | ||||
} | } | ||||
return orgs, nil | return orgs, nil | ||||
@@ -82,11 +82,6 @@ | |||||
</div> | </div> | ||||
<div class="ui repository list"> | <div class="ui repository list"> | ||||
{{range .RecommendOrgs}} | |||||
<span>{{.Order}} {{.OrgID}} {{.User.Name}}</span> | |||||
{{end}} | |||||
</div> | |||||
<div class="ui repository list"> | |||||
{{range .Repos}} | {{range .Repos}} | ||||
<div class="item"> | <div class="item"> | ||||
{{if .RelAvatarLink}} | {{if .RelAvatarLink}} | ||||
@@ -31,10 +31,19 @@ | |||||
<!-- Swiper --> | <!-- Swiper --> | ||||
<div class="ui container swiper-container"> | <div class="ui container swiper-container"> | ||||
<div class="swiper-wrapper"> | <div class="swiper-wrapper"> | ||||
<!--{{range .RecommendOrgs}} | |||||
<div class="swiper-slide"> | |||||
<div class="ui card"> | |||||
<a class="image" href="{{$.HomeLink}}/{{.User.Name}}"> | |||||
<img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt="{{.User.Name}}" title="{{.User.Name}}"> | |||||
</a> | |||||
</div> | |||||
</div> | |||||
{{end}}--> | |||||
<div class="swiper-slide"> | <div class="swiper-slide"> | ||||
<div class="ui card"> | <div class="ui card"> | ||||
<a class="image" href="https://git.openi.org.cn/OpenI"> | |||||
<img src="/img/org-openi@2x-80.jpg" alt="OpenI" title="OpenI"> | |||||
<a class="image" href="https://git.openi.org.cn/user/avatar/OpenI"> | |||||
<img src="/img/org-openi@2x-80.jpg" alt="OpenI 启智社区" title="OpenI 启智社区"> | |||||
</a> | </a> | ||||
</div> | </div> | ||||
</div> | </div> | ||||