From ce37d8236f91da0f5ac1c6a398e94396575e7b5b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 11 七月 2024 16:41:50 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/views/mobdesign/index.scss | 2 +-
src/mob/mobshell/index.jsx | 1 -
src/views/mobdesign/index.jsx | 2 +-
src/menu/menushell/index.jsx | 1 -
src/pc/menushell/index.jsx | 1 -
5 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/menu/menushell/index.jsx b/src/menu/menushell/index.jsx
index 77c601f..6c73b42 100644
--- a/src/menu/menushell/index.jsx
+++ b/src/menu/menushell/index.jsx
@@ -141,7 +141,6 @@
config: item.config,
width: item.width || 24,
name: name,
- floor: 1, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
}
diff --git a/src/mob/mobshell/index.jsx b/src/mob/mobshell/index.jsx
index cada1ef..de4fabb 100644
--- a/src/mob/mobshell/index.jsx
+++ b/src/mob/mobshell/index.jsx
@@ -183,7 +183,6 @@
config: item.config,
width: item.width || 24,
name: name,
- floor: 1, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
}
diff --git a/src/pc/menushell/index.jsx b/src/pc/menushell/index.jsx
index 756d8ce..5d16e71 100644
--- a/src/pc/menushell/index.jsx
+++ b/src/pc/menushell/index.jsx
@@ -153,7 +153,6 @@
config: item.config,
width: item.width || 24,
name: name,
- floor: 1, // 缁勪欢鐨勫眰绾�
isNew: true // 鏂版坊鍔犳爣蹇楋紝鐢ㄤ簬鍒濆鍖�
}
diff --git a/src/views/mobdesign/index.jsx b/src/views/mobdesign/index.jsx
index 253c551..e99d012 100644
--- a/src/views/mobdesign/index.jsx
+++ b/src/views/mobdesign/index.jsx
@@ -2181,7 +2181,7 @@
<Quotecomponent config={config} updateConfig={this.updateConfig}/>
<StyleCombControlButton menu={config} />
<Button className="mk-border-green set-home" disabled={MenuId === appHomeId} onClick={this.setHomeView}><HomeOutlined /> 璁句负棣栭〉</Button>
- <Button className="mk-border-purple set-login" disabled={MenuId === appLoginId} onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
+ <Button className="mk-border-purple" disabled={MenuId === appLoginId} onClick={this.setLoginView}><LoginOutlined /> 璁句负鐧诲綍椤�</Button>
<ReplaceField type="custom" config={config} updateConfig={this.resetConfig}/>
<Transfer MenuID={MenuId} />
{config ? <Versions MenuId={MenuId} Template="webPage" checklog={this.checklog} updateConfig={this.updateLogConfig}/> : null}
diff --git a/src/views/mobdesign/index.scss b/src/views/mobdesign/index.scss
index 4845fb3..0bd4a20 100644
--- a/src/views/mobdesign/index.scss
+++ b/src/views/mobdesign/index.scss
@@ -323,7 +323,7 @@
}
}
.menu-control {
- .quote-wrap, .set-home, .set-login {
+ .quote-wrap, .set-home {
display: none!important;
}
}
--
Gitblit v1.8.0