From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/pc/menushell/index.jsx |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx
index d55c2de..64d7e2f 100644
--- a/src/pc/menushell/index.jsx
+++ b/src/pc/menushell/index.jsx
@@ -113,6 +113,7 @@
         card: '鍗$墖',
         balcony: '娴姩鍗�',
         timeline: '鏃堕棿杞�',
+        antvG6: '鏍戝浘',
         login: '鐧诲綍'
       }
       let i = 1
@@ -157,8 +158,12 @@
     }
   })
 
+  let style = JSON.stringify(menu.style || {})
+  style = style.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
+  style = JSON.parse(style)
+
   return (
-    <div ref={drop} className="menu-shell-inner" id="menu-shell-inner" style={menu.style}>
+    <div ref={drop} className="menu-shell-inner" id="menu-shell-inner" style={style}>
       <div className="ant-row">
         {cards.map(card => (
           <Card

--
Gitblit v1.8.0