diff --git a/src/api/admin/user.js b/src/api/admin/user.js index 570c897..9661378 100644 --- a/src/api/admin/user.js +++ b/src/api/admin/user.js @@ -53,7 +53,7 @@ export const updateUserInfo = (data) => { /**删除用户 */ export const deleteUser = (data) => { - return http2.delete('/api/v1/admin/user/user/delete?group_id='+data.group_id) + return http2.delete('/api/v1/admin/user/user/delete?user_id='+data.user_id) } /**修改用户头像 */ export const updateUserAvatar = (data) => { @@ -162,4 +162,14 @@ export const addUserGroupMember = (data) => { 'Content-Type':'multipart/form-data' } }) +} + +/**退款对应账单 */ +export const refundBalance = (data) => { + return http2.get('/api/v1/admin/user/balance/refund', { + params:data, + headers: { + 'Content-Type': 'multipart/form-data' + } + }) } \ No newline at end of file diff --git a/src/views/order/OrderList.vue b/src/views/order/OrderList.vue index 48d4511..c8ebd41 100644 --- a/src/views/order/OrderList.vue +++ b/src/views/order/OrderList.vue @@ -5,6 +5,30 @@
+ + + + + + + + + + + + + + + + + + + + 搜索 + + 重置 + +
新增订单 @@ -220,9 +244,12 @@ import { getOrderList, getOrderDetail, createOrder, updateOrder, deleteOrder } f // 查询参数 const queryParams = reactive({ - page: 1, - count: 10 + count: 10, + key: '', + state: '', + user_id: '', + user_key: '' }) // 订单表单 @@ -282,7 +309,14 @@ const orderFormRef = ref(null) const fetchOrderList = async () => { loading.value = true try { - const res = await getOrderList(queryParams) + // 过滤空值参数 + const params = {} + Object.keys(queryParams).forEach(key => { + if (queryParams[key] !== '' && queryParams[key] !== null && queryParams[key] !== undefined) { + params[key] = queryParams[key] + } + }) + const res = await getOrderList(params) console.log('订单列表数据:', res.data) if (res.data.code === 200) { orderList.value = res.data.data.list || [] @@ -337,10 +371,10 @@ const handleQuery = () => { // 重置查询 const resetQuery = () => { - queryParams.order_no = '' + queryParams.key = '' + queryParams.state = '' queryParams.user_id = '' - queryParams.status = '' - queryParams.dateRange = [] + queryParams.user_key = '' queryParams.page = 1 fetchOrderList() } @@ -532,13 +566,29 @@ onMounted(() => { .filter-content { display: flex; - justify-content: flex-end; - align-items: center; + justify-content: space-between; + align-items: flex-start; padding: 16px 20px; gap: 20px; flex-wrap: wrap; } +.filter-form { + display: flex; + flex-wrap: wrap; + gap: 8px; + align-items: center; +} + +.filter-form :deep(.el-form-item) { + margin-bottom: 0; + margin-right: 8px; +} + +.filter-form :deep(.el-form-item__label) { + font-size: 13px; +} + .action-bar { display: flex; gap: 12px; diff --git a/src/views/user/UserBalance.vue b/src/views/user/UserBalance.vue index 252784a..50dd3f1 100644 --- a/src/views/user/UserBalance.vue +++ b/src/views/user/UserBalance.vue @@ -77,11 +77,21 @@ + + + + + +
@@ -151,6 +161,10 @@ + + + + @@ -160,15 +174,38 @@ 确定 + + + + + + + + + + + + + 退回余额 + 提现 + +
退回余额:将退款金额添加到对应余额;提现:将退款金额提现
+
+
+ +