fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by 邱骏
Commit ee8b3478b25f7c7d109a6290a5390a377eaee480 2 parents 80cf4800 ca272657

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

Inline Side-by-side
Showing 8 changed files with 32 additions and 106 deletions
<view class="bottom-action" >
<slot></slot>
</view>
\ No newline at end of file
... ...
.bottom-action {
position: fixed;
bottom: 0;
left: 0;
... ... @@ -9,5 +8,6 @@
text-align: center;
padding-left: 30rpx;
padding-right: 30rpx;
border-top: 1rpx solid #E0E0E0
}
... ...
... ... @@ -4,8 +4,5 @@ Component({
data: {
},
methods: {
cancel() {
this.triggerEvent('cancel');
}
}
});
... ...
<view class="modal-mask" catchtap="cancel"></view>
<view class="modal-mask"></view>
<view class="modal-dialog">
<image class="modal-icon"src="../../../../../static/images/gou@2x.png"></image>
<slot></slot>
... ...
... ... @@ -287,8 +287,8 @@ Page(Object.assign({
let productDesc = [];
if (res.data.attachment) {
productDesc = res.data.attachment.map(a => {
if (res.data.attachment && res.data.attachment[1]) {
productDesc = res.data.attachment.slice(1).map(a => {
return {
imageUrl: a.attachUrl,
intro: a.intro
... ... @@ -483,7 +483,7 @@ Page(Object.assign({
if ((this.data.avatarList.length + 1) === this.data.assistLimit) {
detailModel.getLimitCode(this.data.originUid, this.data.limitProductCode);
}
} else if (result.code === 401) {
} else if (result.code === 9001) {
this.setData({
assistSuccess: ASSIST_SUCCESS.REPEAT
});
... ... @@ -536,7 +536,7 @@ Page(Object.assign({
queueSuccess: QUEUE_SUCCESS.OK,
queueStatus: QUEUE_STATUS.QUEUE_HELP
});
} else if (result.code === 401) {
} else if (result.code === 9001) {
this.setData({
queueSuccess: QUEUE_SUCCESS.REPEAT
});
... ...
... ... @@ -210,7 +210,7 @@
<action-bar wx:elif="{{queueStatus === 3}}">
<view class="bottom1-action">
<view class="action-list">
<view class="as-bottom cancel width250" bindtap="goQueueList">排队中，查看详情</view>
<view class="as-bottom confirm width250" bindtap="goQueueList">排队中，查看详情</view>
<view class="as-bottom ok width250" bindtap="assistShare">邀请好友助力排队</view>
</view>
... ... @@ -218,74 +218,11 @@
</view>
</action-bar>
<block wx:elif="{{queueStatus === 4}}">
<block wx:if="{{showStatus === 3}}">
<action-bar>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
</block>
<block wx:elif="{{showStatus === 4}}">
<action-bar>
<view class="bottom1-action">
<view class="as-bottom ok" bindtap="buyNow">立即购买</view>
</view>
</action-bar>
</block>
<block wx:elif="{{showStatus === 6}}">
<action-bar>
<view class="bottom1-action">
<view class="as-bottom cancel width200">即将开售</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view>
</view>
</action-bar>
</block>
<block wx:elif="{{showStatus === 7}}">
<action-bar>
<view class="bottom1-action">
<view class="as-bottom cancel">立即购买</view>
</view>
</action-bar>
</block>
<action-bar wx:else>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
</block>
<block wx:elif="{{queueStatus === 6}}">
<action-bar>
<view class="bottom1-action">
<view class="action-list">
<view class="as-bottom cancel width200" bindtap="goQueueList">查看排队详情</view>
<view class="as-bottom ok width200">等待抽奖</view>
</view>
<view class="help" bindtap="goHelp">?</view>
</view>
</action-bar>
</block>
<action-bar wx:else>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
<view class="bottom1-action">
<view class="as-bottom ok" bindtap="goQueueList">排队已结束 查看详情</view>
<view class="help" bindtap="goHelp">?</view>
</view>
</view>
</action-bar>
... ... @@ -311,25 +248,11 @@
</action-bar>
<block wx:elif="{{queueStatus === 4}}">
<block wx:if="{{showStatus === 2}}">
<action-bar>
<view class="bottom1-action">
<view class="as-bottom cancel">立即购买</view>
</view>
</action-bar>
</block>
<block wx:elif="{{showStatus === 5}}">
<action-bar>
<view class="bottom1-action">
<view class="as-bottom cancel">即将售罄</view>
</view>
</action-bar>
</block>
<action-bar wx:else>
<action-bar>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看详情</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
... ... @@ -340,6 +263,7 @@
<action-bar>
<view class="bottom1-action">
<view class="as-bottom cancel width200">已助力</view>
<view style="width:10rpx;"></view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view>
<view class="help" bindtap="goHelp">?</view>
</view>
... ... @@ -351,7 +275,7 @@
<view class="top-assist-action">
<view class="top-title" >你的好友已助力成功</view>
<view class="top-action3">
<view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看详情</view>
<view class="as-bottom cancel width200" bindtap="restartSelfShare">我也要参加</view>
</view>
</view>
... ... @@ -362,7 +286,7 @@
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看详情</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
... ... @@ -371,7 +295,7 @@
</block>
<block wx:if="{{modal}}">
<yoho-alert wx:if="{{assistSuccess === 1}}" bindcancel="hideAlert">
<yoho-alert wx:if="{{assistSuccess === 1}}" >
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">助力成功</view>
... ... @@ -384,7 +308,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{assistSuccess === 2}}" bindcancel="hideAlert">
<yoho-alert wx:if="{{assistSuccess === 2}}" >
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">重复助力</view>
... ... @@ -396,7 +320,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{queueSuccess === 1}}" bindcancel="hideAlert">
<yoho-alert wx:if="{{queueSuccess === 1}}" >
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">助力成功</view>
... ... @@ -418,7 +342,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{queueSuccess === 2}}" bindcancel="hideAlert">
<yoho-alert wx:if="{{queueSuccess === 2}}" >
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">重复助力</view>
... ... @@ -440,7 +364,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{queueSuccess === 3}}" bindcancel="hideAlert">
<yoho-alert wx:if="{{queueSuccess === 3}}" >
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">助力失败</view>
... ... @@ -462,7 +386,7 @@
</view>
</yoho-alert>
<yoho-alert wx:if="{{error}}" bindcancel="hideAlert">
<yoho-alert wx:if="{{error}}" >
<view class="modal-content">
<view class="modal-title">
<view class="sub-title">助力失败</view>
... ...
... ... @@ -103,12 +103,12 @@
.bottom1-action .help {
position: absolute;
height: 50rpx;
width: 50rpx;
line-height: 50rpx;
border-radius: 25rpx;
height: 36rpx;
width: 36rpx;
line-height: 36rpx;
border-radius: 18rpx;
color: #fff;
font-size: 40rpx;
font-size: 28rpx;
background-color: #d0021b;
right: 30rpx;
top:50%;
... ... @@ -169,6 +169,10 @@
background-color: #b0b0b0;
}
.confirm {
background-color: black;
}
.modal-content {
text-align: center;
}
... ...
... ... @@ -33,7 +33,7 @@
"list": []
},
"miniprogram": {
"current": 0,
"current": 2,
"list": [
{
"id": 0,
... ...