From 93d364fcb99fe6166f517d12563287ed627f4e91 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Tue, 23 Jul 2024 21:42:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GlobalHeader/RightContent.vue | 37 ++++++++++++--------
 src/config/router.config.js                  |  6 ++++
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/components/GlobalHeader/RightContent.vue b/src/components/GlobalHeader/RightContent.vue
index 09e6e0b..58d9d73 100644
--- a/src/components/GlobalHeader/RightContent.vue
+++ b/src/components/GlobalHeader/RightContent.vue
@@ -1,6 +1,7 @@
 <template>
   <div :class="wrpCls">
     <!-- PRO标识 -->
+    <span style="color: #001529; font-size: 14px">商城截止时间：{{ storeInfo.effective_time | formatDate }}</span>
     <div v-if="isPro" class="pro-edition">
       <a-tooltip placement="bottom">
         <template slot="title">
@@ -20,50 +21,58 @@
 <script>
 import AvatarDropdown from './AvatarDropdown'
 // import SelectLang from '@/components/SelectLang'
+import moment from 'moment'
 
 export default {
   name: 'RightContent',
   components: {
-    AvatarDropdown
+    AvatarDropdown,
     // SelectLang
   },
   props: {
     prefixCls: {
       type: String,
-      default: 'ant-pro-global-header-index-action'
+      default: 'ant-pro-global-header-index-action',
     },
     isMobile: {
       type: Boolean,
-      default: () => false
+      default: () => false,
     },
     topMenu: {
       type: Boolean,
-      required: true
+      required: true,
     },
     theme: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
   },
-  data () {
+  data() {
     const currentUser = this.$store.getters.userInfo
     return {
       showMenu: true,
       currentUser,
-      isPro: true
+      isPro: true,
+      storeInfo: '',
     }
   },
+  filters: {
+    formatDate(value) {
+      return value ? moment(value * 1000).format('YYYY-MM-DD HH:mm:ss') : '-'
+    },
+  },
   computed: {
-    wrpCls () {
+    wrpCls() {
       return {
         'ant-pro-global-header-index-right': true,
-        [`ant-pro-global-header-index-${(this.isMobile || !this.topMenu) ? 'light' : this.theme}`]: true
+        [`ant-pro-global-header-index-${this.isMobile || !this.topMenu ? 'light' : this.theme}`]: true,
       }
-    }
+    },
+  },
+  mounted() {
+    this.storeInfo = JSON.parse(window.localStorage.getItem('storeInfo'))
+    console.log(this.storeInfo.effective_time)
   },
-  mounted () {
-
-  }
 }
 </script>
 
diff --git a/src/config/router.config.js b/src/config/router.config.js
index f7e5bfd..0d2bc95 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -1127,6 +1127,12 @@ export const asyncRouterMap = [
             meta: { title: '客服设置', keepAlive: false, permission: ['/setting/customer'] },
             moduleKey: 'setting-customer',
           },
+          {
+            path: '/setting/gmall/index',
+            component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/gmall/index'),
+            meta: { title: '开通商城', keepAlive: false, permission: ['/setting/gmall/index'] },
+            moduleKey: 'setting-customer',
+          },
           // {
           //   path: '/setting/storage',
           //   component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/Storage'),