Commit a0bc9fa4 by 高淑倩

add: 兑换成功隐藏遮罩

parent 18440151
...@@ -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()
}) })
} }
...@@ -87,13 +87,12 @@ wxService.page({ ...@@ -87,13 +87,12 @@ 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,13 +106,20 @@ wxService.page({ ...@@ -107,13 +106,20 @@ wxService.page({
const { result, data } = res.data const { result, data } = res.data
if (result == 0) { if (result == 0) {
wx.hideLoading() wx.hideLoading()
// 跳转 popupType: 0 默认不跳转 1 优惠券 2 积分 // 隐藏 dialog
const { popupType } = this.data let dialog = this.data.dialog
if (popupType == 1) { dialog.show = false
wxService.router(`/pages/coupons/coupons`) this.setData({
} else if (popupType == 2) { dialog
wxService.router(`/pages/integralWater/integralWater`) }, () => {
} // 跳转 popupType: 0 默认不跳转 1 优惠券 2 积分
const { popupType } = this.data
if (popupType == 1) {
wxService.router(`/pages/coupons/coupons`)
} else if (popupType == 2) {
wxService.router(`/pages/integralWater/integralWater`)
}
})
} }
} }
}) })
......
...@@ -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="{{item}}"> <view class='integral-list' wx:for="{{desc}}" wx:key="{{index}}">
<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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment