优化绑定功能按钮显示
This commit is contained in:
@@ -15,14 +15,12 @@
|
||||
<view class="item-top-right">
|
||||
<text class="state-text" v-if="item.payStatus == 10">待支付</text>
|
||||
<text class="state-text" v-else-if="item.orderStatus == 40">已完成</text>
|
||||
<view v-if="item.orderStatus == 30 && item.payStatus == 20">
|
||||
<text class="state-text" v-if="item.deliveryStatus == DeliveryStatusEnum.DELIVERED.value">待绑定</text>
|
||||
<text class="state-text" v-else-if="item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">待收货</text>
|
||||
<!-- <text class="state-text" v-else-if="item.receiptStatus == 21">进行中</text> -->
|
||||
<text class="state-text" v-else>已绑定</text>
|
||||
</view>
|
||||
|
||||
<text class="state-text" v-if="item.payStatus == 20 && item.receiptStatus == 21">进行中</text>
|
||||
<text class="state-text" v-if="item.orderStatus == 30 && item.payStatus == 20 && item.deliveryStatus == 20 && item.receiptStatus == 20">待绑定</text>
|
||||
<text class="state-text" v-else-if="item.orderStatus == 30 && item.payStatus == 20 && item.deliveryStatus == 20 && item.receiptStatus == 10">待收货</text>
|
||||
<!-- <text class="state-text" v-else-if="item.receiptStatus == 21">进行中</text> -->
|
||||
<text class="state-text" v-else-if="item.orderStatus == 30 && item.payStatus == 20 && item.deliveryStatus == 40 && item.receiptStatus == 20">已绑定</text>
|
||||
|
||||
<text class="state-text" v-else-if="item.payStatus == 20 && item.receiptStatus == 21">进行中</text>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 商品列表 -->
|
||||
@@ -100,13 +98,13 @@
|
||||
<view class="btn-item active" @click="onPay(item.orderId)">去支付</view>
|
||||
</block>
|
||||
<!-- 确认收货 -->
|
||||
<block v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
|
||||
<block v-if="item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.DELIVERED.value && item.receiptStatus == ReceiptStatusEnum.NOT_RECEIVED.value">
|
||||
<!-- <view class="btn-item active"
|
||||
v-if="(item.orderSourceData && JSON.parse(item.orderSourceData).length == 5) || item.equipmentGoods.equipmentCategory == '10'"
|
||||
@click="onBind(item)">绑定设备</view> -->
|
||||
<view class="btn-item active" @click="onReceipt(item.orderId)">确认收货</view>
|
||||
</block>
|
||||
<block v-if="item.orderStatus == 30 && item.payStatus == PayStatusEnum.SUCCESS.value && item.deliveryStatus == DeliveryStatusEnum.DELIVERED.value">
|
||||
<block v-if="item.orderStatus == 30 && item.payStatus == 20 && item.deliveryStatus == 20 && item.receiptStatus == 20">
|
||||
<view class="btn-item active" @click="onBind(item)">绑定设备</view>
|
||||
</block>
|
||||
<!-- 订单评价 -->
|
||||
|
||||
Reference in New Issue
Block a user