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
ef2f3dca
Commit
ef2f3dca
authored
May 21, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
383e166b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
pointDetail.js
src/pages/pointDetail/pointDetail.js
+14
-14
project.config.json
src/project.config.json
+1
-1
wxService.js
src/utils/wxService.js
+1
-1
No files found.
src/pages/pointDetail/pointDetail.js
View file @
ef2f3dca
...
@@ -57,17 +57,6 @@ wxService.page({
...
@@ -57,17 +57,6 @@ wxService.page({
});
});
return
;
return
;
}
}
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
if
(
!
baseUserInfo
){
this
.
setData
({
isAuthorization
:
false
});
return
;
}
this
.
getPointDetail
(
this
.
data
.
id
);
},
},
//弹出订阅莫泰关闭
//弹出订阅莫泰关闭
...
@@ -135,14 +124,15 @@ wxService.page({
...
@@ -135,14 +124,15 @@ wxService.page({
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
();
wx
.
hideLoading
();
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
if
(
baseUserInfo
){
if
(
baseUserInfo
){
let
isUat
=
data
.
isUat
;
let
isUat
=
data
.
isUat
;
if
(
isUat
==
'y'
){
if
(
isUat
==
'y'
){
let
isTrial
=
baseUserInfo
.
member
.
trial
?
baseUserInfo
.
member
.
trial
:
false
;
let
isTrial
=
baseUserInfo
.
member
.
trial
?
baseUserInfo
.
member
.
trial
:
false
;
if
(
!
isTrial
){
if
(
!
isTrial
){
wxService
.
router
(
`/subPackage/page/pages/goToHome/goToHome`
);
wx
.
redirectTo
({
url
:
'/subPackage/page/pages/goToHome/goToHome'
,
});
}
}
}
}
}
}
...
@@ -223,7 +213,7 @@ wxService.page({
...
@@ -223,7 +213,7 @@ wxService.page({
},
},
//弹出原生提示框让用户去点击
//弹出原生提示框让用户去点击
showConfirmModal
(
id
){
showConfirmModal
(
id
){
//先判断是否已经弹出服务通知了
let
self
=
this
;
let
self
=
this
;
if
(
this
.
showModal
){
if
(
this
.
showModal
){
return
;
return
;
...
@@ -339,6 +329,7 @@ wxService.page({
...
@@ -339,6 +329,7 @@ wxService.page({
const
{
activityId
}
=
this
.
data
const
{
activityId
}
=
this
.
data
wxService
.
router
(
`/subPackage/page/pages/pointGoodsList/pointGoodsList`
).
search
({
activityId
})
wxService
.
router
(
`/subPackage/page/pages/pointGoodsList/pointGoodsList`
).
search
({
activityId
})
},
},
_closeDialog
()
{
_closeDialog
()
{
const
{
id
}
=
this
.
data
const
{
id
}
=
this
.
data
if
(
id
)
this
.
getPointDetail
(
id
)
if
(
id
)
this
.
getPointDetail
(
id
)
...
@@ -391,6 +382,7 @@ wxService.page({
...
@@ -391,6 +382,7 @@ wxService.page({
dialog
dialog
})
})
},
},
handleToGet
()
{
handleToGet
()
{
// 按钮防止短时间多次点击
// 按钮防止短时间多次点击
const
{
countObj
}
=
this
.
data
const
{
countObj
}
=
this
.
data
...
@@ -481,8 +473,16 @@ wxService.page({
...
@@ -481,8 +473,16 @@ wxService.page({
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
const
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
if
(
!
baseUserInfo
){
this
.
setData
({
isAuthorization
:
true
});
return
;
}
this
.
getPointDetail
(
this
.
data
.
id
);
},
},
...
...
src/project.config.json
View file @
ef2f3dca
...
@@ -142,7 +142,7 @@
...
@@ -142,7 +142,7 @@
"id"
:
15
,
"id"
:
15
,
"name"
:
"集点详情"
,
"name"
:
"集点详情"
,
"pathName"
:
"pages/pointDetail/pointDetail"
,
"pathName"
:
"pages/pointDetail/pointDetail"
,
"query"
:
"
scene=i%3DdYP6rbn100
"
,
"query"
:
"
id=711939547193294848
"
,
"scene"
:
null
"scene"
:
null
},
},
{
{
...
...
src/utils/wxService.js
View file @
ef2f3dca
...
@@ -133,7 +133,7 @@ class WXService extends Http {
...
@@ -133,7 +133,7 @@ class WXService extends Http {
const
pages
=
getCurrentPages
()
const
pages
=
getCurrentPages
()
const
perpage
=
pages
[
pages
.
length
-
1
]
const
perpage
=
pages
[
pages
.
length
-
1
]
perpage
.
onShow
()
perpage
.
onShow
()
},
2
000
)
},
1
000
)
return
Promise
.
resolve
({
response
})
return
Promise
.
resolve
({
response
})
}
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
...
...
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