-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("common.queryBtn") }}
+
+ {{ $t("common.resetBtn") }}
+
+
+
+
-
+
+
+
-
-
+
-
- 同步
-
-
- 支付
-
-
- 取消
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -79,11 +161,12 @@ import { BasicTableProps, useTable } from "/@/hooks/table";
import * as thirdMiOrderApi from '/@/api/hard/hard-third-mi-order'
import { useMessage, useMessageBox } from "/@/hooks/message";
import { useDict } from '/@/hooks/dict';
+import { displayPrice } from "/@/utils/formatMoney"
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
-const { mi_type } = useDict("mi_type")
+const { hard_third_mi_type, hard_third_mi_status, hard_type } = useDict("hard_third_mi_type", "hard_third_mi_status", "hard_type")
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
@@ -141,12 +224,35 @@ const refreshOrder = async (row: any) => {
// 支付
const payOrder = async (row: any) => {
+ try {
+ await useMessage().delConfirm("是否直接支付?")
+ } finally {
+ //
+ }
try {
await thirdMiOrderApi.payOrder({ id: row.id });
getDataList();
useMessage().success('支付成功');
} catch (err: any) {
- useMessage().error(err.msg);
+ console.log("|支付|意外的错误:", err);
+ useMessage().error("支付失败");
+ }
+}
+
+// 退款
+const refund = async (row: any) => {
+ try {
+ await useMessage().delConfirm("是否全额退款?")
+ } finally {
+ //
+ }
+ try {
+ await thirdMiOrderApi.refundOrder({ id: row.id });
+ getDataList();
+ useMessage().success('退款成功');
+ } catch (err: any) {
+ console.log("|退款|意外的错误:", err);
+ useMessage().error("退款失败");
}
}
@@ -172,15 +278,16 @@ const handleDelete = async (ids: string[]) => {
.status {
display: flex;
align-items: center;
- margin-bottom: 2px;
+ font-size: 12px;
+ line-height: 20px;
span {
display: inline-block;
}
span:nth-child(1) {
- min-width: 60px;
- max-width: 100px;
+ min-width: 80px;
+ max-width: 80px;
text-align: left;
}
@@ -190,6 +297,7 @@ const handleDelete = async (ids: string[]) => {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ text-align: left;
}
}
\ No newline at end of file
From 7d86d9dbd5fc6e0b8bfc5f1f536208982c353169 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 15 Jan 2026 09:27:23 +0800
Subject: [PATCH 02/17] =?UTF-8?q?feat:=E5=8F=91=E7=A5=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E4=BA=A4=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/wallet/wallet-recharge-invoice/index.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue
index bfccbc0..5bbf4cd 100644
--- a/src/views/wallet/wallet-recharge-invoice/index.vue
+++ b/src/views/wallet/wallet-recharge-invoice/index.vue
@@ -58,6 +58,7 @@
{{ parseTime(row.time, "{y}-{m}-{d}") }}
+
From f2bd781efc7b0c8f6b5cfc0150d7f38aefcfe732 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 15 Jan 2026 14:11:07 +0800
Subject: [PATCH 03/17] =?UTF-8?q?feat:=E9=A3=9F=E5=A0=82=E8=8F=9C=E5=93=81?=
=?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=BB=9F=E8=AE=A1(=E6=8C=89=E6=9C=88?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/hard/hard-total.ts | 17 +-
src/views/act/act-cancel/index.vue | 55 ++--
.../components/product-total-table-by-day.vue | 180 +++++++++++++
.../product-total-table-by-month.vue | 180 +++++++++++++
.../components/product-total-table.vue | 3 +-
.../hard/canteen-product-total/index.vue | 252 ++++++------------
6 files changed, 478 insertions(+), 209 deletions(-)
create mode 100644 src/views/hard/canteen-product-total/components/product-total-table-by-day.vue
create mode 100644 src/views/hard/canteen-product-total/components/product-total-table-by-month.vue
diff --git a/src/api/hard/hard-total.ts b/src/api/hard/hard-total.ts
index d220d72..bca7dd9 100644
--- a/src/api/hard/hard-total.ts
+++ b/src/api/hard/hard-total.ts
@@ -27,7 +27,7 @@ export function productTotalByDept(query: any) {
}
/**
- * 食堂统计
+ * 食堂统计(按天)
*/
export function canteenProudctTotal(query: any) {
return request({
@@ -41,6 +41,21 @@ export function canteenProudctTotal(query: any) {
})
}
+/**
+ * 食堂统计(按月)
+ */
+export function canteenProudctTotalByMonth(query: any) {
+ return request({
+ url: "/hard/hard-canteen-total-log/proudct-total-by-month",
+ method: "post",
+ params: {
+ current: query.current,
+ size: query.size,
+ },
+ data: query,
+ })
+}
+
/**
* 食堂统计
*/
diff --git a/src/views/act/act-cancel/index.vue b/src/views/act/act-cancel/index.vue
index 2d296bd..e4073e5 100644
--- a/src/views/act/act-cancel/index.vue
+++ b/src/views/act/act-cancel/index.vue
@@ -24,38 +24,22 @@
-
+
-
@@ -95,14 +73,17 @@
-
+
编辑
- 删除
+ 删除
-
diff --git a/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue b/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue
new file mode 100644
index 0000000..7e1e311
--- /dev/null
+++ b/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue
@@ -0,0 +1,180 @@
+
+
-
- 新 增
-
-
- 删除
-
-
-
+ 外部订单号:
+ {{ row.thirdOrderNo }}
+ 未授权
+
+
+ 内部订单号:
+ {{ row.outOrderNo }}
+ 未授权
+
+
+ 授权id:
+ {{ row.authId }}
+ 未授权
+
+
+ 流程id:
+ {{ row.flowId }}
+ 未授权
+
@@ -49,19 +80,70 @@
+ 押金:
+
+ {{ displayPrice(row.depositPrice, "元", 2) }}
+
+
+
+ 订单金额:
+
+ {{ displayPrice(row.orderPrice, "元", 2) }}
+
+
+
+ 支付金额:
+
+ {{ displayPrice(row.payPrice, "元", 2) }}
+
+
+
+
+ 设备名
+
+ {{ row.hardName }}
+
+
+
+ 设备类型
+
+
+
+
+
+ 同步
+
+
+ 支付
+
+
+ 退款
+
+
+ 取消
+
+
-
+
新 增
-
+
删除
-
+
+
+
+
+
+
+
+ {{ parseTime(row.createTime, "{y}-{m}-{d}") }}
+
+
+
+
+
+
+
+ {{ row.payUserCount || 0 }}人
+
+
+
+
+ {{ row.timeCount || 0 }}次
+
+
+
+
+ {{ row.payCount || 0 }}份
+
+
+
+
+ {{ displayPrice(row.totalPrice) }}
+
+
+
+
+
+
+ 菜品详情
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue b/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue
new file mode 100644
index 0000000..1fa673b
--- /dev/null
+++ b/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+ {{ row.payUserCount || 0 }}人
+
+
+
+
+ {{ row.timeCount || 0 }}次
+
+
+
+
+ {{ row.payCount || 0 }}份
+
+
+
+
+ {{ displayPrice(row.totalPrice) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.createTimeStr }}
+
+
+
+
+
+
+
+ {{ row.payUserCount || 0 }}人
+
+
+
+
+ {{ row.timeCount || 0 }}次
+
+
+
+
+ {{ row.payCount || 0 }}份
+
+
+
+
+ {{ displayPrice(row.totalPrice) }}
+
+
+
+
+
+
+ 菜品详情
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/hard/canteen-product-total/components/product-total-table.vue b/src/views/hard/canteen-product-total/components/product-total-table.vue
index 0ca8a7b..65443ce 100644
--- a/src/views/hard/canteen-product-total/components/product-total-table.vue
+++ b/src/views/hard/canteen-product-total/components/product-total-table.vue
@@ -83,10 +83,11 @@ const selectionChangHandle = (objs: { id: string }[]) => {
multiple.value = !objs.length
}
-const openDialog = (createTimeStr: any, hourType: any) => {
+const openDialog = (createTimeStr: any, hourType: any, createTimeType: any) => {
visible.value = true
state.queryForm.createTimeStr = createTimeStr
state.queryForm.hourType = hourType
+ state.queryForm.createTimeType = createTimeType ?? ""
getDataList()
}
diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue
index 657bec2..44d4281 100644
--- a/src/views/hard/canteen-product-total/index.vue
+++ b/src/views/hard/canteen-product-total/index.vue
@@ -5,7 +5,7 @@
@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
:defaultTreeWidth="20" :nodeClickable="false">
-
+
+
+
+
+
+
+ {{ row.payUserCount || 0 }}人
+
+
+
+
+ {{ row.timeCount || 0 }}次
+
+
+
+
+ {{ row.payCount || 0 }}份
+
+
+
+
+ {{ displayPrice(row.totalPrice) }}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{ parseTime(row.createTime, "{y}-{m}-{d}") }}
-
-
-
-
-
-
-
- {{ row.payUserCount || 0 }}人
-
-
-
-
- {{ row.timeCount || 0 }}次
-
-
-
-
- {{ row.payCount || 0 }}份
-
-
-
-
- {{ displayPrice(row.totalPrice) }}
-
-
-
-
-
-
- 菜品详情
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row.payUserCount || 0 }}人
-
-
-
-
- {{ row.timeCount || 0 }}次
-
-
-
-
- {{ row.payCount || 0 }}份
-
-
-
-
- {{ displayPrice(row.totalPrice) }}
-
-
-
-
-
-
-
+
@@ -24,16 +22,17 @@
-
@@ -42,17 +41,21 @@
@@ -218,23 +221,28 @@ const getCanteenDishesCategory = async () => {
background-image: radial-gradient(#eff4ee 1px, transparent 10px);
background-size: 10px 10px;
}
+
.ink-cloud {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Cpath fill='%23F7D6C3' d='M50,0C36.7,0,25,11.7,25,25c0,13.3,11.7,25,25,25s25-11.7,25-25C75,11.7,63.3,0,50,0z M50,40c-8.3,0-15-6.7-15-15s6.7-15,15-15s15,6.7,15,15S58.3,40,50,40z'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 50 50' to='360 50 50' dur='20s' repeatCount='indefinite'/%3E%3C/path%3E%3C/svg%3E");
background-size: contain;
background-repeat: no-repeat;
background-position: center;
}
+
.scrollbar-hidden::-webkit-scrollbar {
display: none;
}
+
.scrollbar-hidden {
scrollbar-width: none;
-ms-overflow-style: none;
}
+
::selection {
background: #1879ff;
color: #fff;
}
+
.ribbon {
width: 80px;
height: 20px;
diff --git a/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue b/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue
index 7e1e311..1e2c009 100644
--- a/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue
+++ b/src/views/hard/canteen-product-total/components/product-total-table-by-day.vue
@@ -152,6 +152,7 @@ const tableExpandChange = async (e: any) => {
try {
const { data } = await hardTotalApi.productTotalByDept({
hourType: e.hourType,
+ createTimeType: '0',
createTimeStr: parseTime(e.createTime, '{y}-{m}-{d}'),
})
if (data && data.length) {
diff --git a/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue b/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue
index 1fa673b..6261559 100644
--- a/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue
+++ b/src/views/hard/canteen-product-total/components/product-total-table-by-month.vue
@@ -152,7 +152,8 @@ const tableExpandChange = async (e: any) => {
try {
const { data } = await hardTotalApi.productTotalByDept({
hourType: e.hourType,
- createTimeStr: parseTime(e.createTime, '{y}-{m}-{d}'),
+ createTimeType: '1',
+ createTimeStr: parseTime(e.createTime, '{y}-{m}'),
})
if (data && data.length) {
tableChildrenMap.value.set(e.uniqueCode, data)
diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue
index 44d4281..bfc1888 100644
--- a/src/views/hard/canteen-product-total/index.vue
+++ b/src/views/hard/canteen-product-total/index.vue
@@ -14,10 +14,16 @@
+
+
+
{{ $t("common.queryBtn") }}
@@ -28,8 +34,8 @@
-
-
+
import { ElMessage } from "element-plus"
+import dayjs from "dayjs"
import other from "/@/utils/other"
import { formatDate } from '/@/utils/formatTime';
@@ -79,12 +86,14 @@ const tabPane = ref([
])
const activeTab = ref("DAY")
+const defaultQueryForm = {
+ hourType: "",
+ merchantId: "",
+ createTimeList: [],
+ createTimeYearStr: dayjs().format("YYYY"),
+}
const state = reactive({
- queryForm: {
- hourType: "",
- merchantId: "",
- createTimeList: [],
- }
+ queryForm: { ...defaultQueryForm }
})
watch(() => [activeTab.value, productTotalTableByDayRef.value, productTotalTableByMonthRef.value], () => {
@@ -126,7 +135,17 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT
search()
}
+const tabClick = () => {
+ cancel()
+}
+
const search = () => {
+ if (activeTab.value === "DAY") {
+ state.queryForm.createTimeYearStr = ""
+ }
+ if (activeTab.value === "MONTH") {
+ state.queryForm.createTimeList = []
+ }
switch (activeTab.value) {
case "DAY":
productTotalTableByDayRef.value.doSearch(state.queryForm)
@@ -138,6 +157,7 @@ const search = () => {
}
const cancel = () => {
+ state.queryForm = { ...defaultQueryForm }
switch (activeTab.value) {
case "DAY":
productTotalTableByDayRef.value.doCancel(state.queryForm)
diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue
index 5bbf4cd..4775841 100644
--- a/src/views/wallet/wallet-recharge-invoice/index.vue
+++ b/src/views/wallet/wallet-recharge-invoice/index.vue
@@ -13,6 +13,9 @@
+
+
From 4c74d5a410a49e1599cac02d873a549303408564 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 15 Jan 2026 19:22:57 +0800
Subject: [PATCH 05/17] =?UTF-8?q?feat:=E9=A3=9F=E5=A0=82=E8=8F=9C=E5=93=81?=
=?UTF-8?q?=E8=B4=AD=E4=B9=B0=E7=BB=9F=E8=AE=A1(=E6=8C=89=E5=A4=A9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/other.ts | 68 +++++++++++++++++--
.../hard/canteen-product-total/index.vue | 6 ++
2 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/src/utils/other.ts b/src/utils/other.ts
index 2b9b1f9..908cccb 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -265,8 +265,26 @@ export function downBlobFile(url: any, query: any, fileName: string) {
.then((response) => {
handleBlobFile(response, fileName)
})
- .catch((error) => {
- useMessage().error(error.msg || "下载失败")
+ .catch(async (error) => {
+ let msg = "下载失败"
+ try {
+ if (error instanceof Blob) {
+ const text = typeof (error as any).text === "function" ? await (error as any).text() : ""
+ if (text) {
+ try {
+ const json = JSON.parse(text)
+ msg = json.msg || json.message || msg
+ } catch {
+ msg = text || msg
+ }
+ }
+ } else if (typeof error === "object") {
+ msg = (error as any).msg || (error as any).message || msg
+ }
+ } catch {
+ msg = "下载失败"
+ }
+ useMessage().error(msg)
})
}
@@ -286,8 +304,26 @@ export function postDownBlobFile(url: any, data: any, fileName: string) {
.then((response) => {
handleBlobFile(response, fileName)
})
- .catch((error) => {
- useMessage().error(error.msg || "下载失败")
+ .catch(async (error) => {
+ let msg = "下载失败"
+ try {
+ if (error instanceof Blob) {
+ const text = typeof (error as any).text === "function" ? await (error as any).text() : ""
+ if (text) {
+ try {
+ const json = JSON.parse(text)
+ msg = json.msg || json.message || msg
+ } catch {
+ msg = text || msg
+ }
+ }
+ } else if (typeof error === "object") {
+ msg = (error as any).msg || (error as any).message || msg
+ }
+ } catch {
+ msg = "下载失败"
+ }
+ useMessage().error(msg)
})
}
@@ -334,7 +370,6 @@ export function handleBlobFile(response: any, fileName: string) {
} else if (response.data && response.data instanceof Blob) {
blob = response.data
} else {
- // 尝试构造安全的blob
const safeData = Array.isArray(response) ? response : [response]
blob = new Blob(safeData, { type: "application/octet-stream" })
}
@@ -344,6 +379,29 @@ export function handleBlobFile(response: any, fileName: string) {
return
}
+ if (blob.type === "application/json" || blob.type === "text/plain") {
+ try {
+ const handleText = (t: string) => {
+ try {
+ const json = JSON.parse(t)
+ useMessage().error(json.msg || json.message || "下载失败")
+ } catch {
+ useMessage().error(t || "下载失败")
+ }
+ }
+ if (typeof (blob as any).text === "function") {
+ ;(blob as any).text().then((t: string) => handleText(t))
+ } else {
+ const reader = new FileReader()
+ reader.onload = () => handleText(String(reader.result || ""))
+ reader.readAsText(blob)
+ }
+ } catch {
+ useMessage().error("下载失败")
+ }
+ return
+ }
+
// 3. 验证文件大小 (防止过大文件)
const MAX_FILE_SIZE = 100 * 1024 * 1024 // 100MB限制
if (blob.size > MAX_FILE_SIZE) {
diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue
index bfc1888..2f78bbe 100644
--- a/src/views/hard/canteen-product-total/index.vue
+++ b/src/views/hard/canteen-product-total/index.vue
@@ -105,6 +105,12 @@ watch(() => [activeTab.value, productTotalTableByDayRef.value, productTotalTable
}
})
+onMounted(() => {
+ nextTick(() => {
+ search()
+ })
+})
+
// 清空搜索条件
const resetQuery = () => {
// 清空搜索条件
From 9df3d669a5f4a86f4873426142b7b51b090eeb02 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 16 Jan 2026 10:30:19 +0800
Subject: [PATCH 06/17] =?UTF-8?q?feat:=E5=85=85=E5=80=BC/=E6=89=A3?=
=?UTF-8?q?=E6=AC=BE=E7=94=B3=E8=AF=B7=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/hard/canteen-product-total/index.vue | 8 +++++---
src/views/wallet/wallet-recharge-apply/index.vue | 4 ++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue
index 2f78bbe..889dc49 100644
--- a/src/views/hard/canteen-product-total/index.vue
+++ b/src/views/hard/canteen-product-total/index.vue
@@ -44,7 +44,7 @@
@@ -98,10 +98,10 @@ const state = reactive({
watch(() => [activeTab.value, productTotalTableByDayRef.value, productTotalTableByMonthRef.value], () => {
if (activeTab.value === "DAY" && productTotalTableByDayRef.value?.doSearch) {
- productTotalTableByDayRef.value.doSearch(state.queryForm)
+ search()
}
if (activeTab.value === "MONTH" && productTotalTableByMonthRef.value?.doSearch) {
- productTotalTableByMonthRef.value.doSearch(state.queryForm)
+ search()
}
})
@@ -115,6 +115,7 @@ onMounted(() => {
const resetQuery = () => {
// 清空搜索条件
queryRef.value?.resetFields()
+ state.queryForm = { ...defaultQueryForm }
state.queryForm.deptId = ""
state.queryForm.userDeptIds = []
draggableDepTreeRef.value.resetData()
@@ -152,6 +153,7 @@ const search = () => {
if (activeTab.value === "MONTH") {
state.queryForm.createTimeList = []
}
+ console.log("queryForm:", state.queryForm);
switch (activeTab.value) {
case "DAY":
productTotalTableByDayRef.value.doSearch(state.queryForm)
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index df4a816..a661370 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -209,7 +209,7 @@ const state: BasicTableProps = reactive({
})
// table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, postDownBlobFile, tableStyle } = useTable(state)
// 清空搜索条件
const resetQuery = () => {
@@ -222,7 +222,7 @@ const resetQuery = () => {
// 导出excel
const exportExcel = () => {
- downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "充值/扣款申请.xlsx")
+ postDownBlobFile("/wallet/wallet-recharge-apply/export", Object.assign(state.queryForm, { ids: selectObjs }), "充值/扣款申请.xlsx")
}
const doApply = async (row: any) => {
From 40fc2613445124322dd402035904e83027572886 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 16 Jan 2026 15:57:44 +0800
Subject: [PATCH 07/17] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E4=BA=A4=E6=98=93?=
=?UTF-8?q?=E8=AE=B0=E5=BD=95(=E6=8C=89=E6=9C=88)=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/hard/hard-total.ts | 12 +
.../hard-sh/components/hard-sh-by-day.vue | 140 +++++++++++
.../hard-sh/components/hard-sh-by-month.vue | 122 ++++++++++
src/views/hard/hard-sh/index.vue | 217 ++++++++----------
4 files changed, 371 insertions(+), 120 deletions(-)
create mode 100644 src/views/hard/hard-sh/components/hard-sh-by-day.vue
create mode 100644 src/views/hard/hard-sh/components/hard-sh-by-month.vue
diff --git a/src/api/hard/hard-total.ts b/src/api/hard/hard-total.ts
index bca7dd9..0f0cef4 100644
--- a/src/api/hard/hard-total.ts
+++ b/src/api/hard/hard-total.ts
@@ -114,3 +114,15 @@ export function pageListCs(query?: any) {
data: query,
})
}
+
+export function pageListCsByMonth(query?: any) {
+ return request({
+ url: "/hard/hard-total/page-list-cs-by-month",
+ method: "post",
+ params: {
+ current: query.current,
+ size: query.size,
+ },
+ data: query,
+ })
+}
diff --git a/src/views/hard/hard-sh/components/hard-sh-by-day.vue b/src/views/hard/hard-sh/components/hard-sh-by-day.vue
new file mode 100644
index 0000000..e35102e
--- /dev/null
+++ b/src/views/hard/hard-sh/components/hard-sh-by-day.vue
@@ -0,0 +1,140 @@
+
+
+
- {{ $t("common.queryBtn")
+ {{ $t("common.queryBtn")
}}
{{ $t("common.resetBtn") }}
-
-
From 70ae62203ab8ed2f4e6f0389c3ff5211f967fd2d Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 28 Jan 2026 11:32:32 +0800
Subject: [PATCH 08/17] =?UTF-8?q?feat:=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/act/act-coupon.ts | 40 +++++
src/hooks/dict.ts | 32 ++--
src/utils/other.ts | 2 +-
src/views/act/act-coupon/form.vue | 244 +++++++++++++++++++++++++++++
src/views/act/act-coupon/index.vue | 229 +++++++++++++++++++++++++++
src/views/hard/hard-sh/index.vue | 8 +-
6 files changed, 540 insertions(+), 15 deletions(-)
create mode 100644 src/api/act/act-coupon.ts
create mode 100644 src/views/act/act-coupon/form.vue
create mode 100644 src/views/act/act-coupon/index.vue
diff --git a/src/api/act/act-coupon.ts b/src/api/act/act-coupon.ts
new file mode 100644
index 0000000..6b76ccf
--- /dev/null
+++ b/src/api/act/act-coupon.ts
@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: "/wallet/act-coupon/page",
+ method: "get",
+ params: query,
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: "/wallet/act-coupon",
+ method: "post",
+ data: obj,
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: "/wallet/act-coupon/" + id,
+ method: "get",
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: "/wallet/act-coupon",
+ method: "delete",
+ data: ids,
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: "/wallet/act-coupon",
+ method: "put",
+ data: obj,
+ })
+}
diff --git a/src/hooks/dict.ts b/src/hooks/dict.ts
index a7f4c9a..420a538 100644
--- a/src/hooks/dict.ts
+++ b/src/hooks/dict.ts
@@ -1,29 +1,35 @@
-import { dict } from '/@/stores/dict';
-import { getDicts } from '/@/api/admin/dict';
-import { ref, toRefs } from 'vue';
+import { dict } from "/@/stores/dict"
+import { getDicts } from "/@/api/admin/dict"
+import { ref, toRefs } from "vue"
/**
* 获取字典数据
*/
export function useDict(...args: any): any {
- const res = ref({});
+ const res = ref({})
return (() => {
args.forEach((dictType: String) => {
// @ts-ignore
- res.value[dictType] = [];
- const dicts = dict().getDict(dictType);
+ res.value[dictType] = []
+ const dicts = dict().getDict(dictType)
if (dicts) {
// @ts-ignore
- res.value[dictType] = dicts;
+ res.value[dictType] = dicts
} else {
getDicts(dictType).then((resp) => {
// @ts-ignore
- res.value[dictType] = resp.data.map((p: any) => ({ label: p.label, value: p.value, elTagType: p.listClass, elTagClass: p.cssClass }));
+ res.value[dictType] = resp.data.map((p: any) => ({
+ label: p.label,
+ value: p.value,
+ elTagType: p.listClass,
+ elTagClass: p.cssClass,
+ remarks: p.remarks,
+ }))
// @ts-ignore
- dict().setDict(dictType, res.value[dictType]);
- });
+ dict().setDict(dictType, res.value[dictType])
+ })
}
- });
- return toRefs(res.value);
- })();
+ })
+ return toRefs(res.value)
+ })()
}
diff --git a/src/utils/other.ts b/src/utils/other.ts
index 908cccb..7c0068e 100644
--- a/src/utils/other.ts
+++ b/src/utils/other.ts
@@ -390,7 +390,7 @@ export function handleBlobFile(response: any, fileName: string) {
}
}
if (typeof (blob as any).text === "function") {
- ;(blob as any).text().then((t: string) => handleText(t))
+ (blob as any).text().then((t: string) => handleText(t))
} else {
const reader = new FileReader()
reader.onload = () => handleText(String(reader.result || ""))
diff --git a/src/views/act/act-coupon/form.vue b/src/views/act/act-coupon/form.vue
new file mode 100644
index 0000000..77362b2
--- /dev/null
+++ b/src/views/act/act-coupon/form.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.type == '2' ? '%' : '元' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 限领
+
+
+
+
+
+
+
+
+ 次
+
+
+
+
+
+ 有效期
+
+
+
+
+
+
+
+
+
+
+
+
+ 天
+
+
+
+
+
+ 使用范围
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/act/act-coupon/index.vue b/src/views/act/act-coupon/index.vue
new file mode 100644
index 0000000..2296c48
--- /dev/null
+++ b/src/views/act/act-coupon/index.vue
@@ -0,0 +1,229 @@
+
+
-
+
+
+
{{ $t("common.queryBtn")
}}
From 7e24072ff8d40eaf38b6beb972b8dc6257da7a05 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 28 Jan 2026 20:07:54 +0800
Subject: [PATCH 09/17] =?UTF-8?q?feat:=E7=94=A8=E6=88=B7=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.dev-local | 2 +-
src/api/act/act-coupon-record.ts | 40 ++++
src/views/act/act-coupon-record/index.vue | 225 ++++++++++++++++++++++
src/views/act/act-coupon/form.vue | 7 +
src/views/act/act-coupon/index.vue | 150 ++++++---------
5 files changed, 337 insertions(+), 87 deletions(-)
create mode 100644 src/api/act/act-coupon-record.ts
create mode 100644 src/views/act/act-coupon-record/index.vue
diff --git a/.env.dev-local b/.env.dev-local
index 82069dd..a98aee8 100644
--- a/.env.dev-local
+++ b/.env.dev-local
@@ -9,7 +9,7 @@ ENV = 'local'
# ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+VITE_ADMIN_PROXY_PATH = http://localhost:9999
# 图片访问基础地址
diff --git a/src/api/act/act-coupon-record.ts b/src/api/act/act-coupon-record.ts
new file mode 100644
index 0000000..6001194
--- /dev/null
+++ b/src/api/act/act-coupon-record.ts
@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: "/wallet/act-coupon-record/page",
+ method: "get",
+ params: query,
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: "/wallet/act-coupon-record",
+ method: "post",
+ data: obj,
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: "/wallet/act-coupon-record/" + id,
+ method: "get",
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: "/wallet/act-coupon-record",
+ method: "delete",
+ data: ids,
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: "/wallet/act-coupon-record",
+ method: "put",
+ data: obj,
+ })
+}
diff --git a/src/views/act/act-coupon-record/index.vue b/src/views/act/act-coupon-record/index.vue
new file mode 100644
index 0000000..9967b13
--- /dev/null
+++ b/src/views/act/act-coupon-record/index.vue
@@ -0,0 +1,225 @@
+
+
+ 营销相关
+
+
+
+
@@ -141,6 +147,7 @@ const defaultForm = {
scopeId: '',
status: '1',
description: '',
+ bindNotifyId: '',
};
const form = reactive({ ...defaultForm });
diff --git a/src/views/act/act-coupon/index.vue b/src/views/act/act-coupon/index.vue
index 2296c48..22bb82d 100644
--- a/src/views/act/act-coupon/index.vue
+++ b/src/views/act/act-coupon/index.vue
@@ -7,14 +7,10 @@
-
-
+
-
-
+
查询
@@ -28,6 +24,10 @@
v-auth="'wallet_actCoupon_add'">
新 增
+
+ 发放
+
删除
@@ -40,58 +40,67 @@
:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
@sort-change="sortChangeHandle">
-
-
+
+
+
+
+
+ {{ Number(row.faceValue) }}%
+ ¥{{ formatFenToYuan(row.faceValue) }}
+
+
+
+ {{ row.minPoint === '0' || row.minPoint === 0 ? '无门槛' : '满¥' +
+ formatFenToYuan(row.minPoint) }}
+
+
+ {{ Number(row.totalCount) === -1 ? '不限量' : row.totalCount }}
+
+
+
+
-
-
- {{ Number(row.faceValue) }}%
- ¥{{ formatFenToYuan(row.faceValue) }}
-
+
+
+
+
+
-
- {{ row.minPoint === '0' || row.minPoint === 0 ? '无门槛' : '满¥' +
- formatFenToYuan(row.minPoint) }}
+
+
+
+
+
+
+ 领取后{{ row.validDays }}天
+
+ {{ formatDate(row.validStartTime, "YYYY-mm-dd HH:MM:SS") }}
+ 至
+ {{ formatDate(row.validEndTime, "YYYY-mm-dd HH:MM:SS") }}
+
+
+
-
- {{ Number(row.totalCount) === -1 ? '不限量' : row.totalCount }}
-
-
-
-
-
-
-
-
-
-
-
- {{ id }}
-
-
-
-
-
-
+
编辑
@@ -113,11 +122,14 @@
import { BasicTableProps, useTable } from "/@/hooks/table";
import * as actCouponApi from '/@/api/act/act-coupon'
import { useMessage, useMessageBox } from "/@/hooks/message";
+import { formatDate } from '/@/utils/formatTime';
+import { useDict } from "/@/hooks/dict"
// 引入组件
const FormDialog = defineAsyncComponent(() => import('./form.vue'));
// 定义查询字典
-
+const { act_coupon_type, act_coupon_limit_type, act_coupon_status, act_coupon_use_scope_type, act_coupon_valid_type }
+ = useDict("act_coupon_type", "act_coupon_limit_type", "act_coupon_status", "act_coupon_use_scope_type", "act_coupon_valid_type")
// 定义变量内容
const formDialogRef = ref()
// 搜索变量
@@ -179,40 +191,6 @@ const handleDelete = async (ids: string[]) => {
}
};
-const coupon_type = [
- { label: '满减券', value: '1', elTagType: 'primary' },
- { label: '折扣券', value: '2', elTagType: 'success' },
- { label: '立减券', value: '3', elTagType: 'warning' },
- { label: '兑换券', value: '4', elTagType: 'info' }
-]
-
-const limit_type = [
- { label: '活动期间一次', value: 'once', elTagType: 'info' },
- { label: '每天', value: 'day', elTagType: 'primary' },
- { label: '每周', value: 'week', elTagType: 'success' },
- { label: '每月', value: 'month', elTagType: 'warning' },
- { label: '每年', value: 'year', elTagType: 'danger' }
-]
-
-const valid_type = [
- { label: '固定日期', value: '1', elTagType: 'primary' },
- { label: '领取后生效', value: '2', elTagType: 'success' }
-]
-
-const scope_type = [
- { label: '全场通用', value: '0', elTagType: 'success' },
- { label: '指定商户', value: '1', elTagType: 'primary' },
- { label: '指定分类', value: '2', elTagType: 'warning' },
- { label: '指定商品', value: '3', elTagType: 'info' }
-]
-
-const coupon_status = [
- { label: '草稿', value: '0', elTagType: 'info' },
- { label: '进行中', value: '1', elTagType: 'success' },
- { label: '已结束', value: '2', elTagType: 'warning' },
- { label: '已作废', value: '3', elTagType: 'danger' }
-]
-
function formatFenToYuan(val: number | string) {
const n = Number(val)
if (isNaN(n)) return val as any
From 50f5d7deb296ad493e5815ab38f433f599b4df6a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 29 Jan 2026 11:40:26 +0800
Subject: [PATCH 10/17] =?UTF-8?q?feat:h5=E9=A2=86=E5=8F=96=E9=A3=9F?=
=?UTF-8?q?=E5=A0=82=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 2 +-
src/views/act/act-coupon-record/index.vue | 126 ++++++++++------------
src/views/act/act-coupon/index.vue | 9 +-
3 files changed, 63 insertions(+), 74 deletions(-)
diff --git a/package.json b/package.json
index 42327a2..8b784df 100644
--- a/package.json
+++ b/package.json
@@ -119,4 +119,4 @@
"type": "git",
"url": "https://gitee.com/log4j/pig"
}
-}
+}
\ No newline at end of file
diff --git a/src/views/act/act-coupon-record/index.vue b/src/views/act/act-coupon-record/index.vue
index 9967b13..c0f0a9a 100644
--- a/src/views/act/act-coupon-record/index.vue
+++ b/src/views/act/act-coupon-record/index.vue
@@ -3,21 +3,15 @@
-
-
+
-
-
-
+
+
-
-
-
-
-
+
+
查询
@@ -27,59 +21,71 @@
+
+
+
+
+
+
+
+ {{ Number(row.faceValue) }}%
+ ¥{{ displayPrice(row.faceValue) }}
+
+
+
+
+ {{ row.minPoint === '0' || row.minPoint === 0 ? '无门槛' : '满¥' +
+ displayPrice(row.minPoint) }}
+
+
+
-
-
+
+
-
+ {{ row.startTime }}
+ 至
+ {{ row.endTime }}
+
-
-
- {{ Number(row.faceValue) }}%
- ¥{{ formatFenToYuan(row.faceValue) }}
-
+
+
+
+
+ ¥{{ displayPrice(row.useAmount) }}
+
-
-
- {{ row.minPoint === '0' || row.minPoint === 0 ? '无门槛' : '满¥' +
- formatFenToYuan(row.minPoint) }}
-
-
-
- ¥{{ formatFenToYuan(row.useAmount) }}
-
-
+
+
+
删除
@@ -116,10 +122,14 @@
import { BasicTableProps, useTable } from "/@/hooks/table";
import * as actCouponRecordApi from '/@/api/act/act-coupon-record'
import { useMessage, useMessageBox } from "/@/hooks/message";
+import { displayPrice } from "/@/utils/formatMoney"
+import { useDict } from "/@/hooks/dict"
+
// 引入组件
// 定义查询字典
-
+const { act_coupon_type, act_coupon_record_status }
+ = useDict("act_coupon_type", "act_coupon_record_status")
// 定义变量内容
// 搜索变量
@@ -181,24 +191,6 @@ const handleDelete = async (ids: string[]) => {
}
};
-const coupon_type = [
- { label: '满减券', value: '1', elTagType: 'primary' },
- { label: '折扣券', value: '2', elTagType: 'success' },
- { label: '立减券', value: '3', elTagType: 'warning' },
- { label: '兑换券', value: '4', elTagType: 'info' }
-]
-const record_status = [
- { label: '未使用', value: '0', elTagType: 'info' },
- { label: '已使用', value: '1', elTagType: 'success' },
- { label: '已过期', value: '2', elTagType: 'warning' },
- { label: '已作废', value: '3', elTagType: 'danger' }
-]
-
-function formatFenToYuan(val: number | string) {
- const n = Number(val)
- if (isNaN(n)) return val as any
- return (n / 100).toFixed(2)
-}
const extendVisible = ref(false)
const extendForm = reactive({ id: '', currentEnd: '', newEnd: '' })
diff --git a/src/views/act/act-coupon/index.vue b/src/views/act/act-coupon/index.vue
index 22bb82d..37f1422 100644
--- a/src/views/act/act-coupon/index.vue
+++ b/src/views/act/act-coupon/index.vue
@@ -24,16 +24,13 @@
v-auth="'wallet_actCoupon_add'">
新 增
-
- 发放
-
删除
-
Date: Thu, 29 Jan 2026 16:03:20 +0800
Subject: [PATCH 11/17] =?UTF-8?q?feat:app=E7=89=88=E6=9C=AC=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/integrated/app-version.ts | 40 +++++
src/views/act/act-cancel/form.vue | 11 +-
src/views/integrated/app-version/form.vue | 173 +++++++++++++++++++++
src/views/integrated/app-version/index.vue | 166 ++++++++++++++++++++
4 files changed, 386 insertions(+), 4 deletions(-)
create mode 100644 src/api/integrated/app-version.ts
create mode 100644 src/views/integrated/app-version/form.vue
create mode 100644 src/views/integrated/app-version/index.vue
diff --git a/src/api/integrated/app-version.ts b/src/api/integrated/app-version.ts
new file mode 100644
index 0000000..10d4b21
--- /dev/null
+++ b/src/api/integrated/app-version.ts
@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+ return request({
+ url: "/integrated/app-version/page",
+ method: "get",
+ params: query,
+ })
+}
+
+export function addObj(obj?: Object) {
+ return request({
+ url: "/integrated/app-version",
+ method: "post",
+ data: obj,
+ })
+}
+
+export function getObj(id?: string) {
+ return request({
+ url: "/integrated/app-version/" + id,
+ method: "get",
+ })
+}
+
+export function delObjs(ids?: Object) {
+ return request({
+ url: "/integrated/app-version",
+ method: "delete",
+ data: ids,
+ })
+}
+
+export function putObj(obj?: Object) {
+ return request({
+ url: "/integrated/app-version",
+ method: "put",
+ data: obj,
+ })
+}
diff --git a/src/views/act/act-cancel/form.vue b/src/views/act/act-cancel/form.vue
index fe3d61c..821998c 100644
--- a/src/views/act/act-cancel/form.vue
+++ b/src/views/act/act-cancel/form.vue
@@ -1,6 +1,7 @@
-
+
@@ -28,13 +29,15 @@
-
-
@@ -124,7 +127,7 @@ const openDialog = (id: string) => {
// 提交
const onSubmit = async () => {
- const valid = await dataFormRef.value.validate().catch(() => {})
+ const valid = await dataFormRef.value.validate().catch(() => { })
if (!valid) return false
try {
diff --git a/src/views/integrated/app-version/form.vue b/src/views/integrated/app-version/form.vue
new file mode 100644
index 0000000..8e09cb8
--- /dev/null
+++ b/src/views/integrated/app-version/form.vue
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/integrated/app-version/index.vue b/src/views/integrated/app-version/index.vue
new file mode 100644
index 0000000..69e68f8
--- /dev/null
+++ b/src/views/integrated/app-version/index.vue
@@ -0,0 +1,166 @@
+
+
今日午餐菜品
-{{ currentDate }} {{ currentTime }}
+ {{ currentDate }} {{
+ currentTime }}
- ![]()
+ ![]()
- 午餐
-
+
{{ dish.name }}
-¥{{ displayPrice(dish.price) }}
+¥{{ + displayPrice(dish.price) }}
+
+
+
+
+ {{ displayPrice(row.totalPayPrice) }}
+
+
+
+
+
+
+ {{ row.totalPayCount || 0 }}
+
+
+
+
+
+
+ {{ displayPrice(row.totalRefundPrice) }}
+
+
+
+
+
+
+ {{ row.totalRefundCount || 0 }}
+
+
+
+
+
+
+ {{ displayPrice(row.totalProfitPrice) }}
+
+
+
+
+
+
+ {{ row.totalProfitCount || 0 }}
+
+
+
+
+
+
+
+ 商户结账
+
+
+
+ 导出商户流水
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/hard/hard-sh/components/hard-sh-by-month.vue b/src/views/hard/hard-sh/components/hard-sh-by-month.vue
new file mode 100644
index 0000000..7e34913
--- /dev/null
+++ b/src/views/hard/hard-sh/components/hard-sh-by-month.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+ {{ row.merchantName || row.merchantId }}
+
+
+
+
+
+ {{ displayPrice(row.totalPayPrice) }}
+
+
+
+
+
+
+ {{ row.totalPayCount || 0 }}
+
+
+
+
+
+
+ {{ displayPrice(row.totalRefundPrice) }}
+
+
+
+
+
+
+ {{ row.totalRefundCount || 0 }}
+
+
+
+
+
+
+ {{ displayPrice(row.totalProfitPrice) }}
+
+
+
+
+
+
+ {{ row.totalProfitCount || 0 }}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue
index 1f78747..718ca31 100644
--- a/src/views/hard/hard-sh/index.vue
+++ b/src/views/hard/hard-sh/index.vue
@@ -10,7 +10,7 @@
disabled: 'isLockNone',
}">
-
+
+
+
+
-
-
-
-
- {{ displayPrice(row.totalPayPrice) }}
-
-
-
-
-
-
- {{ row.totalPayCount || 0 }}
-
-
-
-
-
-
- {{ displayPrice(row.totalRefundPrice) }}
-
-
-
-
-
-
- {{ row.totalRefundCount || 0 }}
-
-
-
-
-
-
- {{ displayPrice(row.totalProfitPrice) }}
-
-
-
-
-
-
- {{ row.totalProfitCount || 0 }}
-
-
-
-
-
-
-
- 商户结账
-
-
-
- 导出商户流水
-
-
-
-
+
@@ -108,80 +52,113 @@
+
+
+
+
diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue
index 718ca31..da92a6f 100644
--- a/src/views/hard/hard-sh/index.vue
+++ b/src/views/hard/hard-sh/index.vue
@@ -21,10 +21,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+ {{ Number(row.faceValue) }}%
+ ¥{{ formatFenToYuan(row.faceValue) }}
+
+
+
+ {{ row.minPoint === '0' || row.minPoint === 0 ? '无门槛' : '满¥' +
+ formatFenToYuan(row.minPoint) }}
+
+
+ {{ Number(row.totalCount) === -1 ? '不限量' : row.totalCount }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ id }}
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/act/act-coupon/form.vue b/src/views/act/act-coupon/form.vue
index 77362b2..af4390d 100644
--- a/src/views/act/act-coupon/form.vue
+++ b/src/views/act/act-coupon/form.vue
@@ -97,6 +97,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ Number(row.faceValue) }}%
+ ¥{{ formatFenToYuan(row.faceValue) }}
+
+
+
+
+ {{ row.minPoint === '0' || row.minPoint === 0 ? '无门槛' : '满¥' +
+ formatFenToYuan(row.minPoint) }}
+
+
+
+ ¥{{ formatFenToYuan(row.useAmount) }}
+
+
+
+ 删除
+ 延长有效期
+
+
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
-
- 新 增
-
删除
-
+
+
+
+
From b0588654f63e997238f72563e5db89065d5138ea Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 29 Jan 2026 19:29:49 +0800
Subject: [PATCH 12/17] =?UTF-8?q?feat=EF=BC=9A11?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Material/index.vue | 184 +++++++++++-------------------
src/components/Upload/index.vue | 57 +++------
src/views/admin/file/index.vue | 6 +-
3 files changed, 89 insertions(+), 158 deletions(-)
diff --git a/src/components/Material/index.vue b/src/components/Material/index.vue
index 3c17c75..4d381da 100644
--- a/src/components/Material/index.vue
+++ b/src/components/Material/index.vue
@@ -4,35 +4,20 @@
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 打开
+ 复制
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+ 新 增
+
+
+ 删除
+
+
+
-
+
- 
+
- {{ data.name }}
-
+ {{ data.name }}
+
···
-
+
{{ $t('material.editGroup') }}
@@ -59,8 +44,9 @@
+ @keyup.enter="refresh">
-
@@ -97,28 +83,20 @@
-
-
+
- {{ data.name }}
-
+ {{ data.name }}
+
- {{ $t('material.uploadFileTip') }}
+ {{
+ $t('material.uploadFileTip') }}
@@ -68,7 +54,7 @@
+ :title="$t('material.moveBtn')">
{{ $t('material.moveBtn') }}
@@ -84,12 +70,12 @@
-
+
{{ $t('material.rename') }}
{{ $t('material.download') }}
@@ -165,19 +136,11 @@
-
+
-
@@ -192,19 +155,12 @@
-
-
+
重命名
@@ -219,12 +175,12 @@
{{
- $t('el.transfer.noData')
+ $t('el.transfer.noData')
}}~
-
@@ -249,35 +205,31 @@