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
d0587bc2
Commit
d0587bc2
authored
Jul 12, 2021
by
张卓
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
道可登录报错
parent
fd93ffb5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
src/pages/login/index.vue
+12
-4
src/pages/wxArticle/index.vue
+1
-1
No files found.
src/pages/login/index.vue
View file @
d0587bc2
...
@@ -77,7 +77,8 @@ export default {
...
@@ -77,7 +77,8 @@ export default {
test_isHaveUnion
:
""
,
test_isHaveUnion
:
""
,
test_unionId
:
""
,
test_unionId
:
""
,
fromType
:
''
,
//来源类型 mini:小程序跳转到当前登录页
fromType
:
''
,
//来源类型 mini:小程序跳转到当前登录页
scene
:
''
//场景
scene
:
''
,
//场景
ossLink
:
''
//第三方点击进入链接
};
};
},
},
onShow
()
{
onShow
()
{
...
@@ -105,8 +106,8 @@ export default {
...
@@ -105,8 +106,8 @@ export default {
})
})
},
},
onLoad
(
options
)
{
onLoad
(
options
)
{
login
.
getShopUserProtocol
().
then
(
res
=>
{
login
.
getShopUserProtocol
().
then
(
res
=>
{
console
.
log
(
res
,
777888999
)
if
(
res
.
data
.
code
==
'200'
)
{
if
(
res
.
data
.
code
==
'200'
)
{
this
.
content
=
res
.
data
.
data
;
this
.
content
=
res
.
data
.
data
;
}
}
...
@@ -122,6 +123,9 @@ export default {
...
@@ -122,6 +123,9 @@ export default {
let
params
=
JSON
.
parse
(
options
.
params
);
let
params
=
JSON
.
parse
(
options
.
params
);
this
.
fromType
=
params
.
fromType
;
this
.
fromType
=
params
.
fromType
;
}
}
if
(
options
.
ossLink
)
{
this
.
ossLink
=
decodeURIComponent
(
options
.
ossLink
)
}
this
.
getshop
();
this
.
getshop
();
},
},
methods
:
{
methods
:
{
...
@@ -331,9 +335,13 @@ export default {
...
@@ -331,9 +335,13 @@ export default {
wx
.
navigateBack
({
wx
.
navigateBack
({
delta
:
1
delta
:
1
});
});
}
else
if
(
this
.
scene
==
'sso'
||
this
.
backPath
.
includes
(
'scene=sso'
))
{
}
else
if
(
this
.
scene
==
'sso'
||
this
.
backPath
.
includes
(
'scene=sso'
)
||
this
.
ossLink
.
indexOf
(
'scene=sso'
)
>-
1
)
{
let
backPath
=
this
.
backPath
;
if
(
this
.
ossLink
)
{
backPath
+=
'?'
+
this
.
ossLink
}
wx
.
redirectTo
({
wx
.
redirectTo
({
url
:
`../wxArticle/main?link=
${
this
.
backPath
}
`
,
url
:
`../wxArticle/main?link=
${
encodeURIComponent
(
backPath
)
}
`
,
});
});
}
else
{
}
else
{
let
parseLink
=
decodeURIComponent
(
this
.
backPath
);
let
parseLink
=
decodeURIComponent
(
this
.
backPath
);
...
...
src/pages/wxArticle/index.vue
View file @
d0587bc2
...
@@ -55,7 +55,6 @@ export default {
...
@@ -55,7 +55,6 @@ export default {
if
(
getUrlKey
(
decodeURIComponent
(
link
),
"getMixId"
)
==
'1'
)
{
//第三方跳转加mixid
if
(
getUrlKey
(
decodeURIComponent
(
link
),
"getMixId"
)
==
'1'
)
{
//第三方跳转加mixid
link
=
forUrlAddKey
(
decodeURIComponent
(
link
),{
mixid
:
this
.
$store
.
state
.
mixid
})
link
=
forUrlAddKey
(
decodeURIComponent
(
link
),{
mixid
:
this
.
$store
.
state
.
mixid
})
}
}
console
.
log
(
wx
.
getStorageSync
(
"sessionid"
),
446466777777
,
getUrlKey
(
decodeURIComponent
(
link
),
"mixid"
),
this
.
$store
.
state
.
mixid
)
if
(
getUrlKey
(
decodeURIComponent
(
link
),
"scene"
)
==
"sso"
)
{
if
(
getUrlKey
(
decodeURIComponent
(
link
),
"scene"
)
==
"sso"
)
{
if
(
!
wx
.
getStorageSync
(
"sessionid"
))
{
if
(
!
wx
.
getStorageSync
(
"sessionid"
))
{
wx
.
redirectTo
({
wx
.
redirectTo
({
...
@@ -132,6 +131,7 @@ export default {
...
@@ -132,6 +131,7 @@ export default {
methods
:
{
methods
:
{
setLink
(
data
)
{
setLink
(
data
)
{
this
.
link
=
data
;
this
.
link
=
data
;
console
.
log
(
this
.
link
,
89999999
)
},
},
getSsoBcakUrl
(
link
)
{
getSsoBcakUrl
(
link
)
{
let
op
=
{
let
op
=
{
...
...
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