From 6ebeddfe87542e4b3abfbe1adeb9187204f63ba8 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 07 七月 2026 13:47:24 +0800
Subject: [PATCH] 新增功能
---
admin/src/views/combo/order.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/combo/order.vue b/admin/src/views/combo/order.vue
index ddd8d1b..a95a454 100644
--- a/admin/src/views/combo/order.vue
+++ b/admin/src/views/combo/order.vue
@@ -16,18 +16,20 @@
<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="openid" align="center" label="鐢ㄦ埛淇℃伅" min-width="200" show-overflow-tooltip />
- <el-table-column prop="payWay" align="center" label="鏀粯鏂瑰紡" min-width="80" show-overflow-tooltip>
+ <el-table-column align="center" label="鏀粯鏂瑰紡" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.payWay == 0">寰俊鏀粯</span>
<span v-if="row.payWay == 1">鏀粯瀹�</span>
+ <span v-if="row.payWay == 2">鎶栭煶楠屽埜</span>
</template>
</el-table-column>
- <el-table-column prop="payWay" align="center" label="璁㈠崟鏉ユ簮" min-width="80" show-overflow-tooltip>
+ <el-table-column align="center" label="璁㈠崟鏉ユ簮" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
- <span>灏忕▼搴忕</span>
+ <span v-if="row.channel == 0">灏忕▼搴忕</span>
+ <span v-if="row.channel == 1">鎶栭煶鍥㈣喘</span>
</template>
</el-table-column>
- <el-table-column prop="payWay" align="center" label="璁㈠崟鐘舵��" min-width="80" show-overflow-tooltip>
+ <el-table-column align="center" label="璁㈠崟鐘舵��" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
<span v-if="row.status == 0">鏈敮浠�</span>
<span v-if="row.status == 1">宸叉敮浠�</span>
@@ -35,7 +37,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)"
@@ -93,6 +95,16 @@
options: [
{ label: '寰俊', value: 0 },
{ label: '鏀粯瀹�', value: 1 },
+ { label: '鎶栭煶楠屽埜', value: 2 },
+ ]
+ },
+ {
+ filed: 'channel',
+ type: 'select',
+ label: '璁㈠崟鏉ユ簮',
+ options: [
+ { label: '灏忕▼搴忕', value: 0 },
+ { label: '鎶栭煶鍥㈣喘', value: 1 },
]
},
{
@@ -121,7 +133,7 @@
},
created() {
let date = dayjs().format('YYYY-MM-DD')
- this.$set(this.filters, 'selDate', [date,date])
+ this.$set(this.filters, 'selDate', [date, date])
this.getList()
// this.initData()
},
@@ -156,7 +168,10 @@
comboListOrderEx({
page: 1,
capacity: 1000000,
- model: filters
+ model: {
+ ...filters,
+ type: 1
+ },
})
.then(response => {
this.download(response)
--
Gitblit v1.9.3