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

修复订单退租失败问题

Browse Source
This commit is contained in:
geng.tang@qq.com
2024-01-29 15:31:45 +08:00
parent 048aa2720b
commit 4a2f46cb2c
3 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pages/checkout/checkout.vue
View File

@@ -328,6 +328,8 @@
if(res.code == 0){
app.$success("下单成功")
setTimeout(() => {
uni.hideLoading({
})
uni.redirectTo({
url: '/pages/order/index'
})
@@ -335,6 +337,8 @@
}
else {
app.$error(res.errMsg)
uni.hideLoading({
})
}
})
@@ -342,16 +346,19 @@
});
} else {
checkFreeze(orderId).then((res) => {
console.log(res)
if(res.code == 0){
app.$success("下单成功")
setTimeout(() => {
uni.hideLoading({
})
uni.redirectTo({
url: '/pages/order/index'
})
}, 100)
}
else {
uni.hideLoading({
})
app.$error(res.errMsg)
}
})

14
pages/order/detail.vue
View File

@@ -219,7 +219,7 @@
<view class="info-item">
<view class="item-lable">设备型号</view>
<view class="item-content">
<text>{{ equipment.batteryModel }}</text>
<text>{{ equipmentGoods.batteryModel }}</text>
</view>
</view>
@@ -295,13 +295,13 @@
<view class="info-item">
<view class="item-lable">保险到期时间</view>
<view class="item-content">
<text></text>
<text>{{ order.insuranceExpireDate }}</text>
</view>
</view>
<view class="info-item">
<view class="item-lable">设备编号</view>
<view class="item-content">
<text>{{ equipment.equipmentCode }}</text>
<text>{{ equipmentGoods.equipmentCode }}</text>
<view class="act-copy" @click="handleCopy(equipment.equipmentCode)">
<text>复制</text>
</view>
@@ -330,16 +330,16 @@
<view class="info-item">
<view class="item-lable">保险到期时间</view>
<view class="item-content">
<text></text>
<text>{{ order.insuranceExpireDate }}</text>
</view>
</view>
</block>
<view class="info-item">
<!-- <view class="info-item">
<view class="item-lable">订单备注</view>
<view class="item-content">
<text>{{ order.buyerRemark ? order.buyerRemark : '--' }}</text>
</view>
</view>
</view> -->
</view>
@@ -519,7 +519,7 @@
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租</view>
<view class="btn-item" @click="handleHireEquipment(order.orderId)"
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 30 && order.receiptStatus != 21 && !orderEnd && order.orderId >= 28804">我要续费</view>
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 30 && order.receiptStatus != 21 && !orderEnd && order.orderId >= 28804 && order.deliveryStatus == 40">我要续费</view>
<block v-if="order.orderStatus == OrderStatusEnum.COMPLETED.value && order.isComment == 0">
<view class="btn-item" v-if="order.equipmentGoods.equipmentCategory == '40' && order.deliveryStatus == DeliveryStatusEnum.ACCEPT.value"

18
pages/order/index.vue
View File

@@ -101,13 +101,13 @@
<view v-if="item.deliveryStatus <= 20 && item.receiptStatus == 10" class="btn-item active" @click="onReceipt(item.orderId)">确认收货</view>
<view v-else-if="item.orderStatus == 30 && item.deliveryStatus == 20 && item.receiptStatus == 20" class="btn-item active" @click="onBind(item)">绑定设备</view>
<view class="btn-item" @click="handleRentingOut(order)"
<view class="btn-item" @click="handleRentingOut(item)"
v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus != 21 && item.receiptStatus != 30">我要退租</view>
<view class="btn-item" @click="handleRentingOut(order)"
<view class="btn-item" @click="handleRentingOut(item)"
v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus == 21 && !orderEnd">取消退租</view>
<view class="btn-item" @click="handleTargetDetail(item.orderId)"
v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus != 30 && item.receiptStatus != 21 && !orderEnd && item.orderId >= 28804">我要续费</view>
<view class="btn-item" @click="handleHireEquipment(item.orderId)"
v-if="item.equipmentGoods.equipmentCategory != '10' && item.receiptStatus != 30 && item.receiptStatus != 21 && !orderEnd && item.orderId >= 28804 && order.deliveryStatus == 40">我要续费</view>
<block v-if="item.orderStatus == OrderStatusEnum.COMPLETED.value && item.isComment == 0">
<view class="btn-item" v-if="item.equipmentGoods.equipmentCategory == '40' && item.deliveryStatus == DeliveryStatusEnum.ACCEPT.value"
@@ -678,6 +678,16 @@
app.equipmentId = equipmentId
app.showQRCodeBindChange = true
},
// 续费
handleHireEquipment(orderId) {
getOrderPayByOrderId(orderId).then(res => {
this.$navTo('pages/checkout/cashier/index', {
orderId: res.data.id
})
})
},
// 换电
doEquipment(canReset = false) {
const app = this