miniprogram / match-west-road · 提交

转到一个项目

作者 wumengyu
提交 9ae068b3647f05a7f9a0636ecfe416e713444602 1 个父辈 70111703

优化状态按钮样式

内嵌 并排对比
正在显示 5 个修改的文件 包含 25 行增加 和 19 行删除
... ... @@ -194,7 +194,7 @@
</view>
<form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
<!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
<button class="confirm-join-btn {{is_send === 1?'gray':''}}" form-type="submit">
<button class="confirm-join-btn {{(is_send === 2 && detail.status === 8) || (is_send === 2 && detail.status === 2)?'black':''}}" form-type="submit">
<text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text>
<text wx:if="{{is_send === 1 && detail.status === 8}}">待完成</text>
<text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼活动</text>
... ... @@ -205,6 +205,7 @@
<text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text>
<!--<text wx:if="{{detail.status === 8}}">已拼成</text>-->
<text wx:if="{{detail.status === 9}}">已删除</text>
<text wx:if="{{detail.status === 11}}">已过期</text>
</button>
</form>
</view>
... ...
... ... @@ -414,8 +414,8 @@ swiper {
justify-content: center;
width: 206rpx;
height: 98rpx;
color:#E1C8AF;
background-color: #323232;
background-color: #CCCCCC;
color: #ffffff;
font-size: 30rpx;
border-radius: 0;
margin: 0;
... ... @@ -424,9 +424,9 @@ swiper {
.confirm-join-btn::after {
border:0;
}
.gray {
background-color: #CCCCCC;
color: #ffffff;
.black {
color:#E1C8AF;
background-color: #323232;
}
.input_box {
display: flex;
... ...
... ... @@ -197,17 +197,18 @@
</view>
<form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true">
<!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除-->
<button class="confirm-join-btn {{is_send === 1 && detail.status !== 8?'gray':''}}" form-type="submit">
<button class="confirm-join-btn {{(is_send === 2 && detail.status === 8) || (is_send === 2 && detail.status === 2)?'black':''}}" form-type="submit">
<text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text>
<text wx:if="{{is_send === 1 && detail.status === 8}}">待完成</text>
<text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼餐</text>
<text wx:if="{{is_send === 2 && detail.status === 2 }}">确认拼餐</text>
<text wx:if="{{detail.status === 3}}">未拼成</text>
<text wx:if="{{detail.status === 4}}">已拼成</text>
<text wx:if="{{detail.status === 5}}">已取消</text>
<text wx:if="{{detail.status === 5 || detail.status === 10}}">已取消</text>
<text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text>
<!--<text wx:if="{{detail.status === 8}}">已拼成</text>-->
<text wx:if="{{detail.status === 9}}">已删除</text>
<text wx:if="{{detail.status === 11}}">已过期</text>
</button>
</form>
<!--<view class="confirm-join-btn" bindtap="confirmJoin">-->
... ...
... ... @@ -407,8 +407,8 @@ swiper {
justify-content: center;
width: 206rpx;
height: 98rpx;
color:#E1C8AF;
background-color: #323232;
background-color: #CCCCCC;
color: #ffffff;
font-size: 30rpx;
border-radius: 0;
margin: 0;
... ... @@ -417,9 +417,9 @@ swiper {
.confirm-join-btn::after {
border:0;
}
.gray {
background-color: #CCCCCC;
color: #ffffff;
.black {
color:#E1C8AF;
background-color: #323232;
}
.input_box {
display: flex;
... ...
... ... @@ -53,16 +53,20 @@
<text class="cancel-btn" wx:if="{{detail.status === 2}}" bindtap="cancel">取消订单</text>
<text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text>
<!--<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>-->
<!--1发布人，2拼餐/拼活动人-->
<!--sonType=1发布人，2拼餐/拼活动人-->
<block wx:if="{{detail.sonType === 1}}">
<text class="confirm-btn" wx:if="{{detail.status === 3 || detail.status === 8}}" bindtap="cancel">取消订单</text><!--开始前6小时内不能取消-->
<text class="cancel-btn" wx:if="{{detail.status === 4 || detail.status === 3 || detail.status === 8}}" bindtap="cancel">取消订单</text><!--开始前6小时内不能取消-->
<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">待完成</text>
<text class="cancel-btn gray" wx:if="{{detail.status === 3}}">未拼成</text>
<block wx:if="{{detail.is_canCheck !== 2}}">
<!--2是不可以点-->
<text class="confirm-btn add-width" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成,发布人只显示完成按钮-->
<block wx:if="{{detail.is_canCheck === 1}}">
<!--1是可以点-->
<text class="confirm-btn" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成-->
</block>
<text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text>
<block wx:if="{{detail.is_canCheck === 2}}">
<!--2是不可以点,且灰色-->
<text class="confirm-btn gray" wx:if="{{detail.status === 4}}" bindtap="">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成-->
</block>
<text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text>
</block>
<block wx:if="{{detail.sonType === 2}}">
<!--<text class="cancel-btn gray border" wx:if="{{detail.status === 8}}">取消订单</text>-->
... ...