fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by 邱骏
Commit d36a4a61dd5889823314f6881f9f3f3d121c5bc7 2 parents d81fcccd 17df8473

排队页面样式修改

Inline Side-by-side
Showing 4 changed files with 75 additions and 127 deletions
... ... @@ -642,7 +642,11 @@ Page(Object.assign({
});
},
init() {
wx.showLoading();
wx.showLoading({
title: '加载中...',
mask: true,
});
return this.getUid().then(() => {
return this.productInfo();
}).then(() => {
... ...
... ... @@ -43,10 +43,10 @@
<block wx:if="{{showStatus === 1}}">
<block wx:if="{{productSourceType === 1}}">
<action-bar wx:if="{{assistStatus === 1}}">
<action-bar wx:if="{{assistStatus === 1 || assistStatus === 3}}">
<form bindsubmit="assistShare" report-submit='true'>
<view class="bottom1-action">
<button class="action-btn" formType="submit">邀请好友助力获取限购码</button>
<button class="as-bottom ok" formType="submit">邀请好友助力获取限购码</button>
<view class="help" bindtap="goHelp">?</view>
</view>
</form>
... ... @@ -54,16 +54,14 @@
<action-bar wx:elif="{{assistStatus === 2}}">
<view class="bottom1-action">
<view class="action-btn3">即将开售</view>
<view class="as-bottom cancel">即将开售</view>
</view>
</action-bar>
<action-bar wx:else>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
</view>
<view class="as-bottom ok" bindtap="goList">查看其他活动</view>
</view>
</action-bar>
</block>
... ... @@ -73,8 +71,8 @@
<view class="top-assist-action">
<view class="top-title" >你的好友邀请你为ta助力</view>
<view class="top-action">
<view class="top-ok" bindtap="assistAction">帮ta助力</view>
<view class="top-cancel" bindtap="assistCancel">取消</view>
<view class="as-bottom ok width200" bindtap="assistAction">帮ta助力</view>
<view class="as-bottom cancel width200" bindtap="assistCancel">取消</view>
</view>
</view>
</action-bar>
... ... @@ -82,13 +80,13 @@
<action-bar wx:elif="{{assistStatus === 2}}">
<view class="top-assist-action">
<view class="top-title">你的好友已助力成功</view>
<view class="top-ok" bindtap="restartSelfShare">我也要参加</view>
<view class="as-bottom ok" bindtap="restartSelfShare">我也要参加</view>
</view>
</action-bar>
<action-bar wx:elif="{{assistStatus === 4}}">
<view class="bottom1-action">
<view class="action-btn">已助力</view>
<view class="as-bottom ok">已助力</view>
<view class="help" bindtap="goHelp">?</view>
</view>
</action-bar>
... ... @@ -96,9 +94,7 @@
<action-bar wx:else>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
</view>
<view class="as-bottom ok" bindtap="goList">查看其他活动</view>
</view>
</action-bar>
</block>
... ... @@ -108,7 +104,7 @@
<block wx:if="{{productSourceType === 1}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn disable">立即购买</view>
<view class="as-bottom cancel">立即购买</view>
</view>
</action-bar>
</block>
... ... @@ -117,9 +113,7 @@
<action-bar>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
</view>
<view class="as-bottom ok" bindtap="goList">查看其他活动</view>
</view>
</action-bar>
</block>
... ... @@ -129,9 +123,7 @@
<action-bar>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
</view>
<view class="as-bottom ok" bindtap="goList">查看其他活动</view>
</view>
</action-bar>
</block>
... ... @@ -140,7 +132,7 @@
<block wx:if="{{productSourceType === 1}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn ok" bindtap="buyNow">立即购买</view>
<view class="as-bottom ok" bindtap="buyNow">立即购买</view>
</view>
</action-bar>
</block>
... ... @@ -148,9 +140,7 @@
<action-bar>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
</view>
<view class="as-bottom ok" bindtap="goList">查看其他活动</view>
</view>
</action-bar>
</block>
... ... @@ -159,7 +149,7 @@
<block wx:elif="{{showStatus === 5}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn2 disable">即将售罄</view>
<view class="as-bottom cancel">即将售罄</view>
</view>
</action-bar>
</block>
... ... @@ -167,7 +157,7 @@
<block wx:elif="{{showStatus === 6}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn2 disable">即将开售</view>
<view class="as-bottom cancel">即将开售</view>
</view>
</action-bar>
</block>
... ... @@ -176,9 +166,7 @@
<action-bar>
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
</view>
<view class="as-bottom ok" bindtap="goList">查看其他活动</view>
</view>
</action-bar>
</block>
... ... @@ -189,14 +177,14 @@
<block wx:if="{{productSourceType === 1}}">
<action-bar wx:if="{{queueStatus === 1}}">
<view class="bottom1-action">
<view class="action-btn3">即将开售</view>
<view class="as-bottom cancel">即将开售</view>
<view class="help" bindtap="goHelp">?</view>
</view>
</action-bar>
<action-bar wx:elif="{{queueStatus === 2}}">
<view class="bottom1-action">
<view class="action-btn" bindtap="goQueueList">参加排队</view>
<view class="as-bottom ok" bindtap="goQueueList">参加排队</view>
<view class="help" bindtap="goHelp">?</view>
</view>
</action-bar>
... ... @@ -204,8 +192,8 @@
<action-bar wx:elif="{{queueStatus === 3}}">
<view class="bottom1-action">
<view class="action-list">
<view class="action-btn3" bindtap="goQueueList">排队中，查看详情</view>
<view class="action-btn" bindtap="assistShare">邀请好友助力排队</view>
<view class="as-bottom cancel width250" bindtap="goQueueList">排队中，查看详情</view>
<view class="as-bottom ok width250" bindtap="assistShare">邀请好友助力排队</view>
</view>
<view class="help" bindtap="goHelp">?</view>
... ... @@ -218,8 +206,8 @@
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ... @@ -228,7 +216,7 @@
<block wx:elif="{{showStatus === 4}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn ok" bindtap="buyNow">立即购买</view>
<view class="as-bottom ok" bindtap="buyNow">立即购买</view>
</view>
</action-bar>
</block>
... ... @@ -236,8 +224,8 @@
<block wx:elif="{{showStatus === 6}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn2 disable">即将开售</view>
<view class="action-btn" bindtap="goQueueList">查看排队详情</view>
<view class="as-bottom cancel width200">即将开售</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view>
</view>
</action-bar>
</block>
... ... @@ -245,7 +233,7 @@
<block wx:elif="{{showStatus === 7}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn disable">立即购买</view>
<view class="as-bottom cancel">立即购买</view>
</view>
</action-bar>
</block>
... ... @@ -254,8 +242,8 @@
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ... @@ -265,8 +253,8 @@
<action-bar>
<view class="bottom1-action">
<view class="action-list">
<view class="action-btn3" bindtap="goQueueList">查看排队详情</view>
<view class="action-btn">等待抽奖</view>
<view class="as-bottom cancel width200" bindtap="goQueueList">查看排队详情</view>
<view class="as-bottom ok width200">等待抽奖</view>
</view>
<view class="help" bindtap="goHelp">?</view>
... ... @@ -278,8 +266,8 @@
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ... @@ -289,7 +277,7 @@
<block wx:if="{{productSourceType === 2}}">
<action-bar wx:if="{{queueStatus === 1}}">
<view class="bottom1-action">
<view class="action-btn3">即将开售</view>
<view class="as-bottom cancel">即将开售</view>
<view class="help" bindtap="goHelp">?</view>
</view>
</action-bar>
... ... @@ -298,8 +286,8 @@
<view class="top-assist-action">
<view class="top-title" >你的好友邀请你为ta助力排队</view>
<view class="top-action">
<view class="top-ok" bindtap="queueAction">帮ta助力</view>
<view class="top-cancel" bindtap="queueCancel">取消</view>
<view class="as-bottom ok width150" bindtap="queueAction">帮ta助力</view>
<view class="as-bottom cancel width150" bindtap="queueCancel">取消</view>
</view>
</view>
</action-bar>
... ... @@ -308,14 +296,14 @@
<block wx:if="{{showStatus === 2}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn disable">立即购买</view>
<view class="as-bottom cancel">立即购买</view>
</view>
</action-bar>
</block>
<block wx:elif="{{showStatus === 5}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn2 disable">即将售罄</view>
<view class="as-bottom cancel">即将售罄</view>
</view>
</action-bar>
</block>
... ... @@ -323,8 +311,8 @@
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ... @@ -333,8 +321,8 @@
<block wx:elif="{{queueStatus === 5}}">
<action-bar>
<view class="bottom1-action">
<view class="action-btn">已助力</view>
<view class="action-btn3" bindtap="goQueueList">查看排队详情</view>
<view class="as-bottom cancel width200">已助力</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view>
<view class="help" bindtap="goHelp">?</view>
</view>
</action-bar>
... ... @@ -345,8 +333,8 @@
<view class="top-assist-action">
<view class="top-title" >你的好友已助力成功</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看排队详情</view>
<view class="top-cancel" bindtap="restartSelfShare">我也要参加</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看排队详情</view>
<view class="as-bottom cancel width200" bindtap="restartSelfShare">我也要参加</view>
</view>
</view>
</action-bar>
... ... @@ -356,8 +344,8 @@
<view class="top-assist-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
<view class="as-bottom ok width200" bindtap="goQueueList">查看中奖信息</view>
<view class="as-bottom cancel width200" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ...
... ... @@ -101,47 +101,6 @@
justify-content: space-between;
}
.bottom1-action .action-btn {
height: 50rpx;
padding-left: 40rpx;
padding-right: 40rpx;
font-size: 28rpx;
color: #fff;
line-height: 50rpx;
background-color: #d0021b;
border-radius: 25rpx;
}
.action-btn.disable {
background-color: #b0b0b0;
}
.bottom1-action .action-btn2 {
height: 50rpx;
padding-left: 40rpx;
padding-right: 40rpx;
font-size: 28rpx;
color: #fff;
line-height: 50rpx;
background-color: #d0021b;
border-radius: 25rpx;
}
.action-btn2.disable {
background-color: #b0b0b0;
}
.bottom1-action .action-btn3 {
height: 50rpx;
padding-left: 40rpx;
padding-right: 40rpx;
font-size: 28rpx;
color: #fff;
line-height: 50rpx;
background-color: #b0b0b0;
border-radius: 25rpx;
}
.bottom1-action .help {
position: absolute;
height: 36rpx;
... ... @@ -163,9 +122,6 @@
display: flex;
align-items: center;
justify-content: space-between;
}
.top-assist-action .top-title {
font-size: 28rpx;
}
... ... @@ -173,44 +129,44 @@
display: flex;
align-items: center;
justify-content: space-between;
width: 280rpx;
width: 300rpx;
}
.top-assist-action .top-action1 {
.top-action3 {
display: flex;
align-items: center;
justify-content: flex-end;
width: 220rpx;
width: 440rpx;
}
.top-action3 {
display: flex;
align-items: center;
justify-content: flex-end;
width: 400rpx;
.width150 {
width: 150rpx;
}
.top-assist-action .top-ok {
font-size: 20rpx;
color: #fff;
background-color: #d0021b;
padding-left: 40rpx;
padding-right: 40rpx;
height: 50rpx;
line-height: 50rpx;
border-radius: 20px;
text-align: center;
.width200 {
width: 220rpx;
}
.width250 {
width: 250rpx;
}
.top-assist-action .top-cancel {
font-size: 20rpx;
.as-bottom {
font-size: 28rpx;
height: 50rpx;
padding-left: 40rpx;
padding-right: 40rpx;
padding: 0 20rpx;
line-height: 50rpx;
background-color: rgba(216, 216, 216, 1);
text-align: center;
border-radius: 20px;
color: #fff;
}
.ok {
background-color: #d0021b;
}
.cancel {
background-color: #b0b0b0;
}
.modal-content {
... ...
... ... @@ -33,7 +33,7 @@
"list": []
},
"miniprogram": {
"current": 4,
"current": 0,
"list": [
{
"id": 0,
... ...