git
/
fuyuan-housekeeping-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【订单列表】 优化# 去掉实付金额

dev1.0
kaeery 2025-03-12 12:05:36 +08:00
parent 4d7b6c15a9
commit 2b90eba0ab
9 changed files with 355 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -36,3 +36,7 @@ components.d.ts
yarn.lock yarn.lock
package-lock.json package-lock.json
public
*.zip
*.rar

13
index.html
View File

@ -1,11 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>粤好生活-后台管理系统</title> <title>思缘生活-后台管理系统</title>
<style> <style>
* { * {
margin: 0; margin: 0;
@ -42,7 +41,6 @@
} }
@keyframes loading-dash { @keyframes loading-dash {
0% { 0% {
stroke-dasharray: 90, 150; stroke-dasharray: 90, 150;
stroke-dashoffset: -40px; stroke-dashoffset: -40px;
@ -55,9 +53,9 @@
} }
</style> </style>
<script src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=2SABZ-S4TWH-AMCDO-W742B-SKEOE-UWBKJ"></script> <script src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=2SABZ-S4TWH-AMCDO-W742B-SKEOE-UWBKJ"></script>
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<div class="preload"> <div class="preload">
<svg viewBox="25 25 50 50" class="circular"> <svg viewBox="25 25 50 50" class="circular">
@ -66,6 +64,5 @@
</div> </div>
</div> </div>
<script type="module" src="/src/main.ts"></script> <script type="module" src="/src/main.ts"></script>
</body> </body>
</html> </html>

91
public/admin/admin/index.html
View File

@ -1,11 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>粤好生活-后台管理系统</title> <title>思缘生活-后台管理系统</title>
<style> <style>
* { * {
margin: 0; margin: 0;
@ -50,7 +49,6 @@
} }
@-webkit-keyframes loading-dash { @-webkit-keyframes loading-dash {
0% { 0% {
stroke-dasharray: 90, 150; stroke-dasharray: 90, 150;
stroke-dashoffset: -40px; stroke-dashoffset: -40px;
@ -63,7 +61,6 @@
} }
@keyframes loading-dash { @keyframes loading-dash {
0% { 0% {
stroke-dasharray: 90, 150; stroke-dasharray: 90, 150;
stroke-dashoffset: -40px; stroke-dashoffset: -40px;
@ -76,47 +73,47 @@
} }
</style> </style>
<script src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=2SABZ-S4TWH-AMCDO-W742B-SKEOE-UWBKJ"></script> <script src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=2SABZ-S4TWH-AMCDO-W742B-SKEOE-UWBKJ"></script>
<script type="module" crossorigin src="/assets/index.1f6a65da.js"></script> <script type="module" crossorigin src="/assets/index.073f879d.js"></script>
<link rel="modulepreload" crossorigin href="/assets/@vue.ad3a2c51.js"> <link rel="modulepreload" crossorigin href="/assets/@vue.ad3a2c51.js" />
<link rel="modulepreload" crossorigin href="/assets/@vueuse.c2fd8b33.js"> <link rel="modulepreload" crossorigin href="/assets/@vueuse.c2fd8b33.js" />
<link rel="modulepreload" crossorigin href="/assets/@element-plus.4b8482d8.js"> <link rel="modulepreload" crossorigin href="/assets/@element-plus.4b8482d8.js" />
<link rel="modulepreload" crossorigin href="/assets/lodash-es.61686ec6.js"> <link rel="modulepreload" crossorigin href="/assets/lodash-es.61686ec6.js" />
<link rel="modulepreload" crossorigin href="/assets/axios.136fb7b6.js"> <link rel="modulepreload" crossorigin href="/assets/axios.136fb7b6.js" />
<link rel="modulepreload" crossorigin href="/assets/dayjs.c8b8967e.js"> <link rel="modulepreload" crossorigin href="/assets/dayjs.c8b8967e.js" />
<link rel="modulepreload" crossorigin href="/assets/async-validator.fb49d0f5.js"> <link rel="modulepreload" crossorigin href="/assets/async-validator.fb49d0f5.js" />
<link rel="modulepreload" crossorigin href="/assets/@ctrl.82a509e0.js"> <link rel="modulepreload" crossorigin href="/assets/@ctrl.82a509e0.js" />
<link rel="modulepreload" crossorigin href="/assets/@popperjs.36402333.js"> <link rel="modulepreload" crossorigin href="/assets/@popperjs.36402333.js" />
<link rel="modulepreload" crossorigin href="/assets/escape-html.e5dfadb9.js"> <link rel="modulepreload" crossorigin href="/assets/escape-html.e5dfadb9.js" />
<link rel="modulepreload" crossorigin href="/assets/normalize-wheel-es.8aeb3683.js"> <link rel="modulepreload" crossorigin href="/assets/normalize-wheel-es.8aeb3683.js" />
<link rel="modulepreload" crossorigin href="/assets/memoize-one.4ee5c96d.js"> <link rel="modulepreload" crossorigin href="/assets/memoize-one.4ee5c96d.js" />
<link rel="modulepreload" crossorigin href="/assets/element-plus.02c000b8.js"> <link rel="modulepreload" crossorigin href="/assets/element-plus.02c000b8.js" />
<link rel="modulepreload" crossorigin href="/assets/lodash.8effadcb.js"> <link rel="modulepreload" crossorigin href="/assets/lodash.8effadcb.js" />
<link rel="modulepreload" crossorigin href="/assets/vue-router.93f65f3b.js"> <link rel="modulepreload" crossorigin href="/assets/vue-router.93f65f3b.js" />
<link rel="modulepreload" crossorigin href="/assets/vue-demi.ebc8116b.js"> <link rel="modulepreload" crossorigin href="/assets/vue-demi.ebc8116b.js" />
<link rel="modulepreload" crossorigin href="/assets/pinia.f0255b9b.js"> <link rel="modulepreload" crossorigin href="/assets/pinia.f0255b9b.js" />
<link rel="modulepreload" crossorigin href="/assets/clone.4b381e37.js"> <link rel="modulepreload" crossorigin href="/assets/clone.4b381e37.js" />
<link rel="modulepreload" crossorigin href="/assets/color-name.e7a4e1d3.js"> <link rel="modulepreload" crossorigin href="/assets/color-name.e7a4e1d3.js" />
<link rel="modulepreload" crossorigin href="/assets/color-convert.755d189f.js"> <link rel="modulepreload" crossorigin href="/assets/color-convert.755d189f.js" />
<link rel="modulepreload" crossorigin href="/assets/color-string.e356f5de.js"> <link rel="modulepreload" crossorigin href="/assets/color-string.e356f5de.js" />
<link rel="modulepreload" crossorigin href="/assets/color.0adfd97a.js"> <link rel="modulepreload" crossorigin href="/assets/color.0adfd97a.js" />
<link rel="modulepreload" crossorigin href="/assets/css-color-function.3cb93b94.js"> <link rel="modulepreload" crossorigin href="/assets/css-color-function.3cb93b94.js" />
<link rel="modulepreload" crossorigin href="/assets/nprogress.09754c1e.js"> <link rel="modulepreload" crossorigin href="/assets/nprogress.09754c1e.js" />
<link rel="modulepreload" crossorigin href="/assets/clipboard.42524a75.js"> <link rel="modulepreload" crossorigin href="/assets/clipboard.42524a75.js" />
<link rel="modulepreload" crossorigin href="/assets/vue-clipboard3.c5f2d3ed.js"> <link rel="modulepreload" crossorigin href="/assets/vue-clipboard3.c5f2d3ed.js" />
<link rel="modulepreload" crossorigin href="/assets/tslib.60310f1a.js"> <link rel="modulepreload" crossorigin href="/assets/tslib.60310f1a.js" />
<link rel="modulepreload" crossorigin href="/assets/zrender.8ee1a698.js"> <link rel="modulepreload" crossorigin href="/assets/zrender.8ee1a698.js" />
<link rel="modulepreload" crossorigin href="/assets/echarts.234b3572.js"> <link rel="modulepreload" crossorigin href="/assets/echarts.234b3572.js" />
<link rel="modulepreload" crossorigin href="/assets/highlight.js.4ebdf9a4.js"> <link rel="modulepreload" crossorigin href="/assets/highlight.js.4ebdf9a4.js" />
<link rel="modulepreload" crossorigin href="/assets/@highlightjs.0d5173e3.js"> <link rel="modulepreload" crossorigin href="/assets/@highlightjs.0d5173e3.js" />
<link rel="modulepreload" crossorigin href="/assets/mitt.d8e3ba72.js"> <link rel="modulepreload" crossorigin href="/assets/mitt.d8e3ba72.js" />
<link rel="modulepreload" crossorigin href="/assets/vue3-eventbus.c7305b83.js"> <link rel="modulepreload" crossorigin href="/assets/vue3-eventbus.c7305b83.js" />
<link rel="stylesheet" href="/assets/element-plus.149e8a96.css"> <link rel="stylesheet" href="/assets/element-plus.149e8a96.css" />
<link rel="stylesheet" href="/assets/nprogress.a2a0c377.css"> <link rel="stylesheet" href="/assets/nprogress.a2a0c377.css" />
<link rel="stylesheet" href="/assets/highlight.5f5db245.css"> <link rel="stylesheet" href="/assets/highlight.5f5db245.css" />
<link rel="stylesheet" href="/assets/index.8c422639.css"> <link rel="stylesheet" href="/assets/index.8c422639.css" />
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<div class="preload"> <div class="preload">
<svg viewBox="25 25 50 50" class="circular"> <svg viewBox="25 25 50 50" class="circular">
@ -124,7 +121,5 @@
</svg> </svg>
</div> </div>
</div> </div>
</body>
</body>
</html> </html>

16
public/admin/index.html
View File

@ -1,11 +1,10 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN"> <html lang="zh-CN">
<head>
<head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>粤好生活-后台管理系统</title> <title>思缘生活-后台管理系统</title>
<style> <style>
* { * {
margin: 0; margin: 0;
@ -50,7 +49,6 @@
} }
@-webkit-keyframes loading-dash { @-webkit-keyframes loading-dash {
0% { 0% {
stroke-dasharray: 90, 150; stroke-dasharray: 90, 150;
stroke-dashoffset: -40px; stroke-dashoffset: -40px;
@ -63,7 +61,6 @@
} }
@keyframes loading-dash { @keyframes loading-dash {
0% { 0% {
stroke-dasharray: 90, 150; stroke-dasharray: 90, 150;
stroke-dashoffset: -40px; stroke-dashoffset: -40px;
@ -76,7 +73,7 @@
} }
</style> </style>
<script src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=2SABZ-S4TWH-AMCDO-W742B-SKEOE-UWBKJ"></script> <script src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=2SABZ-S4TWH-AMCDO-W742B-SKEOE-UWBKJ"></script>
<script type="module" crossorigin src="/assets/index.7e71cca7.js"></script> <script type="module" crossorigin src="/assets/index.2c7b212c.js"></script>
<link rel="modulepreload" crossorigin href="/assets/@vue.ad3a2c51.js"> <link rel="modulepreload" crossorigin href="/assets/@vue.ad3a2c51.js">
<link rel="modulepreload" crossorigin href="/assets/@vueuse.c2fd8b33.js"> <link rel="modulepreload" crossorigin href="/assets/@vueuse.c2fd8b33.js">
<link rel="modulepreload" crossorigin href="/assets/@element-plus.4b8482d8.js"> <link rel="modulepreload" crossorigin href="/assets/@element-plus.4b8482d8.js">
@ -114,9 +111,9 @@
<link rel="stylesheet" href="/assets/nprogress.a2a0c377.css"> <link rel="stylesheet" href="/assets/nprogress.a2a0c377.css">
<link rel="stylesheet" href="/assets/highlight.5f5db245.css"> <link rel="stylesheet" href="/assets/highlight.5f5db245.css">
<link rel="stylesheet" href="/assets/index.8c422639.css"> <link rel="stylesheet" href="/assets/index.8c422639.css">
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<div class="preload"> <div class="preload">
<svg viewBox="25 25 50 50" class="circular"> <svg viewBox="25 25 50 50" class="circular">
@ -125,6 +122,5 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>

2
src/config/index.ts
View File

@ -8,7 +8,7 @@
*/ */
const config = { const config = {
terminal: 1, //终端 terminal: 1, //终端
title: '粤好生活-后台管理系统', //网站默认标题 title: '思缘生活-后台管理系统', //网站默认标题
version: '1.3.3', //版本号 version: '1.3.3', //版本号
baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名 baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名
urlPrefix: 'api', //请求默认前缀 urlPrefix: 'api', //请求默认前缀

2
src/layout/components/footer.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<footer class="layout-footer bg-[#f5f5f5] bg-opacity-90 text-center"> <footer class="layout-footer bg-[#f5f5f5] bg-opacity-90 text-center">
<div class="p-2 text-xs text-tx-secondary max-w-[900px] mx-auto"> <div class="p-2 text-xs text-tx-secondary max-w-[900px] mx-auto">
<a href="http://beian.miit.gov.cn" class="my-[10px]">Copyright © 2023 粤ICP备2025364700号 - 广东粤好生活服务有限公司版权所有</a> <a href="http://beian.miit.gov.cn" class="my-[10px]">Copyright © 2023 粤ICP备2025364700号 - 广东思缘生活服务有限公司版权所有</a>
</div> </div>
</footer> </footer>
</template> </template>

14
src/views/order/lists/detail.vue
View File

@ -18,21 +18,21 @@
<el-form-item label="订单状态: "> <el-form-item label="订单状态: ">
<div class="content text-warning">{{ formData.orderStatusName || '-' }}</div> <div class="content text-warning">{{ formData.orderStatusName || '-' }}</div>
</el-form-item> </el-form-item>
<el-form-item label="支付状态: "> <!-- <el-form-item label="支付状态: ">
<div class="content">{{ formData.payStatusName || '-' }}</div> <div class="content">{{ formData.payStatusName || '-' }}</div>
</el-form-item> </el-form-item> -->
<el-form-item label="订单编号: "> <el-form-item label="订单编号: ">
<div class="content">{{ formData.sn || '-' }}</div> <div class="content">{{ formData.sn || '-' }}</div>
</el-form-item> </el-form-item>
<el-form-item label="支付方式: "> <!-- <el-form-item label="支付方式: ">
<div class="content">{{ formData.payWayName || '-' }}</div> <div class="content">{{ formData.payWayName || '-' }}</div>
</el-form-item> </el-form-item> -->
<el-form-item label="下单时间: "> <el-form-item label="下单时间: ">
<div class="content">{{ formData.createTime || '-' }}</div> <div class="content">{{ formData.createTime || '-' }}</div>
</el-form-item> </el-form-item>
<el-form-item label="支付时间: "> <!-- <el-form-item label="支付时间: ">
<div class="content">{{ formData.payTime || '-' }}</div> <div class="content">{{ formData.payTime || '-' }}</div>
</el-form-item> </el-form-item> -->
<el-form-item label="用户昵称: "> <el-form-item label="用户昵称: ">
<div class="content">{{ formData.nickname || '-' }}</div> <div class="content">{{ formData.nickname || '-' }}</div>
</el-form-item> </el-form-item>
@ -247,7 +247,7 @@
<template #default="{ row }">{{ isUseCoupon(row) }}</template> <template #default="{ row }">{{ isUseCoupon(row) }}</template>
</el-table-column> --> </el-table-column> -->
<!-- <el-table-column property="deductionMoney" label="抵扣金额" width="120" fixed="right" /> --> <!-- <el-table-column property="deductionMoney" label="抵扣金额" width="120" fixed="right" /> -->
<el-table-column property="orderAmount" label="实付金额" width="120" fixed="right" /> <!-- <el-table-column property="orderAmount" label="实付金额" width="120" fixed="right" /> -->
</el-table> </el-table>
</el-card> </el-card>
<!-- 服务信息 End --> <!-- 服务信息 End -->

4
src/views/order/lists/index.vue
View File

@ -95,9 +95,9 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实付金额" min-width="100"> <!-- <el-table-column label="实付金额" min-width="100">
<template #default="scope">¥{{ scope.row.orderAmount }}</template> <template #default="scope">¥{{ scope.row.orderAmount }}</template>
</el-table-column> </el-table-column> -->
<el-table-column label="预约日期" min-width="160"> <el-table-column label="预约日期" min-width="160">
<template #default="scope"> <template #default="scope">
{{ scope.row.appointTime }} {{ scope.row.weekDay }} {{ scope.row.appointTimeStartStr }}-{{ scope.row.appointTimeEndStr }} {{ scope.row.appointTime }} {{ scope.row.weekDay }} {{ scope.row.appointTimeStartStr }}-{{ scope.row.appointTimeEndStr }}

3
src/views/setting/payment/admin/index.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="/favicon.ico" /> <link rel="icon" href="/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>粤好生活-后台管理系统</title> <title>思缘生活-后台管理系统</title>
<style> <style>
* { * {
margin: 0; margin: 0;
@ -40,7 +40,6 @@
} }
@keyframes loading-dash { @keyframes loading-dash {
0% { 0% {
stroke-dasharray: 90, 150; stroke-dasharray: 90, 150;
stroke-dashoffset: -40px; stroke-dashoffset: -40px;