tongChong
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'dev_military_qz2022' of http://106.75.45.236:3000/tongChong/forgeplus-react into dev_military_qz2022

This commit is contained in:
谢思 2022-04-21 18:04:39 +08:00
parent aa2547290b ba8c86ada7
commit 09e08af180
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/index.html
View File

@ -15,13 +15,44 @@
<link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/editormd.min.css"> <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/editormd.min.css">
<link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/merge.css"> <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/merge.css">
<%= htmlWebpackPlugin.tags.headTags %> <%= htmlWebpackPlugin.tags.headTags %>
<style>
#ie_info{
display: none;
text-align: center;
margin: 10vh;
color: #4154f1;
font-size: 40px;
}
</style>
</head> </head>
<body> <body>
<!--用于markdown转html --> <!--用于markdown转html -->
<div id="ie_info">不支持当前浏览器，请更换浏览器！推荐使用谷歌浏览器、360浏览器极速模式、火狐浏览器或Edge浏览器！</div>
<div id="md_div" style="display: none;"></div> <div id="md_div" style="display: none;"></div>
<div id="root" class="page -layout-v -fit widthunit"></div> <div id="root" class="page -layout-v -fit widthunit"></div>
<div id="picture_display" style="display: none;"></div> <div id="picture_display" style="display: none;"></div>
<script src="%PUBLIC_URL%js/jquery-1.8.3.min.js"></script> <script src="%PUBLIC_URL%js/jquery-1.8.3.min.js"></script>
<script>
var getExplorer = (function () {
var explorer = window.navigator.userAgent,
compare = function (s) { return (explorer.indexOf(s) >= 0); },
ie11 = (function () { return ("ActiveXObject" in window) })();
if (compare("MSIE") || ie11) { return 'ie'; }
else if (compare("Firefox") && !ie11) { return 'Firefox'; }
else if (compare("Chrome") && !ie11) {
if (explorer.indexOf("Edge") > -1) {
return 'Edge';
} else {
return 'Chrome';
}
}
else if (compare("Opera") && !ie11) { return 'Opera'; }
else if (compare("Safari") && !ie11) { return 'Safari'; }
})()
if (getExplorer == 'ie') {
$('#ie_info').css({display:'block'});
}
</script>
<script src="%PUBLIC_URL%js/js_min_all.js"></script> <script src="%PUBLIC_URL%js/js_min_all.js"></script>
<script src="%PUBLIC_URL%js/codemirror/codemirror.js"></script> <script src="%PUBLIC_URL%js/codemirror/codemirror.js"></script>
<script src="%PUBLIC_URL%js/editormd/editormd.min.js"></script> <script src="%PUBLIC_URL%js/editormd/editormd.min.js"></script>

2
src/App.js
View File

@ -293,7 +293,7 @@ class App extends Component {
mygetHelmetapi: response.data.setting mygetHelmetapi: response.data.setting
}); });
//存储配置到游览器 //存储配置到游览器
localStorage.setItem('chromesetting', JSON.stringify(response.data.setting)); response.data.setting&&localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
localStorage.setItem('chromesettingresponse', JSON.stringify(response)); localStorage.setItem('chromesettingresponse', JSON.stringify(response));
try { try {
if (response.data.setting.tab_logo_url) { if (response.data.setting.tab_logo_url) {

2
src/forge/Head/Header.js
View File

@ -184,7 +184,7 @@ class NewHeader extends Component {
axios.get(url).then((response) => { axios.get(url).then((response) => {
if (response && response.data && response.data.setting) { if (response && response.data && response.data.setting) {
this.setState({ settings: response.data.setting }); this.setState({ settings: response.data.setting });
localStorage.setItem('chromesetting', JSON.stringify(response.data.setting)); response.data.setting&&localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
localStorage.setItem('chromesettingresponse', JSON.stringify(response)); localStorage.setItem('chromesettingresponse', JSON.stringify(response));
} else { } else {
this.gettablogourlnull(); this.gettablogourlnull();

2
src/modules/tpm/TPMIndexHOC.js
View File

@ -133,7 +133,7 @@ export function TPMIndexHOC(WrappedComponent, headFoot) {
this.setState({ this.setState({
mygetHelmetapi: response.data.setting mygetHelmetapi: response.data.setting
}); });
localStorage.setItem('chromesetting', JSON.stringify(response.data.setting)); response.data.setting&&localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
localStorage.setItem('chromesettingresponse', JSON.stringify(response)); localStorage.setItem('chromesettingresponse', JSON.stringify(response));
try { try {
if (response.data.setting.tab_logo_url) { if (response.data.setting.tab_logo_url) {