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-26 15:31:43 +08:00
parent e954472f26
commit 3b5615eeef
10 changed files with 346 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
pages/order/detail.vue
View File

@@ -12,11 +12,11 @@
<image class="image" src="/static/order/status/wait_pay.png" mode="aspectFit"></image>
</block>
<!-- 待发货 -->
<block v-else-if="order.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
<!-- <block v-else-if="order.deliveryStatus == DeliveryStatusEnum.NOT_DELIVERED.value">
<image class="image" src="/static/order/status/wait_deliver.png" mode="aspectFit"></image>
</block>
</block> -->
<!-- 待收货 -->
<block v-else-if="order.receiptStatus == ReceiptStatusEnum.NOT_RECEIVED.value">
<block v-else-if="order.payStatus == 20 && order.deliveryStatus <= 20 && order.receiptStatus == 10">
<image class="image" src="/static/order/status/wait_receipt.png" mode="aspectFit"></image>
</block>
</block>
@@ -31,13 +31,18 @@
</block>
</view>
<view class="status-text">
<text class="state-text"
v-if="order.payStatus == 20 && (order.receiptStatus == 30 || ( order.equipmentGoods.equipmentCategory != 10 && order.currPeriods >= order.periods))">已完成</text>
<text class="state-text" v-else-if="order.payStatus == 10">待支付</text>
<text class="state-text" v-else-if="order.orderStatus == 30 && order.payStatus == 20 && order.deliveryStatus == 10">待收货</text>
<text class="state-text" v-else-if="order.orderStatus == 30 && order.payStatus == 20 && order.deliveryStatus == 20">待绑定</text>
<text class="state-text" v-else-if="order.orderStatus == 30 && order.deliveryStatus == 20">进行中</text>
<text class="state-text" v-else-if="order.receiptStatus == 21">进行中</text>
<text class="state-text" v-if="order.payStatus == 10">待支付</text>
<block v-if="order.payStatus == 20">
<text class="state-text" v-if="order.receiptStatus == 21">退租中</text>
<text class="state-text" v-else-if="order.deliveryStatus <= 20 && order.receiptStatus == 10">待收货</text>
<text class="state-text" v-else-if="order.deliveryStatus == 20 && order.receiptStatus == 20">待绑定</text>
<text class="state-text" v-else-if="order.deliveryStatus == 40 && order.receiptStatus == 20">进行中</text>
<text class="state-text"
v-else-if="order.receiptStatus == 30 || ( order.equipmentGoods.equipmentCategory != 10 && order.currPeriods >= order.periods)">已完成</text>
</block>
<!-- <text>{{ order.stateText }}</text> -->
</view>
</view>
@@ -494,8 +499,8 @@
<view class="btn-item active" @click="onReceipt(order.orderId)">绑定设备</view>
</block> -->
<!-- 订单评价 -->
<block
v-if="order.orderStatus == OrderStatusEnum.COMPLETED.value && order.isComment == 0 && order.receiptStatus != 30">
<!-- <block
v-if="order.payStatus == PayStatusEnum.SUCCESS.value && order.orderStatus == OrderStatusEnum.COMPLETED.value && order.isComment == 0 && order.receiptStatus != 30">
<view class="btn-item" @click="handleTargetEquipment(order.equipmentId)">查看电池</view>
<view class="btn-item" @click="handleHireEquipment(order.orderId)"
v-if="equipmentGoods.equipmentCategory != '10' && !orderEnd && order.orderId >= 28804">我要续费</view>
@@ -504,7 +509,27 @@
<view class="btn-item" @click="handleRentingOut(order)"
v-if="equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租
</view>
</block> -->
<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(item)">绑定设备</view>
<view class="btn-item" @click="handleRentingOut(order)"
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 21 && order.receiptStatus != 30">我要退租</view>
<view class="btn-item" @click="handleRentingOut(order)"
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus == 21 && !orderEnd">取消退租</view>
<view class="btn-item" @click="handleTargetDetail(item.orderId)"
v-if="order.equipmentGoods.equipmentCategory != '10' && order.receiptStatus != 30 && order.receiptStatus != 21 && !orderEnd && order.orderId >= 28804">我要续费</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"
@click="handleChangeEquipment(order.orderId,order.equipment.equipmentId)">换电</view>
<!-- <view class="btn-item" v-if="item.equipmentGoods.equipmentCategory == '锂电池租赁' || item.equipmentGoods.equipmentCategory == '电动车租赁'" @click="handleTargetDetail(item.orderId)">续费</view> -->
</block>
</block>
</view>
</view>
@@ -846,13 +871,75 @@
},
// 点击去支付
onPay(orderId) {
/* onPay(orderId) {
OrderApi.getOrderPayByOrderId(orderId).then(res => {
this.$navTo('pages/checkout/cashier/index', {
orderId: res.data.id
})
})
}, */
// 点击去支付
onPay(orderId) {
const app = this
OrderApi.getOrderPayByOrderId(orderId).then(res => {
if(res.data.isRenew == 0 && res.data.hasFreeze == 0){
if (res.data.equipmentCategory != 10 && res.data.orderStr) {
my.tradePay({
orderStr: res.data.orderStr, // 完整的支付参数拼接成的字符串，从服务端获取
success: (res) => {
},
fail: (res) => {
},
complete: () => {
OrderApi.checkFreeze(orderId).then((res) => {
if(res.code == 0){
// app.$success("下单成功")
setTimeout(() => {
// uni.redirectTo({
// url: '/pages/order/index'
// })
this.$navTo('pages/checkout/cashier/index', {
orderId: res.data.id
})
}, 500)
}
else {
app.$error(res.errMsg)
}
})
}
});
} else {
OrderApi.checkFreeze(orderId).then((r) => {
if(r.code == 0){
app.$success("下单成功")
setTimeout(() => {
// uni.redirectTo({
// url: '/pages/order/index'
// })
this.$navTo('pages/checkout/cashier/index', {
orderId: r.data.id
})
}, 500)
}
else {
app.$error(r.errMsg)
}
})
}
} else {
this.$navTo('pages/checkout/cashier/index', {
orderId: res.data.id
})
}
})
},
// 跳转到订单评价页