huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合并

zhangrenyuan/feature-20251104133449-现金管理二期
zhangrenyuan 3 weeks ago
parent
3753f29cb8 b36f54f723
commit
0196ed08b7
20 changed files with 83 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      .env.development
  2. 2
      src/views/audit/bean/beanAudit.vue
  3. 2
      src/views/audit/gold/rechargeAudit.vue
  4. 2
      src/views/audit/gold/refundAudit.vue
  5. 2
      src/views/channelManage/cart/cart.vue
  6. 26
      src/views/channelManage/fans/fans.vue
  7. 27
      src/views/channelManage/reward/reward.vue
  8. 4
      src/views/consume/gold/coinConsumeDetail.vue
  9. 2
      src/views/history/newHistory.vue
  10. 2
      src/views/history/oldHistory.vue
  11. 2
      src/views/managerecharge/rate.vue
  12. 2
      src/views/permissions/rolePermission.vue
  13. 2
      src/views/permissions/userPermission.vue
  14. 2
      src/views/recharge/bean/beanOnlineRecharge.vue
  15. 2
      src/views/recharge/bean/beanSystemRecharge.vue
  16. 4
      src/views/recharge/gold/coinRechargeDetail.vue
  17. 4
      src/views/refund/gold/coinRefundDetail.vue
  18. 2
      src/views/usergold/bean/userbean.vue
  19. 4
      src/views/usergold/gold/clientCountBalance.vue
  20. 4
      src/views/usergold/gold/clientCountDetail.vue

20
.env.development
View File

@ -0,0 +1,20 @@
VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# 测试环境
# VITE_API_BASE='http://54.255.212.181:10704/'
# 正式环境
# VITE_API_BASE='http://54.255.212.181:10705/'
VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# sunjiabei
# VITE_API_BASE='http://192.168.9.28:8081/'
# VITE_API_BASE='http://192.168.5.92:8081/'
# 张勇
# VITE_API_BASE='http://192.168.3.83:8081/'
# 本地
# VITE_API_BASE='http://localhost:8081/'
# 孙加倍
# VITE_API_BASE='http://192.168.40.12:8081'
# 黄其振
# VITE_API_BASE='http://192.168.40.8:8081'
# Lijianlin
# VITE_API_BASE='http://192.168.9.41:8081/'
# VITE_API_BASE='http://localhost:8081/'

2
src/views/audit/bean/beanAudit.vue
View File

