Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
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
高淑倩
7-Eleven
Commits
34ce2e8b
Commit
34ce2e8b
authored
Jun 04, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: 路由replace && 开卡条件判断
parent
1c2bc07f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
authorization-modal.js
src/component/authorization-modal/authorization-modal.js
+2
-2
wxService.js
src/utils/wxService.js
+7
-0
No files found.
src/component/authorization-modal/authorization-modal.js
View file @
34ce2e8b
...
...
@@ -91,10 +91,10 @@ Component({
const
options
=
JSON
.
parse
(
item
.
options
)
wxService
.
router
(
`/
${
item
.
route
}
`
).
search
(
options
).
replace
()
}
catch
(
e
)
{
wxService
.
router
(
'/pages/userCenter/userCenter'
)
wxService
.
router
(
'/pages/userCenter/userCenter'
)
.
replace
()
}
}
else
{
wxService
.
router
(
'/pages/userCenter/userCenter'
)
wxService
.
router
(
'/pages/userCenter/userCenter'
)
.
replace
()
}
},
200
)
...
...
src/utils/wxService.js
View file @
34ce2e8b
...
...
@@ -471,11 +471,18 @@ class WXService extends Http {
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
return
new
Promise
((
resolve
,
reject
)
=>
{
// const app = this.getApp()
const
{
memberActivateStatus
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
if
(
memberActivateStatus
)
{
resolve
(
baseUserInfo
)
}
else
{
return
this
.
navigateToMiniProgram
({
biz
:
baseUserInfo
.
biz
,
encrypt_card_id
:
baseUserInfo
.
encryptCardId
,
outer_str
:
baseUserInfo
.
outerStr
})
}
// if (baseUserInfo && baseUserInfo.isMember === '1') {
// resolve(baseUserInfo)
...
...
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