Authored by htoooth

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

@@ -106,53 +106,55 @@ @@ -106,53 +106,55 @@
106 </block> 106 </block>
107 107
108 <!--弹出消息框--> 108 <!--弹出消息框-->
109 - <view class='msg-container' hidden='{{!showMsg ? true : false}}'>  
110 - <block wx:if='{{userInfo.sort}}'><!--用户有排队信息的情况下-->  
111 - <block wx:if='{{activityInfo.isDrawEnd}}'><!--如果活动结束,并开奖-->  
112 - <block wx:if='{{userInfo.isLucky}}'><!--中奖弹框-->  
113 - <text class='title'>恭喜!</text>  
114 - <text class='queue-text lucky'>  
115 - <text>恭喜您限购码GET,请到个人中心查看明细。</text>  
116 - </text>  
117 - <view class='msg-button-container'>  
118 - <view class='button-close' bindtap='closeMsg'>关闭</view>  
119 - <button class='button-share' plain='true' bindtap='navigateToUserCodePage'>去看看</button>  
120 - </view>  
121 - </block>  
122 - <block wx:else><!--没中奖弹框-->  
123 - <text class='title'>OOPS!</text>  
124 - <text class='queue-text lucky'>  
125 - <text>幸运女神擦肩而过,不要灰心下次就是您!</text>  
126 - </text>  
127 - <view class='msg-button-container fail'>  
128 - <view class='button-close' bindtap='closeMsg'>关闭</view>  
129 - </view>  
130 - </block>  
131 - </block>  
132 - <block wx:else><!--活动没结束,排队成功弹框-->  
133 - <text class='title'>排队成功</text>  
134 - <text class='queue-text'>  
135 - <text>您的排队号为: </text>  
136 - <text class='queue-num'>{{userInfo.sort}}</text>  
137 - </text>  
138 - <text class='share-text'>邀请小伙伴助力,中奖几率更高哦~</text>  
139 - <form bindsubmit='submitFormId' report-submit='true'>  
140 - <view class='msg-button-container'>  
141 - <button class='button-close' bindtap='closeMsg' plain='true' form-type='submit'>关闭</button>  
142 - <button class='button-share' open-type="share" plain='true' form-type='submit'>去分享</button>  
143 - </view>  
144 - </form>  
145 - </block>  
146 - </block>  
147 - <block wx:else><!--活动结束弹框-->  
148 - <text class='title'>OOPS!</text>  
149 - <text class='queue-text fail'>  
150 - <text>您来晚啦,下次早点哦</text>  
151 - </text>  
152 - <view class='msg-button-container fail'>  
153 - <view class='button-close' bindtap='closeMsg'>关闭</view>  
154 - </view>  
155 - </block> 109 + <view class='msg-wrapper' hidden='{{!showMsg ? true: false}}'>
  110 + <view class='msg-container'>
  111 + <block wx:if='{{userInfo.sort}}'><!--用户有排队信息的情况下-->
  112 + <block wx:if='{{activityInfo.isDrawEnd}}'><!--如果活动结束,并开奖-->
  113 + <block wx:if='{{userInfo.isLucky}}'><!--中奖弹框-->
  114 + <text class='title'>恭喜!</text>
  115 + <text class='queue-text lucky'>
  116 + <text>恭喜您限购码GET,请到个人中心查看明细。</text>
  117 + </text>
  118 + <view class='msg-button-container'>
  119 + <view class='button-close' bindtap='closeMsg'>关闭</view>
  120 + <button class='button-share' plain='true' bindtap='navigateToUserCodePage'>去看看</button>
  121 + </view>
  122 + </block>
  123 + <block wx:else><!--没中奖弹框-->
  124 + <text class='title'>OOPS!</text>
  125 + <text class='queue-text lucky'>
  126 + <text>幸运女神擦肩而过,不要灰心下次就是您!</text>
  127 + </text>
  128 + <view class='msg-button-container fail'>
  129 + <view class='button-close' bindtap='closeMsg'>关闭</view>
  130 + </view>
  131 + </block>
  132 + </block>
  133 + <block wx:else><!--活动没结束,排队成功弹框-->
  134 + <text class='title'>排队成功</text>
  135 + <text class='queue-text'>
  136 + <text>您的排队号为: </text>
  137 + <text class='queue-num'>{{userInfo.sort}}</text>
  138 + </text>
  139 + <text class='share-text'>邀请小伙伴助力,中奖几率更高哦~</text>
  140 + <form bindsubmit='submitFormId' report-submit='true'>
  141 + <view class='msg-button-container'>
  142 + <button class='button-close' bindtap='closeMsg' plain='true' form-type='submit'>关闭</button>
  143 + <button class='button-share' open-type="share" plain='true' form-type='submit'>去分享</button>
  144 + </view>
  145 + </form>
  146 + </block>
  147 + </block>
  148 + <block wx:else><!--活动结束弹框-->
  149 + <text class='title'>OOPS!</text>
  150 + <text class='queue-text fail'>
  151 + <text>您来晚啦,下次早点哦</text>
  152 + </text>
  153 + <view class='msg-button-container fail'>
  154 + <view class='button-close' bindtap='closeMsg'>关闭</view>
  155 + </view>
  156 + </block>
  157 + </view>
156 </view> 158 </view>
157 <form bindsubmit='submitFormId' report-submit='true'> 159 <form bindsubmit='submitFormId' report-submit='true'>
158 <button wx:if="{{activityInfo.isBegin === 1 && userInfo.isDrawline && !activityInfo.isEnd}}" class='invite-button' hidden='{{hideInviteButton}}' form-type='submit' bindtap='inviteFriends'> 160 <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 { @@ -373,6 +373,16 @@ image {
373 height: 100%; 373 height: 100%;
374 } 374 }
375 375
  376 +.msg-wrapper {
  377 + position: fixed;
  378 + left: 0;
  379 + top: 0;
  380 + width: 100%;
  381 + height: 100%;
  382 + background-color: rgba(0, 0, 0, 0.4);
  383 + z-index: 19;
  384 +}
  385 +
376 .msg-container { 386 .msg-container {
377 display: flex; 387 display: flex;
378 position: fixed; 388 position: fixed;
@@ -385,7 +395,7 @@ image { @@ -385,7 +395,7 @@ image {
385 top: 376rpx; 395 top: 376rpx;
386 border-radius: 10rpx; 396 border-radius: 10rpx;
387 background-color: #fff; 397 background-color: #fff;
388 - z-index: 19; 398 + z-index: 20;
389 } 399 }
390 400
391 .msg-container form { 401 .msg-container form {
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 "id": -1, 68 "id": -1,
69 "name": "限定商品排队", 69 "name": "限定商品排队",
70 "pathName": "pages/queue/index", 70 "pathName": "pages/queue/index",
71 - "query": "actId=388" 71 + "query": "actId=384"
72 }, 72 },
73 { 73 {
74 "id": 5, 74 "id": 5,