Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
Overview
Overview
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
常超
founder_vue
Commits
bd523126
Commit
bd523126
authored
Nov 30, 2021
by
张超军
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://47.92.108.28/changchao/founder_vue
into dev_zwpt
parents
0a142673
02460ac5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
src/utils/requestLoading.js
+3
-3
src/views/login/Login1.vue
+8
-6
No files found.
src/utils/requestLoading.js
View file @
bd523126
/*
/*
* @Author: your name
* @Author: your name
* @Date: 2021-11-26 16:37:59
* @Date: 2021-11-26 16:37:59
* @LastEditTime: 2021-11-
29 18:23:59
* @LastEditTime: 2021-11-
30 09:13:55
* @LastEditors: Please set LastEditors
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\utils\requestLoading.js
* @FilePath: \founder_vue\src\utils\requestLoading.js
...
@@ -29,7 +29,7 @@ export function showLoading(target) {
...
@@ -29,7 +29,7 @@ export function showLoading(target) {
// background: "rgba(255, 255, 255, 0.7)",
// background: "rgba(255, 255, 255, 0.7)",
// target: target || document.body
// target: target || document.body
// });
// });
if
(
target
)
{
if
(
target
)
{
store
.
commit
(
'loading/setSmallLoading'
,
true
)
store
.
commit
(
'loading/setSmallLoading'
,
true
)
}
else
{
}
else
{
store
.
commit
(
'loading/setLoading'
,
true
)
store
.
commit
(
'loading/setLoading'
,
true
)
...
@@ -60,7 +60,7 @@ let toHideLoading = utils.debounce((loadingTarget) => {
...
@@ -60,7 +60,7 @@ let toHideLoading = utils.debounce((loadingTarget) => {
// loading.close();
// loading.close();
loading
=
null
;
loading
=
null
;
console
.
log
(
loadingTarget
);
console
.
log
(
loadingTarget
);
if
(
loadingTarget
)
{
if
(
loadingTarget
)
{
store
.
commit
(
'loading/setSmallLoading'
,
false
)
store
.
commit
(
'loading/setSmallLoading'
,
false
)
}
else
{
}
else
{
store
.
commit
(
'loading/setLoading'
,
false
)
store
.
commit
(
'loading/setLoading'
,
false
)
...
...
src/views/login/Login1.vue
View file @
bd523126
...
@@ -89,7 +89,7 @@ export default {
...
@@ -89,7 +89,7 @@ export default {
accountStatus
:
false
,
// 帐号密码登录状态
accountStatus
:
false
,
// 帐号密码登录状态
keyStatus
:
false
,
// key登录状态
keyStatus
:
false
,
// key登录状态
},
},
player
:
null
player
:
null
,
};
};
},
},
methods
:
{
methods
:
{
...
@@ -138,15 +138,15 @@ export default {
...
@@ -138,15 +138,15 @@ export default {
},
},
created
()
{},
created
()
{},
mounted
()
{
mounted
()
{
let
self
=
this
let
self
=
this
;
this
.
loginType
.
accountStatus
=
true
;
this
.
loginType
.
accountStatus
=
true
;
// if (localStorage.getItem("token") !== null) {
// if (localStorage.getItem("token") !== null) {
// this.$router.push("/index");
// this.$router.push("/index");
// }
// }
this
.
initVideo
();
this
.
initVideo
();
this
.
$bus
.
on
(
'goLogin'
,
()
=>
{
this
.
$bus
.
on
(
"goLogin"
,
()
=>
{
self
.
player
.
dispose
()
self
.
player
.
dispose
()
;
})
})
;
// todo 初始登录 帐号密码登录选中状态
// todo 初始登录 帐号密码登录选中状态
// this.init();
// this.init();
...
@@ -347,7 +347,9 @@ div {
...
@@ -347,7 +347,9 @@ div {
margin-bottom
:
10px
;
margin-bottom
:
10px
;
opacity
:
1
;
opacity
:
1
;
}
}
.video-js
{
background-color
:
transparent
!important
;
}
.login_system
{
.login_system
{
width
:
255px
;
width
:
255px
;
height
:
55px
;
height
:
55px
;
...
...
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