From ecf1e08c4083948176ada4c875aaf07c37944161 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Mon, 11 Apr 2022 15:54:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/org.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/org.go b/models/org.go index 8b3e60ef84..28a6701c5b 100755 --- a/models/org.go +++ b/models/org.go @@ -208,7 +208,7 @@ func FindTopNMembersOrgs(n int) ([]*OrgScore, error) { } func FindTopNOpenIOrgs(n int) ([]*OrgScore, error) { - sql := "select org_id id,num_score score from org_statistic order by num_score desc limit 10" + strconv.Itoa(n) + sql := "select org_id id,num_score score from org_statistic order by num_score desc limit " + strconv.Itoa(n) return findTopNOrgs(sql) } -- 2.34.1 From 23ad1de661669fc9987d1a46f5d69863971600b7 Mon Sep 17 00:00:00 2001 From: wangjr Date: Tue, 12 Apr 2022 10:24:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/explore/organizations.tmpl | 119 ++++++++++++++++----------- web_src/less/openi.less | 29 +++++-- 2 files changed, 96 insertions(+), 52 deletions(-) diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 58615a8e5b..7f99f1aee3 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -83,27 +83,35 @@
-

{{$.i18n.Tr "org.star"}}

+

{{$.i18n.Tr "org.star"}}

  • {{ range $i,$user :=.StarOrgs}} -
      +
        {{if eq $i 0}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 1}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 2}} -
        - -
        +
      • +
        + +
        +
        • {{else }} -
        - {{Add $i 1}} -
        +
      • +
        + {{Add $i 1}} +
        +
        • {{end}}
      • @@ -111,7 +119,7 @@

      • {{$user.Name}}

        • -
          +
          •  

            {{$user.Score}}

            • @@ -123,27 +131,35 @@
    • -

    {{$.i18n.Tr "org.member"}}

    +

    {{$.i18n.Tr "org.member"}}

  • - {{ range $i,$user :=.StarOrgs}} -
      + {{ range $i,$user :=.MemberOrgs}} +
        {{if eq $i 0}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 1}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 2}} -
        - -
        +
      • +
        + +
        +
        • {{else }} -
        - {{Add $i 1}} -
        +
      • +
        + {{Add $i 1}} +
        +
        • {{end}}
      • @@ -151,7 +167,7 @@

      • {{$user.Name}}

        • -
          +
          •  

            {{$user.Score}}

            • @@ -163,27 +179,36 @@
    • -

    {{$.i18n.Tr "org.active"}}

    +

    {{$.i18n.Tr "org.active"}}

  • - {{ range $i,$user :=.StarOrgs}} -
      + {{ range $i,$user :=.ActiveOrgs }} +
        {{if eq $i 0}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 1}} -
        - -
        +
      • +
        + +
        +
        • {{else if eq $i 2}} -
        - -
        +
      • +
        + +
        +
        • {{else }} -
        - {{Add $i 1}} -
        +
      • +
        + {{Add $i 1}} +
        + +
        • {{end}}
      • @@ -248,4 +273,4 @@ window.onload = function() { } - + \ No newline at end of file diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 4f25e5ffd6..9ca50780ff 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -871,14 +871,13 @@ display: block; line-height: 28px; } .org_icon{ - margin-top: 10px; + margin-top: 2px; margin-right: 10px; padding-left: 15px; + width: 100% ; + text-align: center ; } -.org_icon_num{ - margin-left: 2px; - margin-right: 13px; -} + .org_icon_color{ color: #FA8C16; } @@ -894,6 +893,26 @@ display: block; list-style:none; margin-left: 2px; } +.score{ + position:absolute; + width: 50px; + right:50px; + text-align: center; +} +.wi{ + width: 15%; + line-height: 20px; +} + +.title_icon{ + vertical-align: sub; + font-size: 24px; +} +.title_word{ + vertical-align: middle; + font-size: 18px; + margin-top:1px; +} /**seach**/ /**搜索导航条适配窄屏**/ .seachnav{ -- 2.34.1 From 095d71d752a54d2da0902ce3c32bc2e81c6d1553 Mon Sep 17 00:00:00 2001 From: wangjr Date: Tue, 12 Apr 2022 10:50:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/explore/organizations.tmpl | 4 ++-- web_src/less/openi.less | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 7f99f1aee3..1f8fe51324 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -130,7 +130,7 @@
    • -
    +

    {{$.i18n.Tr "org.member"}}

  • @@ -178,7 +178,7 @@
    • -
    +

    {{$.i18n.Tr "org.active"}}

  • diff --git a/web_src/less/openi.less b/web_src/less/openi.less index c173db1cb5..70f6433808 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -830,6 +830,7 @@ display: block; font-size: 14px; text-align: center; font-family: SourceHanSansSC-light; + font-weight: normal !important; } .title_re{ margin-top: 50px !important; -- 2.34.1 From b867eee4a512365b0453c4d1d165bb10b169ca54 Mon Sep 17 00:00:00 2001 From: wangjr Date: Tue, 12 Apr 2022 10:54:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/explore/organizations.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 1f8fe51324..61574d19aa 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -83,7 +83,7 @@
    -

    {{$.i18n.Tr "org.star"}}

    +

    {{$.i18n.Tr "org.star"}}

  • {{ range $i,$user :=.StarOrgs}} -- 2.34.1 From dd42863c11484e0284ceeafd82bf2b69bc67502a Mon Sep 17 00:00:00 2001 From: wangjr Date: Tue, 12 Apr 2022 11:46:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=BC=94=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/explore/organizations.tmpl | 11 +++++++---- web_src/less/openi.less | 6 +++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 61574d19aa..6d308161d9 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -117,7 +117,7 @@
  • -

    {{$user.Name}}

    + {{$user.Name}}
    • @@ -165,7 +165,7 @@
    • -

      {{$user.Name}}

      + {{$user.Name}}
      • @@ -273,4 +273,7 @@ window.onload = function() { } - \ No newline at end of file + + \ No newline at end of file diff --git a/web_src/less/openi.less b/web_src/less/openi.less index 70f6433808..f7283f69fe 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -888,7 +888,11 @@ display: block; width: 100% ; text-align: center ; } - +.re_style{ + color: rgba(3, 102, 214, 100) !important; + font-family:SourceHanSansSC-medium; + font-weight: 700; +} .org_icon_color{ color: #FA8C16; } -- 2.34.1