From 46f70ff217554d122d176dc1589516aa0f29f603 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 二月 2023 11:22:57 +0800
Subject: [PATCH] 2023-02-03
---
public/options.json | 10 +++++-----
src/tabviews/custom/components/module/voucher/index.jsx | 1 -
src/tabviews/custom/index.jsx | 2 +-
src/views/systemfunc/sidemenu/config.jsx | 14 +++++++-------
4 files changed, 13 insertions(+), 14 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/custom/components/module/voucher/index.jsx b/src/tabviews/custom/components/module/voucher/index.jsx
index af58823..bc1fd7c 100644
--- a/src/tabviews/custom/components/module/voucher/index.jsx
+++ b/src/tabviews/custom/components/module/voucher/index.jsx
@@ -390,7 +390,6 @@
param.subject_data = window.btoa(window.encodeURIComponent(subject_data.join(';un')))
if (param) {
- console.log(param)
return
}
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 2a9ad66..7c1a501 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -1323,7 +1323,7 @@
return (
<div className={'custom-page-wrap ' + (loadingview || loading ? 'loading' : '')} id={this.state.ContainerId} style={config ? config.style : null}>
{(loadingview || (loading && !config.$cache)) ? <Spin className="view-spin" size="large" /> : null}
- <Row className="component-wrap">{this.getComponents()}</Row>
+ <Row id={config ? 'menu' + config.uuid : ''} className="component-wrap">{this.getComponents()}</Row>
{config && config.interfaces.length > 0 ? <MkInterfaces BID={BID} interfaces={config.interfaces}/> : null}
{config && window.GLOB.breakpoint ? <DebugTable /> : null}
{!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <TableNodes config={config} /> : null}
diff --git a/src/views/systemfunc/sidemenu/config.jsx b/src/views/systemfunc/sidemenu/config.jsx
index 8dbb1f7..9adbd43 100644
--- a/src/views/systemfunc/sidemenu/config.jsx
+++ b/src/views/systemfunc/sidemenu/config.jsx
@@ -77,13 +77,13 @@
MenuNo: 's_custom_scriptM',
MenuName: '鑷畾涔夊嚱鏁�',
}, {
- src: '',
- PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
- type: 'CommonTable',
- MenuID: '1590458676585agbbr63t6ihighg2i1g',
- MenuNo: 'LdropdownmenuNewM',
- MenuName: '閫氱敤涓嬫媺鑿滃崟',
- }, {
+ // src: '',
+ // PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
+ // type: 'CommonTable',
+ // MenuID: '1590458676585agbbr63t6ihighg2i1g',
+ // MenuNo: 'LdropdownmenuNewM',
+ // MenuName: '閫氱敤涓嬫媺鑿滃崟',
+ // }, {
src: '',
PageParam: {OpenType: 'newtab', Template: 'CommonTable'},
type: 'CommonTable',
--
Gitblit v1.8.0