@ -59,7 +59,7 @@
免费金豆：{{ format3(stats.freeBean) }}金豆
</div>
<el-table :data="tableData" height="55vh" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
<el-table :data="tableData" height="65vh" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80">
<template #default="scope">
{{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}

2
src/views/audit/gold/rechargeAudit.vue
View File

@ -85,7 +85,7 @@
免费金币：{{ format3(stats.freeGolds.toFixed(2)) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
</div>
<el-table :data="tableData" style="width: 82vw;height:54vh" @sort-change="handleSortChange"
<el-table :data="tableData" style="width: 82vw;height:61vh" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope">

2
src/views/audit/gold/refundAudit.vue
View File

@ -74,7 +74,7 @@
任务金币：{{ format3(stats.taskGolds.toFixed(2)) }}金币
</div>
<el-table :data="tableData" style="height:54vh;width:82vw" @sort-change="handleSortChange"
<el-table :data="tableData" style="height:61vh;width:82vw" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="60" />
<el-table-column prop="name" label="姓名" width="120" show-overflow-tooltip />

2
src/views/channelManage/cart/cart.vue
View File

@ -529,7 +529,7 @@ const getTagText = (state) => {
免费金豆数：{{ format3(Math.abs(freeBean)) }}
</div>
<div style="overflow-y: auto">
<el-table :data="tableData" style="width: 82vw" height="65vh" @sort-change="handleSortChange"
<el-table :data="tableData" style="width: 82vw" height="64vh" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="110px" fixed="left">
<template #default="scope">

26
src/views/channelManage/fans/fans.vue
View File

@ -1,9 +1,21 @@
<script setup>
import { computed, onMounted, ref } from 'vue'
import { computed, onMounted, ref, watch } from 'vue'
import { dayjs, ElMessage } from 'element-plus'
import request from '@/util/http.js'
import API from '@/util/http.js'
import moment from 'moment'
import { useAdminStore } from "@/store/index.js";
import { storeToRefs } from "pinia";
const adminStore = useAdminStore();
const { flag } = storeToRefs(adminStore);
// 监听全局flag状态变化
watch(flag, (newFlag, oldFlag) => {
// 当flag状态改变时，重新发送请求
if (newFlag !== oldFlag) {
ConsumeSelectBy()
}
})
// 之后整理一下
/*
@ -183,7 +195,8 @@ const ConsumeSelectBy = async function (val) {
startTime: beanConsumeFan.value.startTime || '',
endTime: beanConsumeFan.value.endTime || '',
sortField: beanConsumeFan.value.sortField || 'consumeTime',
sortOrder: beanConsumeFan.value.sortOrder || 'desc'
sortOrder: beanConsumeFan.value.sortOrder || 'desc',
flag: flag.value
}
}
})
@ -201,7 +214,7 @@ const ConsumeSelectBy = async function (val) {
payType: 7, // 固定传入 payType 值 7
beanConsumeFan: {
...beanConsumeFan.value,
flag: flag.value
}
};
// 发送 POST 请求获取合计数
@ -262,6 +275,8 @@ const reset = function () {
getTime.value = {}
activeTimeRange.value = '' // 清除激活状态
// 重置页码
getObj.value.pageNum = 1
// 点完重置后，重新请求数据
ConsumeSelectBy()
@ -516,7 +531,7 @@ const getTagText = (state) => {
免费金豆数：{{ format3(Math.abs(freeBean)) }}
</div>
<div style="overflow-y: auto">
<el-table :data="tableData" style="width: 82vw" height="68vh" @sort-change="handleSortChange"
<el-table :data="tableData" style="width: 82vw" height="69vh" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">
@ -545,7 +560,7 @@ const getTagText = (state) => {
<!-- 分页 -->
<div class="pagination">
<el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
<el-pagination background :current-page="getObj.pageNum" :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination>
</div>
@ -593,7 +608,6 @@ const getTagText = (state) => {
// 表单的卡片样式
.card2 {
background: #E7F4FD;
height: 81vh;
}
// 新币总数等等

27
src/views/channelManage/reward/reward.vue
View File

@ -1,9 +1,22 @@
<script setup>
import { computed, onMounted, ref } from 'vue'
import { computed, onMounted, ref, watch } from 'vue'
import { dayjs, ElMessage } from 'element-plus'
import request from '@/util/http.js'
import API from '@/util/http.js'
import moment from 'moment'
import { useAdminStore } from "@/store/index.js";
import { storeToRefs } from "pinia";
const adminStore = useAdminStore();
const { flag } = storeToRefs(adminStore);
// 监听全局flag状态变化
watch(flag, (newFlag, oldFlag) => {
// 当flag状态改变时，重新发送请求
if (newFlag !== oldFlag) {
selectLiveBy()
}
})
// 之后整理一下
/*
@ -223,7 +236,8 @@ const selectLiveBy = async function (val) {
startTime: beanConsumeLive.value.startTime || '',
endTime: beanConsumeLive.value.endTime || '',
sortField: beanConsumeLive.value.sortField || 'consumeTime',
sortOrder: beanConsumeLive.value.sortOrder || 'desc'
sortOrder: beanConsumeLive.value.sortOrder || 'desc',
flag: flag.value
}
}
})
@ -239,7 +253,7 @@ const selectLiveBy = async function (val) {
payType: 1, // 固定传入 payType 值 1 是直播
beanConsumeLive: {
...beanConsumeLive.value,
flag: flag.value
}
};
@ -296,6 +310,8 @@ const reset = function () {
getTime.value = {}
activeTimeRange.value = '' // 清除激活状态
// 重置页码
getObj.value.pageNum = 1
// 点完重置后，重新请求数据
selectLiveBy()
@ -561,7 +577,7 @@ const getTagText = (state) => {
免费金豆数：{{ format3(Math.abs(freeBean)) }}
</div>
<div style="overflow-y: auto">
<el-table :data="tableData" style="width: 82vw" height="68vh" @sort-change="handleSortChange"
<el-table :data="tableData" style="width: 82vw" height="69vh" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">
@ -590,7 +606,7 @@ const getTagText = (state) => {
<el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px" />
</el-table>
</div>
<el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]" style="margin-top: 20px;"
<el-pagination background :current-page="getObj.pageNum" :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]" style="margin-top: 20px;"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination>
</el-card>
@ -637,7 +653,6 @@ const getTagText = (state) => {
// 表单的卡片样式
.card2 {
background: #E7F4FD;
height: 81vh;
}
// 新币总数等等

4
src/views/consume/gold/coinConsumeDetail.vue
View File

@ -648,8 +648,8 @@ const getMarket = async function () {
免费金币：{{ format3(Math.abs(freeGolds)) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币：{{ format3(Math.abs(taskGolds)) }}
</div>
<div style="height: 58vh;">
<el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange"
<div style="height: 65vh;">
<el-table :data="tableData" style="height: 65vh" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">

2
src/views/history/newHistory.vue
View File

@ -17,7 +17,7 @@
</el-card>
<el-card class="card2" style="margin-top:10px" v-show="tableData.length > 0">
<el-table :data="tableData" style="width: 82vw;height:60vh">
<el-table :data="tableData" style="width: 82vw;height:74vh">
<el-table-column type="index" label="序号" width="100" header-align="center" align="center">
<template #default="scope">
{{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}

2
src/views/history/oldHistory.vue
View File

@ -17,7 +17,7 @@
</el-card>
<el-card class="card2" style="margin-top:10px" v-show="tableData.length > 0">
<el-table :data="tableData" style="width: 82vw;height:60vh">
<el-table :data="tableData" style="width: 82vw;height:74vh">
<el-table-column type="index" label="序号" width="100" header-align="center" align="center">
<template #default="scope">
{{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}

2
src/views/managerecharge/rate.vue
View File

@ -256,7 +256,7 @@ onMounted(async function () {
</script>
<template>
<el-card class="card2" style="width:82vw;height:85vh" v-if="hasrateShow">
<el-card class="card2" style="width:82vw;height:92vh" v-if="hasrateShow">
<el-table :data="tableData" v-if="(tableData.flag = 1)">
<el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope">

2
src/views/permissions/rolePermission.vue
View File

@ -657,7 +657,7 @@ onMounted(async function () {
v-if="canAdd">新增角色</el-button>
</div>
<div>
<el-table :data="roleData" style="width: 82vw;height:62.3vh" show-overflow-tooltip
<el-table :data="roleData" style="width: 82vw;height:71.3vh" show-overflow-tooltip
:row-style="{ height: '56px' }">
<el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope">

2
src/views/permissions/userPermission.vue
View File

@ -949,7 +949,7 @@ onMounted(async function () {
</div>
<div>
<el-table :data="tableData" style="width: 82vw;height:63.3vh" show-overflow-tooltip
<el-table :data="tableData" style="width: 82vw;height:71.3vh" show-overflow-tooltip
>
<el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope">

2
src/views/recharge/bean/beanOnlineRecharge.vue
View File

@ -411,7 +411,7 @@ onMounted(async function () {
</div>
<!-- 设置表格容器的高度和滚动样式 -->
<div>
<el-table :data="tableData" style="width:80vw;" height="60vh" @sort-change="handleSortChange"
<el-table :data="tableData" style="width:80vw;" height="65vh" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">

2
src/views/recharge/bean/beanSystemRecharge.vue
View File

@ -404,7 +404,7 @@ onMounted(async function () {
免费金豆数：{{ format3(freeBean) }}
</div>
<div>
<el-table :data="tableData" style="width: 82vw;height:60vh;" @sort-change="handleSortChange"
<el-table :data="tableData" style="width: 82vw;height:65vh;" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">

4
src/views/recharge/gold/coinRechargeDetail.vue
View File

@ -664,8 +664,8 @@ const getTagText = (state) => {
免费金币：{{ format3(freeGolds) }}金币
</div>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 60vh;">
<el-table :data="tableData" height="60vh" @sort-change="handleSortChange">
<div style="height: 66vh;">
<el-table :data="tableData" height="66vh" @sort-change="handleSortChange">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">
<span>{{

4
src/views/refund/gold/coinRefundDetail.vue
View File

@ -578,8 +578,8 @@ const getMarket = async function () {
任务金币：{{ format3(Math.abs(taskGolds).toFixed(2)) }}
</div>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 58vh; ">
<el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange"
<div style="height: 65vh; ">
<el-table :data="tableData" style="height: 65vh" @sort-change="handleSortChange"
:row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">

2
src/views/usergold/bean/userbean.vue
View File

@ -20,7 +20,7 @@
免费金豆数：{{ format3(stats.freeBean) }}金豆&nbsp;&nbsp;&nbsp;&nbsp;
消费金豆总数：{{ format3(stats.consumeSum) }}金豆&nbsp;&nbsp;&nbsp;&nbsp;
</div>
<el-table :data="tableData" height="65vh" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
<el-table :data="tableData" height="73vh" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">
<span>{{

4
src/views/usergold/gold/clientCountBalance.vue
View File

@ -421,8 +421,8 @@ const format3 = (num) => {
任务金币：{{ format3(taskGold || 0) }}
</div>
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 60vh; overflow-y: auto">
<el-table :data="tableData" @cellClick="cellClick" style="width: 82vw; height:60vh"
<div style="height: 69vh; overflow-y: auto">
<el-table :data="tableData" @cellClick="cellClick" style="width: 82vw; height:69vh"
@sort-change="handleSortChange" :row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope">

4
src/views/usergold/gold/clientCountDetail.vue
View File

@ -545,8 +545,8 @@ const format3 = (num) => {
任务金币：{{ format3(totalTaskGold || 0) }}&nbsp;&nbsp;
<a style="color:#b1b1b1; font-size: small;">当前合计仅显示筛选范围内的金币净变化（充值总额 - 消费总额 + 退款总额）</a>
</div>
<div style="height: 58vh; ">
<el-table :data="tableData" style="height: 57vh" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
<div style="height: 65vh; ">
<el-table :data="tableData" style="height: 65vh" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="80px" fixed="left">
<template #default="scope">
<span>{{

Write Preview
Loading…
Cancel
Save