b2894lxlx/yunxinwei-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
messi
2024-08-19 20:32:55 +08:00
parent 4913dfd52c
commit dbd2d70005
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pages/order/detail.vue
View File

@@ -50,12 +50,12 @@
</view>
<!-- 下一步操作 -->
<view class="next-action" v-if="order.orderStatus == OrderStatusEnum.NORMAL.value">
<view v-if="order.payStatus == PayStatusEnum.PENDING.value" class="action-btn"
<!-- <view v-if="order.payStatus == PayStatusEnum.PENDING.value" class="action-btn"
@click="onPay(order.orderId)">
去支付</view>
<view
v-if="order.deliveryStatus == DeliveryStatusEnum.DELIVERED.value && order.receiptStatus == ReceiptStatusEnum.NOT_RECEIVED.value"
class="action-btn" @click="onReceipt(order.orderId)">确认收货</view>
class="action-btn" @click="onReceipt(order.orderId)">确认收货</view> -->
</view>
</view>
@@ -510,9 +510,9 @@
<!-- 已申请取消 -->
<view v-else class="f-28 col-8">取消申请中</view>
<!-- 未支付的订单 -->
<block v-if="order.payStatus == PayStatusEnum.PENDING.value">
<!-- <block v-if="order.payStatus == PayStatusEnum.PENDING.value">
<view class="btn-item active" @click="onPay(order.orderId)">去支付</view>
</block>
</block> -->
<!-- 确认收货 -->
<!-- <block
v-if="order.payStatus == 20 && order.receiptStatus == 10">
@@ -530,13 +530,11 @@
v-if="equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租
</view>
</block> -->
<view class="btn-item" v-if="order.receiptStatus==20&&order.idCode==null"
@click="onReceipt(order.orderId)">确认</view>
<view class="btn-item" v-else-if="order.receiptStatus==10" @click="onBind(order)">绑定设备</view>
<block v-if="order.payStatus == PayStatusEnum.SUCCESS.value">
<view class="btn-item" v-if="order.deliveryStatus <= 20 && order.receiptStatus == 10"
@click="onReceipt(order.orderId)">确认收货</view>
<view class="btn-item"
v-else-if="order.orderStatus == 30 && order.deliveryStatus == 20 && order.receiptStatus == 20"
@click="onBind(order)">绑定设备</view>
<view class="btn-item" @click="handleRentingOut(order)"
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 21 && order.receiptStatus != 30">
@@ -1650,7 +1648,7 @@
// 弹出层 - 绑定设备码
.qrcode-bind {
width: 550rpx;
padding: 36rpx 30rpx;
.title {