正在显示
5 个修改的文件
包含
24 行增加
和
18 行删除
| @@ -194,7 +194,7 @@ | @@ -194,7 +194,7 @@ | ||
| 194 | </view> | 194 | </view> |
| 195 | <form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true"> | 195 | <form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true"> |
| 196 | <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除--> | 196 | <!-- // （0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除--> |
| 197 | - <button class="confirm-join-btn {{is_send === 1?'gray':''}}" form-type="submit"> | 197 | + <button class="confirm-join-btn {{(is_send === 2 && detail.status === 8) || (is_send === 2 && detail.status === 2)?'black':''}}" form-type="submit"> |
| 198 | <text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text> | 198 | <text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text> |
| 199 | <text wx:if="{{is_send === 1 && detail.status === 8}}">待完成</text> | 199 | <text wx:if="{{is_send === 1 && detail.status === 8}}">待完成</text> |
| 200 | <text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼活动</text> | 200 | <text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼活动</text> |
| @@ -205,6 +205,7 @@ | @@ -205,6 +205,7 @@ | ||
| 205 | <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text> | 205 | <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text> |
| 206 | <!--<text wx:if="{{detail.status === 8}}">已拼成</text>--> | 206 | <!--<text wx:if="{{detail.status === 8}}">已拼成</text>--> |
| 207 | <text wx:if="{{detail.status === 9}}">已删除</text> | 207 | <text wx:if="{{detail.status === 9}}">已删除</text> |
| 208 | + <text wx:if="{{detail.status === 11}}">已过期</text> | ||
| 208 | </button> | 209 | </button> |
| 209 | </form> | 210 | </form> |
| 210 | </view> | 211 | </view> |
| @@ -414,8 +414,8 @@ swiper { | @@ -414,8 +414,8 @@ swiper { | ||
| 414 | justify-content: center; | 414 | justify-content: center; |
| 415 | width: 206rpx; | 415 | width: 206rpx; |
| 416 | height: 98rpx; | 416 | height: 98rpx; |
| 417 | - color:#E1C8AF; | ||
| 418 | - background-color: #323232; | 417 | + background-color: #CCCCCC; |
| 418 | + color: #ffffff; | ||
| 419 | font-size: 30rpx; | 419 | font-size: 30rpx; |
| 420 | border-radius: 0; | 420 | border-radius: 0; |
| 421 | margin: 0; | 421 | margin: 0; |
| @@ -424,9 +424,9 @@ swiper { | @@ -424,9 +424,9 @@ swiper { | ||
| 424 | .confirm-join-btn::after { | 424 | .confirm-join-btn::after { |
| 425 | border:0; | 425 | border:0; |
| 426 | } | 426 | } |
| 427 | -.gray { | ||
| 428 | - background-color: #CCCCCC; | ||
| 429 | - color: #ffffff; | 427 | +.black { |
| 428 | + color:#E1C8AF; | ||
| 429 | + background-color: #323232; | ||
| 430 | } | 430 | } |
| 431 | .input_box { | 431 | .input_box { |
| 432 | display: flex; | 432 | display: flex; |
| @@ -197,17 +197,18 @@ | @@ -197,17 +197,18 @@ | ||
| 197 | </view> | 197 | </view> |
| 198 | <form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true"> | 198 | <form bindsubmit="confirmJoin" bindreset="formReset" report-submit="true"> |
| 199 | <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除--> | 199 | <!--（0全部，2待拼成，3人数不足未拼成,4已拼成，5已取消，6已完成，7已评价，8已拼成（活动未结束）,9删除--> |
| 200 | - <button class="confirm-join-btn {{is_send === 1 && detail.status !== 8?'gray':''}}" form-type="submit"> | 200 | + <button class="confirm-join-btn {{(is_send === 2 && detail.status === 8) || (is_send === 2 && detail.status === 2)?'black':''}}" form-type="submit"> |
| 201 | <text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text> | 201 | <text wx:if="{{is_send === 1 && detail.status === 2}}">待拼成</text> |
| 202 | <text wx:if="{{is_send === 1 && detail.status === 8}}">待完成</text> | 202 | <text wx:if="{{is_send === 1 && detail.status === 8}}">待完成</text> |
| 203 | <text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼餐</text> | 203 | <text wx:if="{{is_send === 2 && detail.status === 8 }}">确认拼餐</text> |
| 204 | <text wx:if="{{is_send === 2 && detail.status === 2 }}">确认拼餐</text> | 204 | <text wx:if="{{is_send === 2 && detail.status === 2 }}">确认拼餐</text> |
| 205 | <text wx:if="{{detail.status === 3}}">未拼成</text> | 205 | <text wx:if="{{detail.status === 3}}">未拼成</text> |
| 206 | <text wx:if="{{detail.status === 4}}">已拼成</text> | 206 | <text wx:if="{{detail.status === 4}}">已拼成</text> |
| 207 | - <text wx:if="{{detail.status === 5}}">已取消</text> | 207 | + <text wx:if="{{detail.status === 5 || detail.status === 10}}">已取消</text> |
| 208 | <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text> | 208 | <text wx:if="{{detail.status === 6 || detail.status === 7}}">已完成</text> |
| 209 | <!--<text wx:if="{{detail.status === 8}}">已拼成</text>--> | 209 | <!--<text wx:if="{{detail.status === 8}}">已拼成</text>--> |
| 210 | <text wx:if="{{detail.status === 9}}">已删除</text> | 210 | <text wx:if="{{detail.status === 9}}">已删除</text> |
| 211 | + <text wx:if="{{detail.status === 11}}">已过期</text> | ||
| 211 | </button> | 212 | </button> |
| 212 | </form> | 213 | </form> |
| 213 | <!--<view class="confirm-join-btn" bindtap="confirmJoin">--> | 214 | <!--<view class="confirm-join-btn" bindtap="confirmJoin">--> |
| @@ -407,8 +407,8 @@ swiper { | @@ -407,8 +407,8 @@ swiper { | ||
| 407 | justify-content: center; | 407 | justify-content: center; |
| 408 | width: 206rpx; | 408 | width: 206rpx; |
| 409 | height: 98rpx; | 409 | height: 98rpx; |
| 410 | - color:#E1C8AF; | ||
| 411 | - background-color: #323232; | 410 | + background-color: #CCCCCC; |
| 411 | + color: #ffffff; | ||
| 412 | font-size: 30rpx; | 412 | font-size: 30rpx; |
| 413 | border-radius: 0; | 413 | border-radius: 0; |
| 414 | margin: 0; | 414 | margin: 0; |
| @@ -417,9 +417,9 @@ swiper { | @@ -417,9 +417,9 @@ swiper { | ||
| 417 | .confirm-join-btn::after { | 417 | .confirm-join-btn::after { |
| 418 | border:0; | 418 | border:0; |
| 419 | } | 419 | } |
| 420 | -.gray { | ||
| 421 | - background-color: #CCCCCC; | ||
| 422 | - color: #ffffff; | 420 | +.black { |
| 421 | + color:#E1C8AF; | ||
| 422 | + background-color: #323232; | ||
| 423 | } | 423 | } |
| 424 | .input_box { | 424 | .input_box { |
| 425 | display: flex; | 425 | display: flex; |
| @@ -53,14 +53,18 @@ | @@ -53,14 +53,18 @@ | ||
| 53 | <text class="cancel-btn" wx:if="{{detail.status === 2}}" bindtap="cancel">取消订单</text> | 53 | <text class="cancel-btn" wx:if="{{detail.status === 2}}" bindtap="cancel">取消订单</text> |
| 54 | <text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text> | 54 | <text class="cancel-btn gray" wx:if="{{detail.status === 2}}">待拼成</text> |
| 55 | <!--<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>--> | 55 | <!--<text class="cancel-btn gray" wx:if="{{detail.status === 8}}">已拼成</text>--> |
| 56 | - <!--1发布人，2拼餐/拼活动人--> | 56 | + <!--sonType=1发布人，2拼餐/拼活动人--> |
| 57 | <block wx:if="{{detail.sonType === 1}}"> | 57 | <block wx:if="{{detail.sonType === 1}}"> |
| 58 | - <text class="confirm-btn" wx:if="{{detail.status === 3 || detail.status === 8}}" bindtap="cancel">取消订单</text><!--开始前6小时内不能取消--> | 58 | + <text class="cancel-btn" wx:if="{{detail.status === 4 || detail.status === 3 || detail.status === 8}}" bindtap="cancel">取消订单</text><!--开始前6小时内不能取消--> |
| 59 | <text class="cancel-btn gray" wx:if="{{detail.status === 8}}">待完成</text> | 59 | <text class="cancel-btn gray" wx:if="{{detail.status === 8}}">待完成</text> |
| 60 | <text class="cancel-btn gray" wx:if="{{detail.status === 3}}">未拼成</text> | 60 | <text class="cancel-btn gray" wx:if="{{detail.status === 3}}">未拼成</text> |
| 61 | - <block wx:if="{{detail.is_canCheck !== 2}}"> | ||
| 62 | - <!--2是不可以点--> | ||
| 63 | - <text class="confirm-btn add-width" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成,发布人只显示完成按钮--> | 61 | + <block wx:if="{{detail.is_canCheck === 1}}"> |
| 62 | + <!--1是可以点--> | ||
| 63 | + <text class="confirm-btn" wx:if="{{detail.status === 4}}" bindtap="confirm">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成--> | ||
| 64 | + </block> | ||
| 65 | + <block wx:if="{{detail.is_canCheck === 2}}"> | ||
| 66 | + <!--2是不可以点,且灰色--> | ||
| 67 | + <text class="confirm-btn gray" wx:if="{{detail.status === 4}}" bindtap="">完成</text><!--待完成时并且活动时间已开始，发布人可点击完成--> | ||
| 64 | </block> | 68 | </block> |
| 65 | <text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text> | 69 | <text class="confirm-btn add-width gray" wx:if="{{detail.status === 6}}">已完成</text> |
| 66 | </block> | 70 | </block> |
-
请 注册 或 登录 后发表评论