Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
37f7c768
Commit
37f7c768
authored
Mar 22, 2024
by
张瑶
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:兼容
parent
01fde767
Pipeline
#86358
passed with stages
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
6 deletions
+11
-6
login.js
src/pages/user/login/login.js
+11
-6
No files found.
src/pages/user/login/login.js
View file @
37f7c768
...
...
@@ -422,14 +422,19 @@ class Login {
const
self
=
this
;
// eslint-disable-next-line no-undef
// 获取网站配置的同时,预先获取到mqtt配置,注册进子应用
// 兼容云平台子站不更新的情况
let
param
=
{
client
:
self
.
globalConfig
.
client
,
'request.preventCache'
:
Date
.
now
(),
};
if
(
window
.
location
?.
host
===
'panda-water.cn'
)
{
param
.
token
=
token
;
}
else
{
param
.
identity
=
token
;
}
Promise
.
allSettled
([
noticeService
.
getMqttSiteCode
({
'request.preventCache'
:
Date
.
now
()
}),
getWebSiteConfig
({
client
:
self
.
globalConfig
.
client
,
// client: window.globalConfig.client,
identity
:
token
,
'request.preventCache'
:
Date
.
now
(),
}),
getWebSiteConfig
(
param
),
])
.
then
(
results
=>
{
const
promise
=
results
[
0
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment