fix:修复订单列表页搜索参数传递错误的问题;移除租借设备时手机号的验证效果;新增免押无法使用走非免押逻辑的方法
This commit is contained in:
+20
-10
@@ -21,8 +21,8 @@
|
||||
<view class="order-id">
|
||||
<text>订单号:{{ order.orderNo }}</text>
|
||||
</view>
|
||||
<view class="order-status" :class="orderStatusMap[order.status]?.class">
|
||||
{{ orderStatusMap[order.status]?.text }}
|
||||
<view class="order-status" :class="orderStatusMap[order.orderStatus]?.class">
|
||||
{{ orderStatusMap[order.orderStatus]?.text }}
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -70,7 +70,8 @@
|
||||
<view class="price">¥{{ order.amount }}</view>
|
||||
|
||||
<view class="actions">
|
||||
<view v-if="order.status=='in_used'" class="action-item primary" @click="navigateToReturn(order.deviceId, order.orderId)">
|
||||
<view v-if="order.status=='in_used'" class="action-item primary"
|
||||
@click="navigateToReturn(order.deviceId, order.orderId)">
|
||||
归还设备
|
||||
</view>
|
||||
<view v-if="order.status === 'waiting_for_payment'" class="action-item secondary"
|
||||
@@ -133,7 +134,7 @@
|
||||
text: '已完成',
|
||||
class: 'status-finished'
|
||||
},
|
||||
'canceled': {
|
||||
'order_cancelled': {
|
||||
text: '已取消',
|
||||
class: 'status-cancelled'
|
||||
}
|
||||
@@ -144,17 +145,21 @@
|
||||
text: '全部',
|
||||
status: []
|
||||
},
|
||||
{
|
||||
text: '待付款',
|
||||
status: ['waiting_for_payment']
|
||||
},
|
||||
{
|
||||
text: '使用中',
|
||||
status: ['1', 'in_used']
|
||||
status: ['in_used']
|
||||
},
|
||||
{
|
||||
text: '已完成',
|
||||
status: ['2', 'used_done']
|
||||
status: ['used_done']
|
||||
},
|
||||
{
|
||||
text: '已取消',
|
||||
status: ['3', 'canceled']
|
||||
status: ['order_cancelled']
|
||||
}
|
||||
]);
|
||||
|
||||
@@ -208,13 +213,18 @@
|
||||
const switchTab = async (index) => {
|
||||
currentTab.value = index;
|
||||
// 根据状态获取订单列表
|
||||
const statusList = orderStatusTabs[index].status;
|
||||
const statusList = orderStatusTabs[index].status[0];
|
||||
await loadOrderList(statusList);
|
||||
};
|
||||
|
||||
// 加载订单列表
|
||||
const loadOrderList = async (statusList = []) => {
|
||||
const loadOrderList = async (statusList) => {
|
||||
try {
|
||||
if(statusList!=undefined){
|
||||
statusList = {
|
||||
orderStatus:statusList
|
||||
}
|
||||
}
|
||||
const res = await getOrderList(statusList);
|
||||
if (res.code === 200 && res.data && res.data.records) {
|
||||
// 处理订单列表数据
|
||||
@@ -225,7 +235,7 @@
|
||||
return {
|
||||
orderNo: item.orderNo,
|
||||
orderId: item.orderId,
|
||||
status: item.orderStatus,
|
||||
orderStatus: item.orderStatus,
|
||||
deviceId: item.deviceNo,
|
||||
payWay: item.payWay,
|
||||
startTime: orderStartTime,
|
||||
|
||||
Reference in New Issue
Block a user