From bcfdd76965b8070f983cbd4185f5fb8fbd569efe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 26 二月 2021 13:39:40 +0800
Subject: [PATCH] 2021-02-26
---
src/index.js | 2 +-
src/views/appmanage/index.scss | 4 ++--
src/api/index.js | 2 +-
src/views/appmanage/index.jsx | 6 +++---
src/views/pcdesign/index.jsx | 4 +++-
src/views/login/index.jsx | 1 +
6 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index f84456f..cc33aa0 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -330,7 +330,7 @@
if (clear) {
CacheUtils.clearIndexDBConfig()
- } else if (res.menu_data && res.menu_data.length > 0) {
+ } else {
let keys = res.menu_data.map(mid => `'${mid.menuid}'`)
CacheUtils.delIndexDBConfig(keys)
}
diff --git a/src/index.js b/src/index.js
index 388d2c3..6640d46 100644
--- a/src/index.js
+++ b/src/index.js
@@ -59,7 +59,7 @@
// 娴嬭瘯绯荤粺鏂囦欢缃簬admin涓�
-fetch(process.env.NODE_ENV === 'production' && options.sysType === 'local' ? '../options.json' : './options.json')
+fetch('/options.json')
.then(response => response.json())
.catch(() => {
document.getElementById('root').innerHTML = '<div style="text-align: center; font-size: 30px; margin-top: 40vh;">绯荤粺閰嶇疆淇℃伅鑾峰彇澶辫触锛岃鑱旂郴绠＄悊鍛橈紒</div>'
diff --git a/src/views/appmanage/index.jsx b/src/views/appmanage/index.jsx
index 983caff..ee1fa6b 100644
--- a/src/views/appmanage/index.jsx
+++ b/src/views/appmanage/index.jsx
@@ -90,17 +90,17 @@
}
},
{
- title: '鏍囬', dataIndex: 'title', key: 'title', align: 'center', width: '150px'
+ title: '鏍囬', dataIndex: 'title', key: 'title', align: 'center', width: '170px'
},
{
- title: '鍥炬爣', dataIndex: 'favicon', key: 'favicon', align: 'center', width: '150px',
+ title: '鍥炬爣', dataIndex: 'favicon', key: 'favicon', align: 'center', width: '120px',
render: (text, record) => (text ? <img style={{width: '32px', height: '32px'}} src={text} alt="" /> : null)
},
{
title: 'Action',
key: 'action',
align: 'center',
- width: '120px',
+ width: '190px',
render: (text, record) => (
<div>
<Button type="link" onClick={() => this.deleteSubApp(record)} style={{color: '#ff4d4f'}}>鍒犻櫎</Button>
diff --git a/src/views/appmanage/index.scss b/src/views/appmanage/index.scss
index 795ee0c..e8a8abe 100644
--- a/src/views/appmanage/index.scss
+++ b/src/views/appmanage/index.scss
@@ -8,9 +8,9 @@
z-index: 10;
}
.app-table {
- width: 1200px;
+ max-width: 1440px;
margin: 0 auto;
- padding: 40px 0px 20px;
+ padding: 40px 30px 20px;
.sub-app-title {
margin-bottom: 15px;
border-bottom: 1px solid #e8e8e8;
diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx
index b1d1738..ec1556a 100644
--- a/src/views/login/index.jsx
+++ b/src/views/login/index.jsx
@@ -516,6 +516,7 @@
cancelText={this.state.dict['login.auth.cancel']}
visible={this.state.syncApp}
onOk={this.syncSubmit}
+ maskClosable={false}
className="sync-cloud-application"
width={'430px'}
confirmLoading={this.state.syncing}
diff --git a/src/views/pcdesign/index.jsx b/src/views/pcdesign/index.jsx
index 885bd8e..9628725 100644
--- a/src/views/pcdesign/index.jsx
+++ b/src/views/pcdesign/index.jsx
@@ -358,6 +358,8 @@
let param = {
func: 'sPC_Get_LongParam',
+ TypeCharOne: sessionStorage.getItem('kei_no'),
+ typename: 'pc',
MenuID: MenuId
}
@@ -560,7 +562,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- if (openEdition) { // 鐗堟湰绠＄悊
+ if (!openEdition) { // 鐗堟湰绠＄悊
param.open_edition = openEdition
}
--
Gitblit v1.8.0