From e7c4c96647b065b3a7c823cb0d13341c8393849b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 11 五月 2022 16:34:28 +0800
Subject: [PATCH] 2022-05-11
---
public/options.json | 14 +++++++-------
public/admin.html | 9 +++++----
src/views/design/header/index.jsx | 6 +++---
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/public/admin.html b/public/admin.html
index 7a8f45d..d57675d 100644
--- a/public/admin.html
+++ b/public/admin.html
@@ -20,13 +20,14 @@
if (!config) {
document.body.innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">绯荤粺閰嶇疆淇℃伅鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛橈紒</div>'
} else {
- var url = window.location.href.split(/(index.html)+/ig)[0]
- var appPort = 'admin/index.html'
+ var url = window.location.href.split(/index\.html|#/ig)[0].replace(/\/$/ig, '')
+ var appPort = '/admin/index.html'
+
if (config.defaultApp) {
if ((navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i))) {
- appPort = 'mob/index.html#/index'
+ appPort = '/mob/index.html#/index'
} else {
- appPort = 'pc/index.html#/index'
+ appPort = '/pc/index.html#/index'
}
}
window.location.replace(url + appPort)
diff --git a/public/options.json b/public/options.json
index f5f2215..fa76f1c 100644
--- a/public/options.json
+++ b/public/options.json
@@ -1,18 +1,18 @@
{
- "appId": "202108312122504607B107A83F55B40C98CCF",
- "appkey": "20210831212235413F287EC3BF489424496C8",
+ "appId": "201912040924165801464FF1788654BC5AC73",
+ "appkey": "20191106103859640976D6E924E464D029CF0",
"mainSystemApi": "http://sso.mk9h.cn/cloud/webapi/dostars",
"systemType": "",
"externalDatabase": "false",
"lineColor": "",
"filter": "false",
- "defaultApp": "mkindustry",
+ "defaultApp": "mk",
"defaultLang": "zh-CN",
"WXAppID": "",
"debugger": false,
- "licenseKey": "7EFE13KIKLILIJB64C12",
- "probation": "2021-12-31",
+ "licenseKey": "",
+ "probation": "",
"keepPassword": "true",
- "host": "http://demo.mk9h.cn",
- "service": "erp_new/"
+ "host": "http://qingqiumarket.cn",
+ "service": "MKWMS/"
}
\ No newline at end of file
diff --git a/src/views/design/header/index.jsx b/src/views/design/header/index.jsx
index abf1626..7146bae 100644
--- a/src/views/design/header/index.jsx
+++ b/src/views/design/header/index.jsx
@@ -333,7 +333,7 @@
{editLevel === 'HS' ? <Button className="level4-close" type="primary" onClick={this.exitManage}>閫�鍑�</Button> : null}
{/* 杩涘叆缂栬緫鎸夐挳 */}
{!editLevel && menulist ? <EditOutlined onClick={this.enterEdit} className="edit-check" /> : null}
- {!editLevel && options.sysType === 'local' && window.GLOB.systemType !== 'production' ?
+ {!editLevel && window.GLOB.systemType !== 'production' ?
<div className="app-entrance entrance">
<div className="icon"><AppstoreOutlined /></div>
<div className="title">搴旂敤绠＄悊</div>
@@ -343,7 +343,7 @@
</Button>
</div> : null
}
- {editLevel === 'HS' && options.sysType === 'local' && window.GLOB.systemType === 'production' ?
+ {editLevel === 'HS' && window.GLOB.systemType === 'production' ?
<div className="app-prod-entrance entrance">
<div className="icon"><AppstoreOutlined /></div>
<div className="title">搴旂敤绠＄悊</div>
@@ -353,7 +353,7 @@
</Button>
</div> : null
}
- {!editLevel && options.sysType === 'local' ?
+ {!editLevel ?
<div className="api-entrance entrance">
<div className="icon"><ApiOutlined /></div>
<div className="title">鎺ュ彛璋冭瘯</div>
--
Gitblit v1.8.0