|
|
|
@ -536,8 +536,8 @@ |
|
|
|
其他 |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view class="guize-list" style="border-top: 5px solid #eee;padding: 10px;"> |
|
|
|
<view style="border-bottom: 5px solid #eee;"> |
|
|
|
<view class="guize-list"> |
|
|
|
<view style="border-bottom: 5px solid #eee;border-top: 5px solid #eee;padding: 10px 0;"> |
|
|
|
<view style="flex: 1;color: #777;font-weight: 700;"> |
|
|
|
申请说明 |
|
|
|
</view> |
|
|
|
@ -555,7 +555,6 @@ |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view style="height: 180rpx;line-height: 80rpx;font-size: 28rpx;font-weight: 700;text-align: center;"> |
|
|
|
|
|
|
|
<text v-if="(((payData.orderType == 2 || payData.orderType == 3) && payData.status == 2) || ((payData.orderType == 2 || payData.orderType == 3) && payData.status == 3) || (payData.deliveryType == 1 && payData.status == 3) || payData.status == 4) && payData.otherOrder == null">取消订单需要商家同意</text> |
|
|
|
<view v-if="(payData.status == 3 && payData.deliveryType ==1) || payData.status == 4"> |
|
|
|
<text v-if="payData.shopMakeTime == null && payData.otherOrder == null">商家还未出餐</text> |
|
|
|
|
