fe / yoho-limited-sell-miniapp · Commits

Go to a project

Authored by 邱骏
Commit 2c4c0af5ef70735d031c33a7c092913802686484 2 parents 34426a46 9dddd9c8

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

Inline Side-by-side
Showing 4 changed files with 24 additions and 12 deletions
... ... @@ -192,8 +192,9 @@
<action-bar>
<view class="top-assis-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ... @@ -226,8 +227,9 @@
<action-bar wx:else>
<view class="top-assis-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ... @@ -236,8 +238,9 @@
<action-bar wx:else>
<view class="top-assis-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ... @@ -280,8 +283,9 @@
<action-bar wx:else>
<view class="top-assis-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ... @@ -299,8 +303,9 @@
<action-bar wx:else>
<view class="top-assis-action">
<view class="top-title" >当前活动已结束</view>
<view class="top-action1">
<view class="top-ok" bindtap="goList">查看其他活动</view>
<view class="top-action3">
<view class="top-ok" bindtap="goQueueList">查看中奖信息</view>
<view class="top-cancel" bindtap="goList">查看其他活动</view>
</view>
</view>
</action-bar>
... ...
... ... @@ -183,6 +183,13 @@
width: 220rpx;
}
.top-action3 {
display: flex;
align-items: center;
justify-content: flex-end;
width: 400rpx;
}
.top-assis-action .top-ok {
font-size: 20rpx;
color: #fff;
... ...
... ... @@ -33,7 +33,7 @@
"list": []
},
"miniprogram": {
"current": 0,
"current": 2,
"list": [
{
"id": 0,
... ...
... ... @@ -15,7 +15,7 @@ const appData = {
page: {
productDetail: '/pages/goodsDetail/goodsDetail',
brandDetail: '/pages/goodsList/brand',
guangDetail: 'pages/guang/detail'
guangDetail: '/pages/guang/detail'
}
},
anotherApp: {
... ...