|
@@ -59,17 +59,21 @@ export function share (opt) {
|
59
|
59
|
|
60
|
60
|
|
61
|
61
|
export function Login () {
|
|
62
|
+ console.log(1);
|
62
|
63
|
const code = process.env.NODE_ENV === 'development' ? '123' : getCode()
|
63
|
64
|
|
64
|
|
- let isLoaded = false;
|
|
65
|
+ let isLoaded = false; //定义变量
|
65
|
66
|
|
|
67
|
+
|
|
68
|
+ //执行Timeout 如果一秒内登陆成功,由LoginUser改变isLoaded状态,Timeout 一秒后发现isLoaded为true,则关闭。
|
66
|
69
|
const t = setTimeout(() => {
|
|
70
|
+ console.log(2);
|
|
71
|
+
|
67
|
72
|
if (isLoaded) {
|
68
|
73
|
hideLoading()
|
69
|
74
|
} else {
|
70
|
75
|
isLoaded = true
|
71
|
76
|
}
|
72
|
|
-
|
73
|
77
|
clearTimeout(t);
|
74
|
78
|
}, 1000);
|
75
|
79
|
|
|
@@ -86,6 +90,9 @@ export function Login () {
|
86
|
90
|
store.commit('SET_USER_INFO', userInfo)
|
87
|
91
|
let location = window.location.href
|
88
|
92
|
|
|
93
|
+ console.log(3, isLoaded);
|
|
94
|
+
|
|
95
|
+
|
89
|
96
|
try {
|
90
|
97
|
pv({ addr: location })
|
91
|
98
|
} catch (error) {
|
|
@@ -99,12 +106,27 @@ export function Login () {
|
99
|
106
|
} catch (error) {
|
100
|
107
|
console.error(error)
|
101
|
108
|
}
|
102
|
|
-
|
103
|
109
|
if (isLoaded) {
|
104
|
|
- hideLoading()
|
|
110
|
+ console.log(4, isLoaded);
|
|
111
|
+
|
105
|
112
|
} else {
|
106
|
113
|
isLoaded = true
|
|
114
|
+ hideLoading()
|
|
115
|
+
|
|
116
|
+ console.log(4, isLoaded);
|
|
117
|
+
|
107
|
118
|
}
|
|
119
|
+ // setTimeout(() => {
|
|
120
|
+ // console.log("🚀 ~ file: initial.js ~ line 110 ~ setTimeout ~ isLoaded", isLoaded)
|
|
121
|
+
|
|
122
|
+ // if (isLoaded) {
|
|
123
|
+ // hideLoading()
|
|
124
|
+ // } else {
|
|
125
|
+
|
|
126
|
+ // isLoaded = true
|
|
127
|
+ // }
|
|
128
|
+ // }, 5000)
|
|
129
|
+
|
108
|
130
|
|
109
|
131
|
return;
|
110
|
132
|
})
|