Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
程默
mayi-mp-shop
Commits
2cb5e97e
Commit
2cb5e97e
authored
Jun 02, 2021
by
程默
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
e4610c73
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
src/pages/wxArticle/index.vue
+10
-6
src/pages/wxPay/index.vue
+2
-0
No files found.
src/pages/wxArticle/index.vue
View file @
2cb5e97e
...
@@ -29,7 +29,7 @@ export default {
...
@@ -29,7 +29,7 @@ export default {
};
};
},
},
async
onLoad
(
options
)
{
async
onLoad
(
options
)
{
console
.
log
(
options
,
'第三方页面'
);
console
.
log
(
options
,
"第三方页面"
);
/**
/**
* scene=sso 第三方需要登录的页面
* scene=sso 第三方需要登录的页面
* login=1 jwt需要登录(临时方案)
* login=1 jwt需要登录(临时方案)
...
@@ -56,13 +56,15 @@ export default {
...
@@ -56,13 +56,15 @@ export default {
this
.
getSsoBcakUrl
(
decodeURIComponent
(
options
.
link
));
this
.
getSsoBcakUrl
(
decodeURIComponent
(
options
.
link
));
}
}
}
else
if
(
getUrlKey
(
decodeURIComponent
(
options
.
link
),
"login"
)
!=
"1"
)
{
}
else
if
(
getUrlKey
(
decodeURIComponent
(
options
.
link
),
"login"
)
!=
"1"
)
{
this
.
link
=
decodeURIComponent
(
options
.
link
);
this
.
setLink
(
decodeURIComponent
(
options
.
link
)
);
}
else
{
}
else
{
if
(
wx
.
getStorageSync
(
"sessionid"
))
{
if
(
wx
.
getStorageSync
(
"sessionid"
))
{
this
.
link
=
forUrlAddKey
(
decodeURIComponent
(
options
.
link
),
{
this
.
setLink
(
forUrlAddKey
(
decodeURIComponent
(
options
.
link
),
{
token
:
wx
.
getStorageSync
(
"sessionid"
),
token
:
wx
.
getStorageSync
(
"sessionid"
),
jwt
:
1
,
jwt
:
1
,
});
})
);
}
else
{
}
else
{
let
url
=
`/pages/login/main?scene=sso&back=
${
options
.
link
}
`
;
let
url
=
`/pages/login/main?scene=sso&back=
${
options
.
link
}
`
;
wx
.
navigateTo
({
wx
.
navigateTo
({
...
@@ -117,6 +119,9 @@ export default {
...
@@ -117,6 +119,9 @@ export default {
};
};
},
},
methods
:
{
methods
:
{
setLink
(
data
)
{
this
.
link
=
data
;
},
getSsoBcakUrl
(
link
)
{
getSsoBcakUrl
(
link
)
{
let
op
=
{
let
op
=
{
callbackUrl
:
link
,
callbackUrl
:
link
,
...
@@ -128,9 +133,8 @@ export default {
...
@@ -128,9 +133,8 @@ export default {
wxAvatarUrl
:
this
.
$store
.
state
.
userInfo
.
avatarUrl
,
wxAvatarUrl
:
this
.
$store
.
state
.
userInfo
.
avatarUrl
,
};
};
login
.
getSsoBcakUrl
(
op
).
then
((
res
)
=>
{
login
.
getSsoBcakUrl
(
op
).
then
((
res
)
=>
{
console
.
log
(
res
,
this
.
link
,
555444
);
if
(
res
.
data
.
code
==
"200"
)
{
if
(
res
.
data
.
code
==
"200"
)
{
this
.
link
=
res
.
data
.
data
;
this
.
setLink
(
res
.
data
.
data
)
;
}
else
{
}
else
{
wx
.
showToast
({
title
:
res
.
data
.
msg
,
icon
:
"none"
});
wx
.
showToast
({
title
:
res
.
data
.
msg
,
icon
:
"none"
});
}
}
...
...
src/pages/wxPay/index.vue
View file @
2cb5e97e
...
@@ -158,9 +158,11 @@ export default {
...
@@ -158,9 +158,11 @@ export default {
}
}
// sso场景(跳转第三方url)
// sso场景(跳转第三方url)
if
(
_this
.
scene
==
"sso"
)
{
if
(
_this
.
scene
==
"sso"
)
{
setTimeout
(()
=>
{
wx
.
redirectTo
({
wx
.
redirectTo
({
url
:
`../wxArticle/main?from=sso&link=
${
_this
.
backUrl
}
`
,
url
:
`../wxArticle/main?from=sso&link=
${
_this
.
backUrl
}
`
,
});
});
},
500
);
return
;
return
;
}
}
...
...
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