Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-luck
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
lea guo
6 years ago
Commit
2fbc4997070f2c1e85f4b84ceb26bef862bf76da
1 parent
4f247c7a
yohood抽奖
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
pages/zeroSell/components/yohoodLottery/product-detail-header.js
pages/zeroSell/components/yohoodLottery/product-detail-header.wxml
pages/zeroSell/originalPriceSell.js
pages/zeroSell/originalPriceSell.wxml
pages/zeroSell/components/yohoodLottery/product-detail-header.js
View file @
2fbc499
...
...
@@ -8,7 +8,7 @@ Component({
observer
(
product
)
{
const
{
end_time
:
endTime
,
start_time
:
startTime
,
status
}
=
product
;
let
nextActivityTime
=
''
;
if
(
status
===
1
&&
endTime
)
{
if
(
status
===
1
||
status
===
3
)
{
nextActivityTime
=
`
$
{
formatTimeByDefined
(
startTime
,
'Y.M.D h:m'
,
...
...
pages/zeroSell/components/yohoodLottery/product-detail-header.wxml
View file @
2fbc499
...
...
@@ -14,8 +14,8 @@
<view class="number-seprator" wx:if="{{index !== 2}}">:</view>
</view>
</view>
<view class="next-preview" wx:if="{{product.status === 1}}" hidden="{{ show }}">
<text class="next-tip">下一场活动时间</text>
<view class="next-preview" wx:if="{{product.status === 1 || product.status === 3}}" hidden="{{ show }}">
<text class="next-tip">{{product.status === 1 ? '下一场活动时间' : '活动时间'}}</text>
<text class="next-time">{{nextActivityTime}}</text>
</view>
<view class="avatarcontainer">
...
...
pages/zeroSell/originalPriceSell.js
View file @
2fbc499
...
...
@@ -182,9 +182,14 @@ Page(
wx
.
showLoading
({
mask
:
true
,
});
this
.
_init
({
isPulldown
:
true
}).
then
(()
=>
{
wx
.
stopPullDownRefresh
();
});
const
{
product
=
{}}
=
this
.
data
;
if
(
product
.
status
===
3
)
{
wx
.
navigateTo
({
url
:
'/pages/zeroSell/originalPriceSell'
})
}
else
{
this
.
_init
({
isPulldown
:
true
}).
then
(()
=>
{
wx
.
stopPullDownRefresh
();
});
}
},
/**
...
...
pages/zeroSell/originalPriceSell.wxml
View file @
2fbc499
...
...
@@ -32,7 +32,7 @@
<view class="fellow-bar" wx:if="{{product.status && !shareFlag}}">
<block wx:if="{{product.status >= 3}}">
<view class="endTip">
<text>{{notice.content || '本场活动已结束
,请关注中奖结果通知
'}}</text>
<text>{{notice.content || '本场活动已结束
(下拉刷新可查看新活动)
'}}</text>
</view>
</block>
<block wx:elif="{{notice.content}}">
...
...
Please
register
or
login
to post a comment