diff --git a/api/modules/order.js b/api/modules/order.js index c41148c..06262c2 100644 --- a/api/modules/order.js +++ b/api/modules/order.js @@ -3,10 +3,14 @@ import { APP_TYPE } from '@/utils/env.js'; export const orderApi = { getList(identifier, page, page_size, payment_status) { + const data = { identifier, page, page_size }; + if (payment_status !== undefined && payment_status !== null) { + data.payment_status = payment_status; + } return request({ url: '/api/c/v1/orders', method: 'GET', - data: { identifier, page, page_size, payment_status } + data }); }, diff --git a/components/UserInfoCard.vue b/components/UserInfoCard.vue index 6c045e6..f0256bd 100644 --- a/components/UserInfoCard.vue +++ b/components/UserInfoCard.vue @@ -14,8 +14,8 @@ {{ onlineStatus }} - - {{ networkStatus === 0 ? '停机' : '正常' }} + + {{ onlineStatus }} @@ -31,8 +31,7 @@ currentCardNo: { type: String, default: '' }, deviceInfo: { type: Object, default: () => ({}) }, onlineStatus: { type: String, default: '离线' }, - isDevice: { type: Boolean, default: true }, - networkStatus: { type: Number, default: 1 } + isDevice: { type: Boolean, default: true } }); // 默认头像 @@ -56,9 +55,5 @@ image { width: 100%; height: 100%; object-fit: cover; } } .user-details { flex: 1; } - .status-text { - font-size: 24rpx; - color: var(--text-secondary); - } } diff --git a/pages/order-list/order-list.vue b/pages/order-list/order-list.vue index c345457..e9c513c 100644 --- a/pages/order-list/order-list.vue +++ b/pages/order-list/order-list.vue @@ -1,5 +1,17 @@