angelo
/
web-zk-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' of http://47.94.45.65:3000/angelo/web-zk-admin into online

This commit is contained in:
woody 2025-10-28 17:07:57 +08:00
parent a7c221daba 56be5a5784
commit 2e94b8f42a
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/dashboard/dashboard.vue
View File

@ -21,36 +21,36 @@
<div class="dashboard-card-label">当月新增会员</div>
<div class="dashboard-card-value">{{ memberSummary.memberMonth || 0 }}</div>
</div>
<!-- <div v-if="memberSummary.memberMonthLevelList && memberSummary.memberMonthLevelList.length > 0" class="dashboard-card-level-list">
<div v-if="memberSummary.memberMonthLevelList && memberSummary.memberMonthLevelList.length > 0" class="dashboard-card-level-list">
<div v-for="level in memberSummary.memberMonthLevelList" :key="`month-${level.gradeName}`" class="dashboard-card-level-item">
<span class="level-name">{{ level.gradeName }}:</span>
<span class="level-count">{{ level.memberTotal }}人</span>
</div>
</div> -->
</div>
</div>
<div class="dashboard-card dashboard-card--member dashboard-card--yesterday-member">
<div class="dashboard-card-header">
<div class="dashboard-card-label">昨日新增会员</div>
<div class="dashboard-card-value">{{ memberSummary.memberYesterday || 0 }}</div>
</div>
<!-- <div v-if="memberSummary.memberYesterdayLevelList && memberSummary.memberYesterdayLevelList.length > 0" class="dashboard-card-level-list">
<div v-if="memberSummary.memberYesterdayLevelList && memberSummary.memberYesterdayLevelList.length > 0" class="dashboard-card-level-list">
<div v-for="level in memberSummary.memberYesterdayLevelList" :key="`yesterday-${level.gradeName}`" class="dashboard-card-level-item">
<span class="level-name">{{ level.gradeName }}:</span>
<span class="level-count">{{ level.memberTotal }}人</span>
</div>
</div> -->
</div>
</div>
<div class="dashboard-card dashboard-card--member dashboard-card--today-member">
<div class="dashboard-card-header">
<div class="dashboard-card-label">今日新增会员</div>
<div class="dashboard-card-value">{{ memberSummary.memberToday || 0 }}</div>
</div>
<!-- <div v-if="memberSummary.memberTodayLevelList && memberSummary.memberTodayLevelList.length > 0" class="dashboard-card-level-list">
<div v-if="memberSummary.memberTodayLevelList && memberSummary.memberTodayLevelList.length > 0" class="dashboard-card-level-list">
<div v-for="level in memberSummary.memberTodayLevelList" :key="`today-${level.gradeName}`" class="dashboard-card-level-item">
<span class="level-name">{{ level.gradeName }}:</span>
<span class="level-count">{{ level.memberTotal }}人</span>
</div>
</div> -->
</div>
</div>
</div>
</div>

15
src/views/financial/onlinePayDetails/index.vue
View File

@ -1,9 +1,3 @@
<!--
* @Descripttion: 财务管理 - 在线支付明细
* @version:
* @Author: kBank
* @Date: 2022-10-24 15:45:01
-->
<template>
<div class="page">
<topBar
@ -233,14 +227,14 @@
prop="businessMoney"
:formatter="stateFormat"
:label="'交易金额'"
width="150"
width="130"
/>
<el-table-column
align="center"
prop="payMoney"
:formatter="stateFormat"
label="实际支付金额"
width="150"
width="130"
/>
<el-table-column
@ -274,18 +268,19 @@
align="center"
prop="businessCode"
:label="'单据编号'"
min-width="200"
/>
<el-table-column
align="center"
prop="mainAccountMoney"
label="主账户金额"
width="150"
width="130"
/>
<el-table-column
align="center"
prop="subAccountMoney"
label="子账户金额"
width="150"
width="130"
/>
<el-table-column
align="center"