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
4f0e91a3
Commit
4f0e91a3
authored
Jun 14, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: relogin
parent
3dc4e11e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
47 additions
and
16 deletions
+47
-16
activateCardCallback.js
src/pages/activateCard/activateCardCallback.js
+2
-0
util.js
src/utils/util.js
+1
-0
wxService.js
src/utils/wxService.js
+44
-16
No files found.
src/pages/activateCard/activateCardCallback.js
View file @
4f0e91a3
...
@@ -55,6 +55,8 @@ wxService.page({
...
@@ -55,6 +55,8 @@ wxService.page({
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
baseUserInfo
.
memberActivateStatus
=
true
baseUserInfo
.
memberActivateStatus
=
true
wx
.
setStorageSync
(
'_baseUserInfo'
,
baseUserInfo
)
wx
.
setStorageSync
(
'_baseUserInfo'
,
baseUserInfo
)
// 更新缓存信息 relogin
wxService
.
relogin
()
wx
.
hideLoading
()
wx
.
hideLoading
()
wxService
.
router
(
`/pages/userCenter/userCenter`
)
wxService
.
router
(
`/pages/userCenter/userCenter`
)
...
...
src/utils/util.js
View file @
4f0e91a3
...
@@ -263,6 +263,7 @@ function getUserInfoByBtn(userInfo) {
...
@@ -263,6 +263,7 @@ function getUserInfoByBtn(userInfo) {
return
Promise
.
all
([
Promise
.
resolve
(
userInfo
),
Promise
.
resolve
(
res
)])
return
Promise
.
all
([
Promise
.
resolve
(
userInfo
),
Promise
.
resolve
(
res
)])
}).
then
((
res
)
=>
{
}).
then
((
res
)
=>
{
logger
.
log
(
' wx _userInfo success res --->'
,
res
)
logger
.
log
(
' wx _userInfo success res --->'
,
res
)
wx
.
setStorageSync
(
'_wechatInfo'
,
res
[
0
])
wx
.
setStorageSync
(
'_userInfo'
,
res
[
0
].
userInfo
)
wx
.
setStorageSync
(
'_userInfo'
,
res
[
0
].
userInfo
)
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'正在加载...'
,
title
:
'正在加载...'
,
...
...
src/utils/wxService.js
View file @
4f0e91a3
...
@@ -49,22 +49,25 @@ class WXService extends Http {
...
@@ -49,22 +49,25 @@ class WXService extends Http {
}).
catch
(
res
=>
{
}).
catch
(
res
=>
{
console
.
log
(
res
)
console
.
log
(
res
)
if
(
res
.
msg
.
indexOf
(
'未登录'
)
>
-
1
)
{
if
(
res
.
msg
.
indexOf
(
'未登录'
)
>
-
1
)
{
wx
.
setStorageSync
(
'token'
,
''
)
// 重新登陆 更新缓存
var
_this
=
this
this
.
reLogin
()
let
userInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
// wx.setStorageSync('token', '')
_this
.
login
().
then
(
result
=>
{
// const app = getApp()
if
(
result
.
code
){
// var _this = this
_this
.
post
(
`/member/minaLogin`
,
{
// let userInfo = wx.getStorageSync('_baseUserInfo')
code
:
result
.
code
,
// _this.login().then(result=>{
wechatInfo
:
userInfo
,
// if(result.code){
brandId
:
1001
,
// _this.post(`/member/minaLogin`, {
}).
then
(
response
=>
{
// code: result.code,
let
dataResp
=
response
.
data
.
data
// wechatInfo: userInfo,
wx
.
setStorageSync
(
'token'
,
dataResp
.
token
)
// brandId: app.globalData.brandId,
wx
.
setStorageSync
(
'_baseUserInfo'
,
dataResp
)
// }).then(response=>{
})
// let dataResp = response.data.data
}
// wx.setStorageSync('token', dataResp.token)
})
// wx.setStorageSync('_baseUserInfo', dataResp)
// })
// }
// })
}
else
if
(
res
.
state
===
402
)
{
}
else
if
(
res
.
state
===
402
)
{
return
this
.
getUserInfo
().
then
(()
=>
{
return
this
.
getUserInfo
().
then
(()
=>
{
...
@@ -108,6 +111,7 @@ class WXService extends Http {
...
@@ -108,6 +111,7 @@ class WXService extends Http {
})
})
}
}
}
}
/**
/**
* 页面导航
* 页面导航
* @param url
* @param url
...
@@ -128,6 +132,30 @@ class WXService extends Http {
...
@@ -128,6 +132,30 @@ class WXService extends Http {
all
()
{
all
()
{
return
Promise
.
all
.
apply
(
Promise
,
arguments
)
return
Promise
.
all
.
apply
(
Promise
,
arguments
)
}
}
/**
* 更新缓存 登陆
*
*/
reLogin
()
{
wx
.
setStorageSync
(
'token'
,
''
)
const
app
=
getApp
()
var
_this
=
this
let
wechatInfo
=
wx
.
getStorageSync
(
'_wechatInfo'
)
_this
.
login
().
then
(
result
=>
{
if
(
result
.
code
){
_this
.
post
(
`/member/minaLogin`
,
{
code
:
result
.
code
,
wechatInfo
,
brandId
:
app
.
globalData
.
brandId
,
}).
then
(
response
=>
{
let
dataResp
=
response
.
data
.
data
wx
.
setStorageSync
(
'token'
,
dataResp
.
token
)
wx
.
setStorageSync
(
'_baseUserInfo'
,
dataResp
)
})
}
})
}
login
()
{
login
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
...
...
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