From 25908f5bd4a2dae4625b49d325525849feb676a4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 28 二月 2025 09:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/combo/order.vue | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/combo/order.vue b/admin/src/views/combo/order.vue
index e123a37..bee9272 100644
--- a/admin/src/views/combo/order.vue
+++ b/admin/src/views/combo/order.vue
@@ -15,7 +15,7 @@
<el-table-column prop="money" align="center" label="鍚堣(鍏�)" min-width="80" show-overflow-tooltip />
<el-table-column prop="money" align="center" label="瀹炰粯(鍏�)" min-width="80" show-overflow-tooltip />
<el-table-column prop="refundMoney" align="center" label="宸查��閲戦(鍏�)" min-width="100" show-overflow-tooltip />
- <el-table-column prop="memberId" align="center" label="鐢ㄦ埛淇℃伅" min-width="200" show-overflow-tooltip />
+ <el-table-column prop="openid" align="center" label="鐢ㄦ埛淇℃伅" min-width="200" show-overflow-tooltip />
<el-table-column prop="payWay" align="center" label="鏀粯鏂瑰紡" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.payWay == 0">寰俊鏀粯</span>
@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column prop="refundUserName" align="center" label="鎿嶄綔浜�" min-width="80" show-overflow-tooltip />
<el-table-column prop="createDate" align="center" label="鍒涘缓鏃堕棿" min-width="160" show-overflow-tooltip />
- <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="80" show-overflow-tooltip>
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" min-width="120" show-overflow-tooltip>
<template v-slot="{ row }">
<span @click="handleDetail(row.id)" class="primaryColor pointer">鏌ョ湅璇︽儏</span>
<span v-if="row.status == 1 && (row.refundMoney < row.money)" @click="handRefund(row.id)"
@@ -62,6 +62,7 @@
comboListOrderEx,
comboOrderDetailPost
} from '@/api/business/combo.js'
+import dayjs from 'dayjs'
export default {
extends: BasePageTemp,
components: {
@@ -105,7 +106,7 @@
},
{
filed: 'selDate',
- type: 'date',
+ type: 'daterange',
label: '鏀粯鏃堕棿',
},
{
@@ -119,6 +120,8 @@
}
},
created() {
+ let date = dayjs().format('YYYY-MM-DD')
+ this.$set(this.filters, 'selDate', [date, date])
this.getList()
// this.initData()
},
@@ -144,8 +147,8 @@
.then(() => {
this.loading = true
if (filters.selDate && filters.selDate.length > 0) {
- filters.startDate = filters.selDate[0]
- filters.endDate = filters.selDate[1]
+ filters.startDate = filters.selDate[0] + ' 00:00:00'
+ filters.endDate = filters.selDate[1] + ' 00:00:00'
} else {
filters.startDate = null
filters.endDate = null
@@ -153,7 +156,10 @@
comboListOrderEx({
page: 1,
capacity: 1000000,
- model: filters
+ model: {
+ ...filters,
+ type: 1
+ },
})
.then(response => {
this.download(response)
@@ -175,14 +181,14 @@
getList(page) {
const { pagination, filters } = this
this.loading = true
- if (page) { pagination.page = page }
if (filters.selDate && filters.selDate.length > 0) {
- filters.startDate = filters.selDate[0]
- filters.endDate = filters.selDate[1]
+ filters.startDate = filters.selDate[0] + ' 00:00:00'
+ filters.endDate = filters.selDate[1] + ' 00:00:00'
} else {
filters.startDate = null
filters.endDate = null
}
+ if (page) { pagination.page = page }
comboOrderPost({
model: {
...filters,
--
Gitblit v1.9.3