From f4f268d9b70a499e5268bf47858fa4454ece47eb Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 16 Sep 2021 09:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E6=8F=90=E9=86=92=E5=95=86?=
 =?UTF-8?q?=E4=B8=9A=E7=89=88=E8=BF=87=E6=9C=9F=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/public/js/components/common/labels.js        | 2 +-
 web/views/@default/@layout.html                  | 2 +-
 web/views/@default/dashboard/boards/index.html   | 8 +++++++-
 web/views/@default/dashboard/boards/index.js     | 1 +
 web/views/@default/settings/authority/index.html | 4 ++--
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/web/public/js/components/common/labels.js b/web/public/js/components/common/labels.js
index eb693078..1e72841a 100644
--- a/web/public/js/components/common/labels.js
+++ b/web/public/js/components/common/labels.js
@@ -26,5 +26,5 @@ Vue.component("micro-basic-label", {
 
 // 灰色的Label
 Vue.component("grey-label", {
-	template: `<span class="ui label basic grey tiny" style="margin-top: 0.4em; font-size: 0.7em; border: 1px solid #ddd!important; font-weight: normal; margin-left: -0.2em"><slot></slot></span>`
+	template: `<span class="ui label basic grey tiny" style="margin-top: 0.4em; font-size: 0.7em; border: 1px solid #ddd!important; font-weight: normal;"><slot></slot></span>`
 })
diff --git a/web/views/@default/@layout.html b/web/views/@default/@layout.html
index d8b877b4..d74b146e 100644
--- a/web/views/@default/@layout.html
+++ b/web/views/@default/@layout.html
@@ -63,7 +63,7 @@
             <a href="" class="item" title="点击切换界面风格" @click.prevent="changeTheme()"><i class="icon adjust"></i></a>
 
             <!-- 企业版 -->
-           <!-- <a :href="'/settings/authority'" class="item" title="企业版" :v-if="teaIsPlus"><i class="icon gem outline yellow"></i></a>-->
+           <!-- <a :href="'/settings/authority'" class="item" title="商业版" :v-if="teaIsPlus"><i class="icon gem outline yellow"></i></a>-->
 
             <!-- 退出登录 -->
             <a :href="Tea.url('logout')" class="item" title="安全退出登录"><i class="icon sign out"></i>
diff --git a/web/views/@default/dashboard/boards/index.html b/web/views/@default/dashboard/boards/index.html
index 3e95ed3c..40aa977e 100644
--- a/web/views/@default/dashboard/boards/index.html
+++ b/web/views/@default/dashboard/boards/index.html
@@ -16,6 +16,12 @@
     <a :href="'/clusters/cluster/createNode?clusterId=' + dashboard.defaultClusterId">还没有在集群中添加节点，现在去添加？添加节点后才可部署网站服务。</a>
 </div>
 
+<!-- 过期提醒 -->
+<div class="ui icon message error" v-if="plusExpireDay.length > 0">
+    <i class="icon warning circle"></i>
+    <strong>续费提醒：商业版服务即将在 {{plusExpireDay}} 过期，请及时续费。</strong>
+</div>
+
 <!-- 升级提醒 -->
 <div class="ui icon message error" v-if="!isLoading && nodeUpgradeInfo.count > 0">
     <i class="icon warning circle"></i>
@@ -41,7 +47,7 @@
 </div>
 <div class="ui icon message error" v-if="!isLoading && authorityNodeUpgradeInfo.count > 0 && teaIsPlus">
     <i class="icon warning circle"></i>
-    <a href="/settings/authority/nodes">升级提醒：有 {{authorityNodeUpgradeInfo.count}} 个企业版认证节点需要升级到 v{{authorityNodeUpgradeInfo.version}} 版本</a><a href="" title="关闭" @click.prevent="closeMessage"><i class="ui icon remove small"></i></a>
+    <a href="/settings/authority/nodes">升级提醒：有 {{authorityNodeUpgradeInfo.count}} 个商业版认证节点需要升级到 v{{authorityNodeUpgradeInfo.version}} 版本</a><a href="" title="关闭" @click.prevent="closeMessage"><i class="ui icon remove small"></i></a>
 </div>
 
 <!-- 统计图表 -->
diff --git a/web/views/@default/dashboard/boards/index.js b/web/views/@default/dashboard/boards/index.js
index 481d6826..15acb614 100644
--- a/web/views/@default/dashboard/boards/index.js
+++ b/web/views/@default/dashboard/boards/index.js
@@ -2,6 +2,7 @@ Tea.context(function () {
 	this.isLoading = true
 	this.trafficTab = "hourly"
 	this.metricCharts = []
+	this.plusExpireDay = ""
 
 	this.$delay(function () {
 		this.$post("$")
diff --git a/web/views/@default/settings/authority/index.html b/web/views/@default/settings/authority/index.html
index 34fa25fe..ffa442ef 100644
--- a/web/views/@default/settings/authority/index.html
+++ b/web/views/@default/settings/authority/index.html
@@ -1,7 +1,7 @@
 {$layout}
 {$template "menu"}
 
-<warning-message v-if="key == null">认证之后，可以使用企业版功能，当前你还没有认证，<a href="http://edge.teaos.cn/docs/Plus/Authority/Index.md" target="_blank">[在这里看认证方法]</a>。</warning-message>
+<warning-message v-if="key == null">认证之后，可以使用商业版功能，当前你还没有认证，<a href="http://edge.teaos.cn/docs/Plus/Authority/Index.md" target="_blank">[在这里看认证方法]</a>。</warning-message>
 
 <div v-if="key != null">
     <div class="margin"></div>
@@ -9,7 +9,7 @@
     <div class="ui message green icon">
         <i class="icon gem outline small yellow"></i>
         <div class="content">
-            恭喜您已经成为尊贵的企业版用户。
+            恭喜您已经成为尊贵的商业版用户。
         </div>
     </div>