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
585b4af6
Commit
585b4af6
authored
Sep 24, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
console
parent
609a261b
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
6 deletions
+16
-6
authorization-modal-point.js
...nt/authorization-modal-point/authorization-modal-point.js
+1
-0
authorization-modal.js
src/component/authorization-modal/authorization-modal.js
+1
-0
pointDetail.js
src/pages/pointDetail/pointDetail.js
+1
-0
project.config.json
src/project.config.json
+5
-3
wxService.js
src/utils/wxService.js
+8
-3
No files found.
src/component/authorization-modal-point/authorization-modal-point.js
View file @
585b4af6
...
@@ -115,6 +115,7 @@ Component({
...
@@ -115,6 +115,7 @@ Component({
if
(
item
.
route
)
{
if
(
item
.
route
)
{
try
{
try
{
const
options
=
item
.
options
const
options
=
item
.
options
console
.
log
(
"集点弹框跳转"
,
item
.
route
)
wxService
.
router
(
`/
${
item
.
route
}
`
).
search
(
options
).
replace
()
wxService
.
router
(
`/
${
item
.
route
}
`
).
search
(
options
).
replace
()
}
catch
(
e
)
{
}
catch
(
e
)
{
wx
.
showToast
({
wx
.
showToast
({
...
...
src/component/authorization-modal/authorization-modal.js
View file @
585b4af6
...
@@ -69,6 +69,7 @@ Component({
...
@@ -69,6 +69,7 @@ Component({
// 获取当前会员是否是体验者
// 获取当前会员是否是体验者
const
{
member
}
=
baseUserInfo
const
{
member
}
=
baseUserInfo
const
curMemberTrial
=
member
&&
member
.
trial
||
false
const
curMemberTrial
=
member
&&
member
.
trial
||
false
console
.
log
(
'获取当前会员是否是体验者'
,
curMemberTrial
)
wx
.
setStorageSync
(
'isExperiencer'
,
curMemberTrial
)
wx
.
setStorageSync
(
'isExperiencer'
,
curMemberTrial
)
// 存储用户开卡状态
// 存储用户开卡状态
...
...
src/pages/pointDetail/pointDetail.js
View file @
585b4af6
...
@@ -47,6 +47,7 @@ wxService.page({
...
@@ -47,6 +47,7 @@ wxService.page({
},
},
watch
:
{
watch
:
{
experAccessible
(
newVal
,
oldVal
)
{
experAccessible
(
newVal
,
oldVal
)
{
console
.
log
(
'newVal, oldVal'
,
newVal
,
oldVal
)
if
(
newVal
)
{
if
(
newVal
)
{
// 登录接口返回err
// 登录接口返回err
const
reLoginErrFlag
=
wx
.
getStorageSync
(
'reLoginErr'
)
const
reLoginErrFlag
=
wx
.
getStorageSync
(
'reLoginErr'
)
...
...
src/project.config.json
View file @
585b4af6
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
"list"
:
[]
"list"
:
[]
},
},
"miniprogram"
:
{
"miniprogram"
:
{
"current"
:
1
9
,
"current"
:
1
3
,
"list"
:
[
"list"
:
[
{
{
"id"
:
-1
,
"id"
:
-1
,
...
@@ -124,7 +124,8 @@
...
@@ -124,7 +124,8 @@
"id"
:
13
,
"id"
:
13
,
"name"
:
"subPage"
,
"name"
:
"subPage"
,
"pathName"
:
"subPackage/page/pages/subPage/subPage"
,
"pathName"
:
"subPackage/page/pages/subPage/subPage"
,
"query"
:
"pageId=4"
"query"
:
"pageId=40"
,
"scene"
:
null
},
},
{
{
"id"
:
14
,
"id"
:
14
,
...
@@ -164,7 +165,8 @@
...
@@ -164,7 +165,8 @@
{
{
"id"
:
-1
,
"id"
:
-1
,
"name"
:
"敬请期待"
,
"name"
:
"敬请期待"
,
"pathName"
:
"subPackage/page/pages/goToHome/goToHome"
"pathName"
:
"subPackage/page/pages/goToHome/goToHome"
,
"query"
:
""
}
}
]
]
}
}
...
...
src/utils/wxService.js
View file @
585b4af6
...
@@ -436,16 +436,17 @@ class WXService extends Http {
...
@@ -436,16 +436,17 @@ class WXService extends Http {
// const curMemberTrial = member && member.trial || false
// const curMemberTrial = member && member.trial || false
// console.log('d', curMemberTrial)
// console.log('d', curMemberTrial)
// wx.setStorageSync('isExperiencer', curMemberTrial)
// wx.setStorageSync('isExperiencer', curMemberTrial)
const
isExperiencer
=
wx
.
getStorageSync
(
'isExperiencer'
)
||
false
console
.
log
(
'获取当前会员是否是体验者'
,
isExperiencer
)
const
isExperiencer
=
wx
.
getStorageSync
(
'isExperiencer'
)
const
page
=
this
const
page
=
this
_self
.
currentPage
=
page
_self
.
currentPage
=
page
config
.
onShow
&&
config
.
onShow
.
apply
(
page
,
args
)
config
.
onShow
&&
config
.
onShow
.
apply
(
page
,
args
)
// 获取当前页
// 获取当前页
let
router
=
getCurrentRouter
()
let
router
=
getCurrentRouter
()
const
baseUserInfo
=
_self
.
getBaseUserInfo
()
const
baseUserInfo
=
_self
.
getBaseUserInfo
()
if
(
baseUserInfo
)
{
//
if (baseUserInfo) {
_self
.
trialList
().
then
(
res
=>
{
_self
.
trialList
().
then
(
res
=>
{
if
(
!
res
)
return
false
if
(
!
res
)
return
false
const
{
currentPaths
}
=
res
const
{
currentPaths
}
=
res
...
@@ -459,7 +460,11 @@ class WXService extends Http {
...
@@ -459,7 +460,11 @@ class WXService extends Http {
})
})
}
}
})
})
}
console
.
log
(
'000'
,
this
.
data
.
experAccessible
);
// }
},
},
onReady
:
function
(...
args
)
{
onReady
:
function
(...
args
)
{
...
...
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