From b02cc6453abb84e956b588111ed9959d9c68a9c5 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 11 Jun 2025 10:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/pay/subInfo.js           | 10 ++++++
 ruoyi-ui/src/layout/components/Navbar.vue | 37 ++++++++++++-----------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ruoyi-ui/src/api/pay/subInfo.js b/ruoyi-ui/src/api/pay/subInfo.js
index 0773675..206f6ce 100644
--- a/ruoyi-ui/src/api/pay/subInfo.js
+++ b/ruoyi-ui/src/api/pay/subInfo.js
@@ -42,3 +42,13 @@ export function delSubInfo(id) {
     method: 'delete'
   })
 }
+
+
+// 查询订阅信息结束时间
+export function endTimeSubInfo(query) {
+  return request({
+    url: '/pay/subInfo/endTime',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index bfd63a0..821db3b 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -5,28 +5,13 @@
     <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
-    <div class="right-menu">
+    <div class="right-menu" style="display: flex">
       <template v-if="device!=='mobile'">
-<!--        <el-tooltip content="驰骋BPM" effect="dark" placement="bottom">
-          <a href="http://ccflow.org/?frm=KonBAI" target="_blank" class="right-menu-item hover-effect">驰骋BPM</a>
-        </el-tooltip>
 
-        <search id="header-search" class="right-menu-item" />
-
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>-->
+        <span v-if="endTime" style="margin-right: 25px;color: #e80000">到期时间：{{ endTime }}</span>
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-<!--        <el-tooltip content="布局大小" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>-->
-
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
@@ -60,6 +45,7 @@ import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
+import { endTimeSubInfo } from "@/api/pay/subInfo";
 
 export default {
   components: {
@@ -95,7 +81,24 @@ export default {
       }
     }
   },
+  data(){
+    return {
+      endTime: null
+    }
+  },
+  created() {
+    console.log(this.$store.state.user.tenantId,555);
+    this.getSubscription()
+  },
   methods: {
+    getSubscription(){
+      if(this.$store.state.user.tenantId){
+        endTimeSubInfo({tenantId:this.$store.state.user.tenantId}).then(response => {
+          console.log(response.rows);
+          this.endTime=response.rows[0].endTime
+        });
+      }
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },