Merge pull request #838 from wklken/ft_login_page_tip_fail

fix(login/page): follow-us logo missing
TencentBlueKing · Apr 6, 2022 · 038d7b9 · 038d7b9
2 parents 6909ae7 + 6c7c13c
commit 038d7b9
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 5 deletions.
diff --git a/paas2/VERSION b/paas2/VERSION
@@ -1 +1 @@
-2.14.0
+2.14.1
diff --git a/paas2/login/components/usermgr_api.py b/paas2/login/components/usermgr_api.py
@@ -68,7 +68,7 @@ def upsert_user(username, **kwargs):
 
 
 def get_categories():
-    path = "/api/c/compapi//v2/usermanage/list_categories/"
+    path = "/api/c/compapi/v2/usermanage/list_categories/"
 
     data = {
         "no_page": True,

diff --git a/paas2/login/static/img/logo/qr.png b/paas2/login/static/img/logo/qr.png
diff --git a/paas2/login/templates/account/login.html b/paas2/login/templates/account/login.html
@@ -126,7 +126,7 @@
                     | <a href="http://bk.tencent.com/" target="_blank" hotrep="hp.footer.feedback" class="link">{% trans '产品官网' %}</a>
                     | <a href="###" hotrep="hp.footer.feedback" class="link follow-us" style="z-index:101;">
                         {% trans '关注我们' %}
-                        <span class="qr-box"><img class="qr" src="../../../static/img/logo_ce/qr.png" alt=""></span>
+                        <span class="qr-box" style="right: -20px;"><img class="qr" src="../../../static/img/logo/qr.png" alt=""></span>
                       </a>
 
                     <p>Copyright © 2012-{{NOW.year}} Tencent BlueKing. All Rights Reserved.</p>

diff --git a/paas2/login/templates/account/login_ce.html b/paas2/login/templates/account/login_ce.html
@@ -106,7 +106,7 @@
                     | <a href="http://bk.tencent.com/" target="_blank" hotrep="hp.footer.feedback" class="link">{% trans '产品官网' %}</a>
                     | <a href="###" hotrep="hp.footer.feedback" class="follow-us" style="z-index:101;">
                         {% trans '关注我们' %}
-                        <span class="qr-box"><img class="qr" src="../../../static/img/logo_ce/qr.png" alt=""></span>
+                        <span class="qr-box" style="right: -20px;"><img class="qr" src="../../../static/img/logo_ce/qr.png" alt=""></span>
                     </a>
                 </p>
                 <p>Copyright © 2012-{{NOW.year}} Tencent BlueKing. All Rights Reserved. </p>

diff --git a/paas2/paas/static/img/qr.png b/paas2/paas/static/img/qr.png
diff --git a/paas2/paas/templates/base.html b/paas2/paas/templates/base.html
@@ -182,7 +182,7 @@
                     | <a href="http://bk.tencent.com/" target="_blank" hotrep="hp.footer.feedback" class="link">${_(u'产品官网')}</a>
                     | <a href="###" hotrep="hp.footer.feedback" class="link follow-us" style="z-index:101;">
                       ${_(u'关注我们')}
-                        <span class="qr-box"><img class="qr" src="../../../static/img/logo_ce/qr.png" alt=""></span>
+                        <span class="qr-box"><img class="qr" src="../../../static/img/qr.png" alt=""></span>
                       </a>
 
                     <p>Copyright © 2012-${NOW.year} Tencent BlueKing. All Rights Reserved.</p>

diff --git a/paas2/release.md b/paas2/release.md
@@ -1,5 +1,8 @@
 Release Log
 ===============================
+# 2.14.1
+    - bugfix: login page follow-us missing
+
 # 2.14.0
     - add: paas/ce call usermgr api via esb