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
d86494de
Commit
d86494de
authored
Jun 04, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add:领卡状态判断
parent
34ce2e8b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
authorization-modal.js
src/component/authorization-modal/authorization-modal.js
+3
-1
personCenter.js
src/component/personCenter/personCenter.js
+2
-1
activateCardCallback.js
src/pages/activateCard/activateCardCallback.js
+3
-1
wxService.js
src/utils/wxService.js
+1
-1
No files found.
src/component/authorization-modal/authorization-modal.js
View file @
d86494de
...
@@ -52,6 +52,8 @@ Component({
...
@@ -52,6 +52,8 @@ Component({
}
}
wx
.
setStorageSync
(
'_baseUserInfo'
,
data
)
wx
.
setStorageSync
(
'_baseUserInfo'
,
data
)
// 存储用户开卡状态
wx
.
setStorageSync
(
'memberActivateStatus'
,
data
.
memberActivateStatus
)
this
.
setUserInfo
()
this
.
setUserInfo
()
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
...
@@ -75,7 +77,7 @@ Component({
...
@@ -75,7 +77,7 @@ Component({
setUserInfo
(
e
)
{
setUserInfo
(
e
)
{
console
.
log
(
'开卡'
)
console
.
log
(
'开卡'
)
// 判断有无开卡
// 判断有无开卡
const
{
memberActivateStatus
}
=
wx
.
getStorageSync
(
'_baseUserInfo
'
)
const
memberActivateStatus
=
wx
.
getStorageSync
(
'memberActivateStatus
'
)
// 没有开卡并且需要开卡
// 没有开卡并且需要开卡
if
(
!
memberActivateStatus
)
{
if
(
!
memberActivateStatus
)
{
wxService
.
openCard
()
wxService
.
openCard
()
...
...
src/component/personCenter/personCenter.js
View file @
d86494de
...
@@ -25,7 +25,8 @@ Component({
...
@@ -25,7 +25,8 @@ Component({
personCenter
:
this
.
data
.
personData
personCenter
:
this
.
data
.
personData
})
})
// 取会员卡号
// 取会员卡号
const
{
memberCardNo
,
memberActivateStatus
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
{
memberCardNo
}
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
memberActivateStatus
=
wx
.
getStorageSync
(
'memberActivateStatus'
)
this
.
setData
({
this
.
setData
({
memberCardNo
,
memberCardNo
,
memberActivateStatus
memberActivateStatus
...
...
src/pages/activateCard/activateCardCallback.js
View file @
d86494de
...
@@ -48,9 +48,11 @@ wxService.page({
...
@@ -48,9 +48,11 @@ wxService.page({
wxService
.
post
(
`/member/activateCard`
,
currentObj
).
then
(
res
=>
{
wxService
.
post
(
`/member/activateCard`
,
currentObj
).
then
(
res
=>
{
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
){
if
(
result
==
0
){
// 变更 激活状态
console
.
log
(
'000000'
)
wx
.
setStorageSync
(
'memberActivateStatus'
,
true
)
wx
.
hideLoading
()
wx
.
hideLoading
()
wxService
.
router
(
`/pages/userCenter/userCenter`
)
wxService
.
router
(
`/pages/userCenter/userCenter`
)
// wxService.router(`/pages/index/index`)
}
else
{
}
else
{
wx
.
hideLoading
()
wx
.
hideLoading
()
wx
.
showToast
({
wx
.
showToast
({
...
...
src/utils/wxService.js
View file @
d86494de
...
@@ -472,7 +472,7 @@ class WXService extends Http {
...
@@ -472,7 +472,7 @@ class WXService extends Http {
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
// const app = this.getApp()
// const app = this.getApp()
const
{
memberActivateStatus
}
=
wx
.
getStorageSync
(
'_baseUserInfo
'
)
const
memberActivateStatus
=
wx
.
getStorageSync
(
'memberActivateStatus
'
)
if
(
memberActivateStatus
)
{
if
(
memberActivateStatus
)
{
resolve
(
baseUserInfo
)
resolve
(
baseUserInfo
)
}
else
{
}
else
{
...
...
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