fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by htoooth
Commit 396438655c162d4cb5b044cb5321f5b008b6bcfb 2 parents 877245cf ee8b3478

Merge branch 'develop' of http://git.yoho.cn/fe/yoho-limited-sell-miniapp into develop

Inline Side-by-side
Showing 3 changed files with 61 additions and 49 deletions
... ... @@ -106,53 +106,55 @@
</block>
<!--弹出消息框-->
<view class='msg-container' hidden='{{!showMsg ? true : false}}'>
<block wx:if='{{userInfo.sort}}'><!--用户有排队信息的情况下-->
<block wx:if='{{activityInfo.isDrawEnd}}'><!--如果活动结束，并开奖-->
<block wx:if='{{userInfo.isLucky}}'><!--中奖弹框-->
<text class='title'>恭喜！</text>
<text class='queue-text lucky'>
<text>恭喜您限购码GET,请到个人中心查看明细。</text>
</text>
<view class='msg-button-container'>
<view class='button-close' bindtap='closeMsg'>关闭</view>
<button class='button-share' plain='true' bindtap='navigateToUserCodePage'>去看看</button>
</view>
</block>
<block wx:else><!--没中奖弹框-->
<text class='title'>OOPS!</text>
<text class='queue-text lucky'>
<text>幸运女神擦肩而过，不要灰心下次就是您！</text>
</text>
<view class='msg-button-container fail'>
<view class='button-close' bindtap='closeMsg'>关闭</view>
</view>
</block>
</block>
<block wx:else><!--活动没结束，排队成功弹框-->
<text class='title'>排队成功</text>
<text class='queue-text'>
<text>您的排队号为: </text>
<text class='queue-num'>{{userInfo.sort}}</text>
</text>
<text class='share-text'>邀请小伙伴助力，中奖几率更高哦~</text>
<form bindsubmit='submitFormId' report-submit='true'>
<view class='msg-button-container'>
<button class='button-close' bindtap='closeMsg' plain='true' form-type='submit'>关闭</button>
<button class='button-share' open-type="share" plain='true' form-type='submit'>去分享</button>
</view>
</form>
</block>
</block>
<block wx:else><!--活动结束弹框-->
<text class='title'>OOPS!</text>
<text class='queue-text fail'>
<text>您来晚啦，下次早点哦</text>
</text>
<view class='msg-button-container fail'>
<view class='button-close' bindtap='closeMsg'>关闭</view>
</view>
</block>
<view class='msg-wrapper' hidden='{{!showMsg ? true: false}}'>
<view class='msg-container'>
<block wx:if='{{userInfo.sort}}'><!--用户有排队信息的情况下-->
<block wx:if='{{activityInfo.isDrawEnd}}'><!--如果活动结束，并开奖-->
<block wx:if='{{userInfo.isLucky}}'><!--中奖弹框-->
<text class='title'>恭喜！</text>
<text class='queue-text lucky'>
<text>恭喜您限购码GET,请到个人中心查看明细。</text>
</text>
<view class='msg-button-container'>
<view class='button-close' bindtap='closeMsg'>关闭</view>
<button class='button-share' plain='true' bindtap='navigateToUserCodePage'>去看看</button>
</view>
</block>
<block wx:else><!--没中奖弹框-->
<text class='title'>OOPS!</text>
<text class='queue-text lucky'>
<text>幸运女神擦肩而过，不要灰心下次就是您！</text>
</text>
<view class='msg-button-container fail'>
<view class='button-close' bindtap='closeMsg'>关闭</view>
</view>
</block>
</block>
<block wx:else><!--活动没结束，排队成功弹框-->
<text class='title'>排队成功</text>
<text class='queue-text'>
<text>您的排队号为: </text>
<text class='queue-num'>{{userInfo.sort}}</text>
</text>
<text class='share-text'>邀请小伙伴助力，中奖几率更高哦~</text>
<form bindsubmit='submitFormId' report-submit='true'>
<view class='msg-button-container'>
<button class='button-close' bindtap='closeMsg' plain='true' form-type='submit'>关闭</button>
<button class='button-share' open-type="share" plain='true' form-type='submit'>去分享</button>
</view>
</form>
</block>
</block>
<block wx:else><!--活动结束弹框-->
<text class='title'>OOPS!</text>
<text class='queue-text fail'>
<text>您来晚啦，下次早点哦</text>
</text>
<view class='msg-button-container fail'>
<view class='button-close' bindtap='closeMsg'>关闭</view>
</view>
</block>
</view>
</view>
<form bindsubmit='submitFormId' report-submit='true'>
<button wx:if="{{activityInfo.isBegin === 1 && userInfo.isDrawline && !activityInfo.isEnd}}" class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'>
... ...
... ... @@ -373,6 +373,16 @@ image {
height: 100%;
}
.msg-wrapper {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.4);
z-index: 19;
}
.msg-container {
display: flex;
position: fixed;
... ... @@ -385,7 +395,7 @@ image {
top: 376rpx;
border-radius: 10rpx;
background-color: #fff;
z-index: 19;
z-index: 20;
}
.msg-container form {
... ...
... ... @@ -68,7 +68,7 @@
"id": -1,
"name": "限定商品排队",
"pathName": "pages/queue/index",
"query": "actId=388"
"query": "actId=384"
},
{
"id": 5,
... ...