Merge pull request #840 from wklken/ft_login_page_tip_fail

chore(version): 2.14.2
TencentBlueKing · Apr 6, 2022 · 9d2a871 · 9d2a871
2 parents 038d7b9 + 75f79eb
commit 9d2a871
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/paas2/VERSION b/paas2/VERSION
@@ -1 +1 @@
-2.14.1
+2.14.2
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" style="right: -20px;"><img class="qr" src="../../../static/img/logo/qr.png" alt=""></span>
+                        <span class="qr-box" style="right: -20px;"><img class="qr" src="{{STATIC_URL}}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" style="right: -20px;"><img class="qr" src="../../../static/img/logo_ce/qr.png" alt=""></span>
+                        <span class="qr-box" style="right: -20px;"><img class="qr" src="{{STATIC_URL}}img/logo_ce/qr.png" alt=""></span>
                     </a>
                 </p>
                 <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.2
+    - bugfix: login page follow-us missing
+
 # 2.14.1
     - bugfix: login page follow-us missing