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
85e65b1e
Commit
85e65b1e
authored
Aug 09, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify: 集点详情_hidden_btn
parent
7c6611d4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
14 deletions
+24
-14
pointDetail.js
src/pages/pointDetail/pointDetail.js
+7
-3
pointDetail.wxml
src/pages/pointDetail/pointDetail.wxml
+17
-11
No files found.
src/pages/pointDetail/pointDetail.js
View file @
85e65b1e
...
...
@@ -29,7 +29,9 @@ wxService.page({
surplusExchangeCount
:
0
},
currentPercent
:
0
,
// 当前进度
isDisabled
:
false
isDisabled
:
false
,
hideGetBtn
:
true
,
// 默认隐藏 可领取按钮
showGetBtn
:
true
,
// 默认展示 未达成按钮
},
/**
* 生命周期函数--监听页面加载
...
...
@@ -105,12 +107,14 @@ wxService.page({
newPercent
=
0
}
}
if
(
result
==
0
)
{
this
.
setData
({
countObj
:
data
,
currentPercent
:
100
/
(
this
.
data
.
goal
/
newPercent
),
surplusExchangeCount
:
data
.
surplusExchangeCount
surplusExchangeCount
:
data
.
surplusExchangeCount
,
hideGetBtn
:
hasNum
?
false
:
true
,
showGetBtn
:
hasNum
?
true
:
false
,
},
()
=>
{
wx
.
hideLoading
()
})
...
...
src/pages/pointDetail/pointDetail.wxml
View file @
85e65b1e
<!--pages/pointDetail/pointDetail.wxml-->
<wxs src="./tools.wxs" module="tools" />
<status-img imgHeight="{{imgHeight}}" img="{{detailImage}}" />
<view class="detail-info border_box" wx:if="{{
detailImage
}}">
<view class="detail-info border_box" wx:if="{{
goal
}}">
<view class="info-top weui-flex df-j--bt">
<view class="info-num">
进度:
<!--可领取次数_surplusExchangeCount 存在 3/3 不存在 0/3 -->
<span wx:if="{{countObj.surplusExchangeCount}}">
<!-- 被整除 是 显示目标集点 否 显示余数-->
<text class="point_color" wx:if="{{tools.parse(countObj.totalPoints % goal) == 0}}"> {{goal}}</text>
<text class="point_color" wx:else> {{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}</text>
<!-- <text class="point_color" wx:if="{{tools.parse(countObj.totalPoints / goal) == countObj.totalPoints}}"> {{goal}}</text>
<span wx:if="{{countObj.surplusExchangeCount}}">
<!-- 被整除 是 显示目标集点 否 显示余数-->
<text class="point_color" wx:if="{{tools.parse(countObj.totalPoints % goal) == 0}}"> {{goal}}</text>
<text class="point_color" wx:else> {{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}</text>
<!-- <text class="point_color" wx:if="{{tools.parse(countObj.totalPoints / goal) == countObj.totalPoints}}"> {{goal}}</text>
<text class="point_color" wx:else> {{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}</text>-->
</span>
<text class="point_color" wx:else> {{countObj.totalPoints ? tools.parse(countObj.totalPoints % goal) : 0}}</text>
/ {{goal}}
</view>
<view class="info-ready-num">
<!-- 已达成次数 总集点数/目标节点 取整 -->
<!-- 已达成次数 总集点数/目标节点 取整 -->
已达成 {{countObj.totalPoints ? tools.parse(countObj.totalPoints / goal) : 0}} 次
</view>
</view>
...
...
@@ -32,7 +32,7 @@
</view>
<!-- 活动剩余点数 >= 目标点数 wx:if="{{countObj.surplusPoints >= goal}}"-->
<button
wx:if="{{countObj.surplusExchangeCount
}}"
hidden="{{hideGetBtn
}}"
bindtap="handleToGet"
class="info-status-btn border_box available breathe-btn"
disabled="{{isDisabled}}"
...
...
@@ -40,9 +40,10 @@
<text class="total-points"> {{countObj.surplusExchangeCount}} </text>
次
</button>
<view
wx:else
class="info-status-btn unacommpolished border_box">
<view
hidden="{{showGetBtn}}"
class="info-status-btn unacommpolished border_box">
还未达成,继续加油呀
</view>
</view>
<view class="detail-desc">
<view class="detail-active point_color" bindtap="handleCheckGoods" wx:if="{{type == 1}}">查看活动商品 ></view>
...
...
@@ -52,5 +53,10 @@
</view>
</view>
<x-dialog dialog="{{dialog}}" bind:handleGo="handleGo" bind:_closeDialog="_closeDialog" show="{{dialog.show}}" />
<x-dialog
dialog="{{dialog}}"
bind:handleGo="handleGo"
bind:_closeDialog="_closeDialog"
show="{{dialog.show}}"
/>
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