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
a0bc9fa4
Commit
a0bc9fa4
authored
Aug 06, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add: 兑换成功隐藏遮罩
parent
18440151
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
pointDetail.js
src/pages/pointDetail/pointDetail.js
+11
-5
pointDetail.wxml
src/pages/pointDetail/pointDetail.wxml
+1
-1
No files found.
src/pages/pointDetail/pointDetail.js
View file @
a0bc9fa4
...
@@ -44,9 +44,9 @@ wxService.page({
...
@@ -44,9 +44,9 @@ wxService.page({
wx
.
hideLoading
()
wx
.
hideLoading
()
let
dialog
=
this
.
data
.
dialog
let
dialog
=
this
.
data
.
dialog
// popupType: 0 1 优惠券 2 积分
// popupType: 0 1 优惠券 2 积分
if
(
data
.
popupType
==
1
)
{
if
(
data
.
popupType
==
1
)
{
dialog
.
content
=
'优惠券'
dialog
.
content
=
'优惠券'
}
else
if
(
data
.
popupType
==
2
)
{
}
else
if
(
data
.
popupType
==
2
)
{
dialog
.
content
=
'积分流水'
dialog
.
content
=
'积分流水'
}
}
this
.
setData
({
this
.
setData
({
...
@@ -79,7 +79,7 @@ wxService.page({
...
@@ -79,7 +79,7 @@ wxService.page({
countObj
:
data
,
countObj
:
data
,
// currentPercent: (100 / 5) * 2
// currentPercent: (100 / 5) * 2
currentPercent
:
(
100
/
this
.
data
.
goal
)
*
data
.
surplusPoints
currentPercent
:
(
100
/
this
.
data
.
goal
)
*
data
.
surplusPoints
},
()
=>
{
},
()
=>
{
wx
.
hideLoading
()
wx
.
hideLoading
()
})
})
}
}
...
@@ -88,12 +88,11 @@ wxService.page({
...
@@ -88,12 +88,11 @@ wxService.page({
},
},
handleCheckGoods
()
{
handleCheckGoods
()
{
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
})
},
},
handleGo
()
{
handleGo
()
{
// 兑换成功跳转
// 兑换成功跳转
this
.
getPointExchange
()
this
.
getPointExchange
()
},
},
// 触点有礼-消费集点兑换
// 触点有礼-消费集点兑换
getPointExchange
()
{
getPointExchange
()
{
...
@@ -107,6 +106,12 @@ wxService.page({
...
@@ -107,6 +106,12 @@ wxService.page({
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
// 隐藏 dialog
let
dialog
=
this
.
data
.
dialog
dialog
.
show
=
false
this
.
setData
({
dialog
},
()
=>
{
// 跳转 popupType: 0 默认不跳转 1 优惠券 2 积分
// 跳转 popupType: 0 默认不跳转 1 优惠券 2 积分
const
{
popupType
}
=
this
.
data
const
{
popupType
}
=
this
.
data
if
(
popupType
==
1
)
{
if
(
popupType
==
1
)
{
...
@@ -114,6 +119,7 @@ wxService.page({
...
@@ -114,6 +119,7 @@ wxService.page({
}
else
if
(
popupType
==
2
)
{
}
else
if
(
popupType
==
2
)
{
wxService
.
router
(
`/pages/integralWater/integralWater`
)
wxService
.
router
(
`/pages/integralWater/integralWater`
)
}
}
})
}
}
}
}
})
})
...
...
src/pages/pointDetail/pointDetail.wxml
View file @
a0bc9fa4
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
</view>
</view>
<view class="detail-desc">
<view class="detail-desc">
<view class="detail-active point_color" bindtap="handleCheckGoods" wx:if="{{type == 2}}">查看活动商品 ></view>
<view class="detail-active point_color" bindtap="handleCheckGoods" wx:if="{{type == 2}}">查看活动商品 ></view>
<view class='integral-list' wx:for="{{desc}}" wx:key="{{i
tem
}}">
<view class='integral-list' wx:for="{{desc}}" wx:key="{{i
ndex
}}">
<text class='integral-title'>{{item.label}}</text>
<text class='integral-title'>{{item.label}}</text>
<text class='integral-desc wpl'>{{item.value}}</text>
<text class='integral-desc wpl'>{{item.value}}</text>
</view>
</view>
...
...
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