diff --git a/.env.development b/.env.development index e9dfee0..410ce99 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ - VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' +VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' # 测试环境 # VITE_API_BASE='http://54.255.212.181:10704/' # 正式环境 @@ -13,4 +13,4 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # 本地 #VITE_API_BASE='http://localhost:8081/' # sunjiabei -# VITE_API_BASE='http://192.168.1.70:8081/' \ No newline at end of file +#VITE_API_BASE='http://192.168.1.50:8081/' \ No newline at end of file diff --git a/src/assets/SvgIcons/背景.svg b/src/assets/SvgIcons/背景.svg new file mode 100644 index 0000000..b3e567a --- /dev/null +++ b/src/assets/SvgIcons/背景.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/收款明细撤回背景.png b/src/assets/收款明细撤回背景.png new file mode 100644 index 0000000..8f9497f Binary files /dev/null and b/src/assets/收款明细撤回背景.png differ diff --git a/src/components/workspace/GoldGraph.vue b/src/components/workspace/GoldGraph.vue index c57d6b8..6ab154b 100644 --- a/src/components/workspace/GoldGraph.vue +++ b/src/components/workspace/GoldGraph.vue @@ -51,7 +51,7 @@
金币{{ activeTab === 'recharge' ? '充值' : '消费' }}排名
- + @@ -770,16 +770,14 @@ onUnmounted(() => { .card-select { :deep(.el-select__wrapper) { background-color: #E7F4FD !important; - // :hover { - // background-color: red !important; - // } box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.25) !important; border: none !important; } - :deep(.el-select-dropdown__item.selected) { - // :hover { background-color: red !important; } - background: red !important; + :deep(.el-select-dropdown) { + background-color: #E7F4FD !important; + box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.25) !important; + border: none !important; } } @@ -806,13 +804,32 @@ onUnmounted(() => { :deep(.el-table__body .el-table__cell) { border-bottom: 1px solid #BBC0C9 !important; } + +} +/* select 列表项 初始颜色 */ +.el-select-dropdown__item { + background: #ffffff; +} +/* select hover状态*/ +.el-select-dropdown__item:hover { + border-radius: 8px; + margin-left: 2px; + margin-right: 2px; + background: #E5EBFE; + height: 32px; +} + +/* 选中状态(针对 is-selected 类) */ +.el-select-dropdown__item.is-selected { + color: #2549E0; + border-radius: 8px; } /* tabs的样式 */ /* 选中 tab 的文字颜色 */ :deep(.el-tabs__item.is-active) { color: #2741DE !important; - font-size: 18px; + font-size: 18px; font-weight: bold; } diff --git a/src/components/workspace/GoldManagement.vue b/src/components/workspace/GoldManagement.vue index c4663ff..3eb8cf9 100644 --- a/src/components/workspace/GoldManagement.vue +++ b/src/components/workspace/GoldManagement.vue @@ -63,7 +63,7 @@
-
全年累计充值金币数{{ yearlyRecharge / 100 }}
+
全年累计充值金币数:{{ yearlyRecharge / 100 }}
折合新币累计金额
@@ -85,7 +85,7 @@
-
全年累计消费金币数{{ yearlyReduce / 100 }}
+
全年累计消费金币数:{{ yearlyReduce / 100 }}
@@ -98,8 +98,8 @@
-
-
全年累计充值人头数{{ yearlyRechargeNum }}
+
+
全年累计充值人头数:{{ yearlyRechargeNum }}
diff --git a/src/css/btn.css b/src/css/btn.css new file mode 100644 index 0000000..ee9dfc7 --- /dev/null +++ b/src/css/btn.css @@ -0,0 +1,73 @@ +/*各个页面的按钮激活*/ + +/*使用示例 +import '@/css/btn.css'; + + +充值审核 + +*/ + + +/* 默认按钮样式 */ +.no-active-btn { + background-color: #E5EBFE; /* 未激活背景色 */ + color: #666; /* 未激活文字色 */ + /* 确保激活状态下 hover 也不变化 */ + &:hover { + background-color: #E5EBFE !important; /* 保持默认背景色 */ + color: #666 !important; /* 保持默认文字色 */ + border-color: transparent; /* 若有边框,保持默认 */ + } +} + +/* 激活状态样式 */ +.active-btn { + background-color: #2741DE; /* 激活背景色 */ + color: white; /* 激活文字色 */ + /* 确保激活状态下 hover 也不变化 */ + &:hover { + background-color: #2741DE !important; + color: white !important; + border-color: transparent; + } +} +/** ----------------------------------**/ +/** 通过驳回按钮 使用的是el-link **/ +.pass-btn { + color: #2741DE; + margin-right: 5px; +} +.reject-btn { + color: #2741DE; + margin-left: 5px; +} + +/* 清除hover状态的样式变化 */ +.pass-btn:hover, +.reject-btn:hover { + color: #2741DE; /* 保持与默认状态相同的颜色 */ +} +/** ----------------------------------**/ + +/** ----------------------------------**/ +/** 编辑 按钮 使用的是el-link **/ +.edit-btn { + color: #2741DE; +} +.edit-btn:hover{ + color: #2741DE; /* 保持与默认状态相同的颜色 */ +} +/** ----------------------------------**/ + + +/** ----------------------------------**/ +.el-pagination .el-pager li.is-active { + background-color: #2741DE !important; + color: #FFFFFF !important; +} diff --git a/src/main.ts b/src/main.ts index fc0b6ca..4d2855c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,4 +1,4 @@ -import { createApp } from 'vue' +import {createApp} from 'vue' import App from './App.vue' import router from './router' import ElementPlus from 'element-plus' @@ -7,15 +7,17 @@ import 'element-plus/dist/index.css' import * as ElementPlusIconsVue from '@element-plus/icons-vue' import './assets/css/common.css' // 引入公共CSS文件 import JsonExcel from 'vue-json-excel' -import { createPinia } from 'pinia' +import {createPinia} from 'pinia' import VxeUI from 'vxe-pc-ui' import 'vxe-pc-ui/lib/style.css' import VxeUITable from 'vxe-table' import 'vxe-table/lib/style.css' // 修正导入路径 -import { useAdminStore } from './store' +import {useAdminStore} from './store' import request from "@/util/request"; import "./global.css"; +import '@/css/btn.css'; + const app = createApp(App) const pinia = createPinia() diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue index dfadf4e..780b104 100644 --- a/src/views/audit/bean/beanAudit.vue +++ b/src/views/audit/bean/beanAudit.vue @@ -4,27 +4,28 @@
精网号: - +
所属地区: + style="width: 12vw" @change="handleMarketChange"/>
- 提交时间: - 审核时间: + 提交时间: + 审核时间: - - - 近7天 + end-placeholder="结束时间" class="selectContent" style="width: 25vw;margin-right:1vw" + @change="handleDatePickerChange" + :default-time="defaultTime"/> + + +
重置 @@ -76,15 +77,15 @@ {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }} - - - - - - - - - + + + + + + + + + + prop="operation" label="操作" width="400px"> + v-model:page-size="pagination.pageSize" layout="total, sizes, prev, pager, next, jumper" + :total="stats.num" + @size-change="handlePageSizeChange" @current-change="handleCurrentChange"> - + - - \ No newline at end of file diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue index 9370611..00d4381 100644 --- a/src/views/audit/gold/rechargeAudit.vue +++ b/src/views/audit/gold/rechargeAudit.vue @@ -48,32 +48,10 @@ -
- - 待审核 - - - 已通过 - - - 已驳回 - -
+ + + +
@@ -83,6 +61,7 @@ 永久金币:{{ format3(stats.permanentGolds.toFixed(2)) }}金币     免费金币:{{ format3(stats.freeGolds.toFixed(2)) }}金币    
+
@@ -146,9 +125,10 @@
- + 驳回 - +
@@ -594,7 +576,7 @@ const handleApprove = async (row) => { console.error('审核通过失败', error) ElMessage.error('操作失败') } - + } const showRejectDialog = (row) => { diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue index 2ef3144..11ed901 100644 --- a/src/views/audit/gold/refundAudit.vue +++ b/src/views/audit/gold/refundAudit.vue @@ -4,7 +4,7 @@
精网号: - +
商品名称: @@ -15,14 +15,14 @@
退款类型: - - + +
所属地区: + placeholder="请选择所属地区" clearable @change="handleMarketChange"/>
@@ -33,8 +33,8 @@ {{ activeName === 'wait' ? '提交时间:' : '审核时间:' }} + start-placeholder="起始时间" end-placeholder="结束时间" style="margin-right:1vw;width:25vw" + @change="handleDatePickerChange" :default-time="defaultTime" :disabled-date="disabledDate"/>
@@ -78,7 +78,8 @@
- 退款总金币数:{{ format3((stats.permanentGolds + stats.freeGolds + stats.taskGolds).toFixed(2)) + 退款总金币数:{{ + format3((stats.permanentGolds + stats.freeGolds + stats.taskGolds).toFixed(2)) }}金币     永久金币:{{ format3(stats.permanentGolds.toFixed(2)) }}金币     免费金币:{{ format3(stats.freeGolds.toFixed(2)) }}金币     @@ -86,19 +87,19 @@
- - - - - + + + + + - + - + - - + + - + show-overflow-tooltip/> + @@ -139,15 +140,17 @@ {{ row.auditTime ? moment(row.auditTime).format('YYYY-MM-DD HH:mm:ss') : '--' }} - + + layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" + @size-change="handlePageSizeChange" + @current-change="handleCurrentChange"> + show-word-limit/>