From 98fdcab7c3f04a3969f93a47606f80609fe8e8e6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 四月 2023 11:10:34 +0800
Subject: [PATCH] 2023-04-06
---
public/options.json | 10 +++++-----
src/tabviews/zshare/actionList/index.scss | 7 +++++++
src/tabviews/zshare/actionList/index.jsx | 10 ++++++++--
3 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/public/options.json b/public/options.json
index bedcbee..4e405d0 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,12 +1,12 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "",
"lineColor": "",
"filter": "false",
- "defaultApp": "mkindustry",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
"WXAppID": "",
"WXminiAppID": "",
@@ -17,6 +17,6 @@
"transfer": "false",
"keepPassword": "true",
"platforms": ["H5", "wechat", "android", "ios", "wxMiniProgram"],
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/tabviews/zshare/actionList/index.jsx b/src/tabviews/zshare/actionList/index.jsx
index 10871f6..6880a1f 100644
--- a/src/tabviews/zshare/actionList/index.jsx
+++ b/src/tabviews/zshare/actionList/index.jsx
@@ -50,6 +50,12 @@
}
}
+ componentDidMount() {
+ if (this.buttonRef && this.buttonRef.offsetHeight > 65) {
+ this.buttonRef.classList.add('double-line')
+ }
+ }
+
shouldComponentUpdate (nextProps, nextState) {
return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState))
}
@@ -201,7 +207,7 @@
if (fixed && MenuID) {
return (
<Affix offsetTop={48}>
- <div className="button-list toolbar-button" id={fixed ? MenuID + 'mainaction' : ''}>
+ <div className="button-list toolbar-button" ref={ref => this.buttonRef = ref} id={fixed ? MenuID + 'mainaction' : ''}>
{this.getButtonList(actions)}
{mores ? <Dropdown overlay={<div className="mk-button-dropdown-wrap">{this.getButtonList(mores)}</div>} trigger={['hover']}>
<div className="mk-button-more">鏇村<DownOutlined/></div>
@@ -211,7 +217,7 @@
)
} else {
return (
- <div className="button-list toolbar-button" id={fixed ? MenuID + 'mainaction' : ''}>
+ <div className="button-list toolbar-button" ref={ref => this.buttonRef = ref} id={fixed ? MenuID + 'mainaction' : ''}>
{this.getButtonList(actions)}
{mores ? <Dropdown overlay={<div className="mk-button-dropdown-wrap">{this.getButtonList(mores)}</div>} trigger={['hover']}>
<div className="mk-button-more">鏇村<DownOutlined/></div>
diff --git a/src/tabviews/zshare/actionList/index.scss b/src/tabviews/zshare/actionList/index.scss
index 99ac35f..c811b15 100644
--- a/src/tabviews/zshare/actionList/index.scss
+++ b/src/tabviews/zshare/actionList/index.scss
@@ -26,6 +26,13 @@
display: none;
}
}
+.button-list.toolbar-button.double-line {
+ padding-top: 10px;
+ padding-bottom: 0px;
+ button {
+ margin-bottom: 10px!important;
+ }
+}
.mk-button-more {
display: inline-block;
height: 28px;
--
Gitblit v1.8.0