Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
repair_workers_h5
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
石盼盼
repair_workers_h5
Commits
3724199b
Commit
3724199b
authored
Sep 02, 2021
by
石盼盼
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'spp' into 'master'
Spp See merge request
!10
parents
969e7da4
c7f7aab5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
7 deletions
+1
-7
apiList.js
src/api/apiList.js
+1
-0
index.js
src/router/index.js
+0
-1
login.vue
src/views/login/login.vue
+0
-6
No files found.
src/api/apiList.js
View file @
3724199b
...
...
@@ -10,6 +10,7 @@ const baseUrl = '/api'
// todo: url
const
httpUrl
=
'
https://repairtest.zeruiedu.com
'
// 测试接口
const
h5Url
=
'
http://localhost:8080/
'
// 测试h5线上地址
// const h5Url = 'http://repair.h5.zeruiedu.com/' // 测试h5线上地址
window
.
localStorage
.
setItem
(
'
httpUrl
'
,
httpUrl
)
window
.
localStorage
.
setItem
(
'
h5Url
'
,
h5Url
)
// const httpUrl = 'https://fenghexm.xueyoubangedu.com' // 正式接口
...
...
src/router/index.js
View file @
3724199b
...
...
@@ -115,7 +115,6 @@ router.beforeEach((to, from, next) => {
if
(
token
&&
status
===
'
200
'
)
{
console
.
log
(
'
ok-------1
'
,
200
)
if
(
role
==
2
)
{
window
.
localStorage
.
setItem
(
'
role
'
,
''
)
setTimeout
(()
=>
{
next
({
path
:
'
/admin_home
'
...
...
src/views/login/login.vue
View file @
3724199b
...
...
@@ -83,16 +83,10 @@ export default {
this
.
$http
.
post
(
this
.
$myApi
.
BINDLOGIN
,
curParams
)
.
then
(
res
=>
{
const
httpUrl
=
window
.
localStorage
.
getItem
(
'
httpUrl
'
)
console
.
log
(
'
httpUrl
'
,
httpUrl
)
const
h5Url
=
window
.
localStorage
.
getItem
(
'
h5Url
'
)
console
.
log
(
'
h5Url
'
,
h5Url
)
const
wxLogin
=
window
.
localStorage
.
getItem
(
'
wxLogin
'
)
console
.
log
(
'
wxLogin
'
,
wxLogin
)
const
t
=
res
.
role
==
3
?
h5Url
:
`
${
h5Url
}
admin_home`
// 测试h5线上地址
console
.
log
(
'
的数据傅雷家书蝶恋蜂狂
'
,
res
,
'
链接
'
,
httpUrl
,
'
h5Url
'
,
h5Url
,
'
role
'
,
t
)
let
url
=
`
${
httpUrl
}${
wxLogin
}
?callBack=
${
t
}
&scopes=snsapi_userinfo&type=1`
console
.
log
(
'
1111111111111111111111111111111链接
'
,
url
)
window
.
document
.
location
=
url
// url-
})
.
catch
(()
=>
{})
...
...
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