Browse Source

Merge remote-tracking branch 'origin/milestone-20250711-金币前端二期' into zhangyong/feature-20250716164232-金币前端

zhangrenyuan/feature-20250714163943-金币前端二期
zhangyongQINGHU 2 weeks ago
parent
commit
aa6031c305
  1. 18
      src/views/audit/rechargeAudit.vue
  2. 24
      src/views/audit/refundAudit.vue
  3. 24
      src/views/consume/coinConsumeDetail.vue
  4. 23
      src/views/recharge/coinRechargeDetail.vue
  5. 31
      src/views/refund/coinRefundDetail.vue
  6. 10
      src/views/usergold/clientCountBalance.vue
  7. 29
      src/views/usergold/clientCountDetail.vue
  8. 24
      src/views/workspace/index.vue

18
src/views/audit/rechargeAudit.vue

@ -35,10 +35,10 @@
<div class="time-group">
<el-text size="large" style="width: 80px">充值时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" style="width: 400px"/>
<el-button @click="getToday()" style="margin-left: 10px"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px"> 近7天</el-button>
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
<el-button @click="resetSearch" type="success">重置</el-button>
<el-button type="primary" @click="handleSearch">查询</el-button>
</div>
@ -185,6 +185,12 @@ const formatTime = (val) => val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
const adminData = ref({})
//
const tableData = ref([])
//
const activeTimeRange = ref('')
//
const handleDatePickerChange = () => {
activeTimeRange.value = ''
}
//
const rechargeAudit = ref({
@ -352,6 +358,7 @@ const resetSearch = function () {
auditStatus: rechargeAudit.value.auditStatus
}
getTime.value = []
activeTimeRange.value = '' //
getRecharge()
getStats()
}
@ -371,6 +378,7 @@ const getToday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = 'today' //
getRecharge()
getStats()
}
@ -391,6 +399,7 @@ const getYesterday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = 'yesterday' //
getRecharge()
getStats()
}
@ -410,6 +419,7 @@ const get7Days = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = '7days' //
getRecharge()
getStats()
}

24
src/views/audit/refundAudit.vue

@ -34,10 +34,10 @@
<div class="time-group">
<el-text size="large" style="width: 80px">提交时间</el-text>
<el-date-picker v-model="dateRange" type="datetimerange" range-separator="" start-placeholder="开始时间"
end-placeholder="结束时间" style="width: 400px" />
<el-button @click="getToday()" style="margin-left: 10px"></el-button>
<el-button @click="getYesterday()" style="margin-left: 10px"></el-button>
<el-button @click="get7Days()" style="margin-left: 10px">近7天</el-button>
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
<el-button type="success" @click="resetSearch">重置</el-button>
<el-button type="primary" @click="handleSearch">查询</el-button>
</div>
@ -154,6 +154,13 @@ import { ElMessage } from 'element-plus'
import API from '@/util/http'
import moment from 'moment'
//
const activeTimeRange = ref('')
//
const handleDatePickerChange = () => {
activeTimeRange.value = ''
}
const scopeValue = ref(null) //
const rejectDialogVisible = ref(false) //
const rejectReason = ref('') //
@ -174,6 +181,7 @@ const searchForm = ref({
auditStatus: '0'
})
const checkTab = ref('pending') // STATUS012statusInteger
//
const dateRange = ref([])
const pagination = ref({
pageNum: 1,
@ -399,6 +407,7 @@ const resetSearch = function () {
auditStatus:auditStatus
}
dateRange.value = []
activeTimeRange.value = '' //
}
//
@ -408,8 +417,11 @@ const getToday = function () {
const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
dateRange.value = [startTime, endTime]
console.log('dateRange', dateRange.value)
activeTimeRange.value = 'today' //
get()
getStats()
console.log('aaaaaaaaaa这是今天调用')
}
@ -421,6 +433,8 @@ const getYesterday = function () {
const endTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate() + 1)
dateRange.value = [startTime, endTime]
console.log('dateRange', dateRange.value)
activeTimeRange.value = 'yesterday' //
get()
getStats()
console.log('aaaaaaaaaa这是昨天调用')
@ -433,6 +447,8 @@ const get7Days = function () {
const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
dateRange.value = [startTime, endTime]
console.log('dateRange', dateRange.value)
activeTimeRange.value = '7days' //
get()
getStats()
console.log('aaaaaaaaaa这是近七天调用')

24
src/views/consume/coinConsumeDetail.vue

@ -35,7 +35,12 @@ const consumeUser = ref({
})
//
const activeTimeRange = ref('')
//
const handleDatePickerChange = () => {
activeTimeRange.value = ''
}
//
const getObj = ref({
pageNum: 1,
@ -267,6 +272,8 @@ const reset = function () {
sortField.value = ''
sortOrder.value = ''
getTime.value = {}
activeTimeRange.value = '' //
//
ConsumeSelectBy()
@ -287,6 +294,8 @@ const getToday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = 'today' //
ConsumeSelectBy()
}
//
@ -305,6 +314,8 @@ const getYesterday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = 'yesterday' //
ConsumeSelectBy()
}
// 7
@ -322,6 +333,8 @@ const get7Days = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = '7days' //
ConsumeSelectBy()
}
//
@ -560,11 +573,10 @@ const getTagText = (state) => {
<div class="head-card-element">
<el-text class="mx-1" size="large">消耗时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间"/>
<el-button style="margin-left: 10px" @click="getToday()">
</el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
<!-- </div>
</el-col>
<el-col :span="3">

23
src/views/recharge/coinRechargeDetail.vue

@ -22,6 +22,13 @@ const getAdminData = async function () {
//
//
const tableData = ref([])
//
const activeTimeRange = ref('')
//
const handleDatePickerChange = () => {
activeTimeRange.value = ''
}
// ===========================================
// recharge
const rechargeUser = ref({
@ -250,6 +257,8 @@ const reset = function () {
delete sortField.value
delete sortOrder.value
getTime.value = {}
activeTimeRange.value = '' //
get()
}
//
@ -267,6 +276,8 @@ const getToday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = 'today' //
get()
}
const handlePageSizeChange = function (val) {
@ -293,6 +304,8 @@ const getYesterday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = 'yesterday' //
get()
}
// 7
@ -310,6 +323,8 @@ const get7Days = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = '7days' //
get()
}
@ -489,10 +504,10 @@ const getTagText = (state) => {
<div class="head-card-element">
<el-text class="mx-1" size="large">充值时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" />
<el-button style="margin-left: 10px" @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>
<el-button type="primary" @click="exportExcel()">导出Excel</el-button>

31
src/views/refund/coinRefundDetail.vue

@ -27,6 +27,12 @@ const trimJwCode = () => {
//
//
//
const activeTimeRange = ref('')
//
const handleDatePickerChange = () => {
activeTimeRange.value = ''
}
const adminData = ref({})
const getAdminData = async function () {
try {
@ -182,6 +188,8 @@ const reset = function () {
sortField.value = ''
sortOrder.value = ''
getTime.value = {}
activeTimeRange.value = '' //
getSelectBy()
}
//
@ -199,6 +207,8 @@ const getToday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = 'today' //
getSelectBy()
}
//
@ -217,6 +227,8 @@ const getYesterday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = 'yesterday' //
getSelectBy()
}
// 7
@ -234,6 +246,8 @@ const get7Days = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
activeTimeRange.value = '7days' //
getSelectBy()
}
@ -541,19 +555,10 @@ const getTagText = (state) => {
<el-col :span="24">
<div class="head-card-element">
<el-text class="mx-1" >退款时间</el-text>
<el-date-picker
v-model="getTime"
type="datetimerange"
range-separator="至"
start-placeholder="起始时间"
end-placeholder="结束时间"
/>
<el-button style="margin-left: 10px" @click="getToday()"
>
</el-button
>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间" end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>

10
src/views/usergold/clientCountBalance.vue

@ -118,13 +118,13 @@ const get = async function (val) {
tableData.value = result.data.list
total.value = result.data.total
console.log('兄弟你是什么 user', user.value)
//
const resultGoldTotal = await API({
url: '/goldDetail/goldTotal',
data: {
...getAllObj.value,
user: {...user.value}
jwcode: user.value.jwcode,
markets: user.value.markets
}
})
// result.data.list
@ -334,11 +334,13 @@ const getTagText = (state) => {
</div>
<div class="head-card-element">
<el-text class="mx-1" size="large">所属地区</el-text>
<el-select v-model="user.market" placeholder="请选择所属地区" style="width: 180px" clearable>
<el-select v-model="user.markets" placeholder="请选择所属地区" style="width: 180px" clearable multiple>
<el-option v-for="item in market" :key="item.value" :label="item.label" :value="item.value"/>
</el-select>
</div>
<el-button type="primary" @click="search()">查询</el-button>
<el-button @click="reset" type="success">重置</el-button>
<el-button type="primary" @click="exportExcel()">导出Excel</el-button>
<el-button type="primary" @click="openExportList">查看导出列表</el-button>
</div>

29
src/views/usergold/clientCountDetail.vue

@ -9,6 +9,13 @@ import { writeFile, utils } from 'xlsx'
import request from "@/util/request.js";
//
const activeTimeRange = ref('')
//
const handleDatePickerChange = () => {
activeTimeRange.value = ''
}
// ref
const totalPermanentGold = ref(0)
const totalFreeGold = ref(0)
@ -230,11 +237,13 @@ const reset = function () {
delete goldDetail.value.type
delete goldDetail.value.startTime
delete goldDetail.value.endTime
delete goldDetail.value.market
delete goldDetail.value.markets
delete sortField.value
delete sortOrder.value
getTime.value = []
delete goldDetail.value.payPlatform
activeTimeRange.value = '' //
search()
}
@ -252,6 +261,8 @@ const getToday = function () {
const startTime = today.startOf('day').toDate()
const endTime = today.add(1, 'days').startOf('day').toDate()
getTime.value = [startTime, endTime]
activeTimeRange.value = 'today' //
search()
}
@ -262,6 +273,8 @@ const getYesterday = function () {
const startTime = yesterday.startOf('day').toDate()
const endTime = today.startOf('day').toDate()
getTime.value = [startTime, endTime]
activeTimeRange.value = 'yesterday' //
search()
}
@ -270,6 +283,8 @@ const get7Days = function () {
const startTime = moment().subtract(6, 'day').startOf('day').toDate()
const endTime = moment().add(1, 'days').startOf('day').toDate()
getTime.value = [startTime, endTime]
activeTimeRange.value = '7days' //
search()
}
@ -459,8 +474,8 @@ const getTagText = (state) => {
<el-col :span="6">
<div class="head-card-element">
<el-text class="mx-1" size="large">所属地区</el-text>
<el-select v-model="goldDetail.market" placeholder="请选择所属地区" style="width: 180px" clearable
:loading="isLoadingArea">
<el-select v-model="goldDetail.markets" placeholder="请选择所属地区" style="width: 180px" clearable multiple
:loading="isLoadingArea">
<el-option v-for="item in market" :key="item.value || item" :label="item.label || item"
:value="item.value || item" />
</el-select>
@ -471,10 +486,10 @@ const getTagText = (state) => {
<div class="head-card-element">
<el-text class="mx-1" size="large">更新时间</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" style="margin-right: 50px" />
<el-button @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
<el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>

24
src/views/workspace/index.vue

@ -156,11 +156,11 @@
activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100
}}&nbsp;&nbsp;&nbsp;&nbsp;
</div>
<div>
<el-button @click="getToday()" label="day" style="margin-left:250px">今日</el-button>
<el-button @click="getWeek()" label="week">本周</el-button>
<el-button @click="getMonth()" label="month">本月</el-button>
<el-button @click="getYear()" label="year">本年</el-button>
<div @change="handleDatePickerChange">
<el-button @click="getToday()" label="day" style="margin-left:250px" :type="activeTimeRange === 'today' ? 'primary' : ''">今日</el-button>
<el-button @click="getWeek()" label="week" :type="activeTimeRange === 'week' ? 'primary' : ''">本周</el-button>
<el-button @click="getMonth()" label="month" :type="activeTimeRange === 'month' ? 'primary' : ''">本月</el-button>
<el-button @click="getYear()" label="year" :type="activeTimeRange === 'year' ? 'primary' : ''">本年</el-button>
</div>
<el-date-picker v-model="dateRange" type="datetimerange" range-separator="" start-placeholder="开始时间"
end-placeholder="结束时间" style="margin-left:10px" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
@ -216,6 +216,13 @@ import utc from 'dayjs-plugin-utc'
import {ArrowDownBold, ArrowUpBold, SemiSelect} from '@element-plus/icons-vue'
dayjs.extend(utc)
//
const activeTimeRange = ref('')
//
const handleDatePickerChange = () => {
activeTimeRange.value = ''
}
//
const markets = ref([])
//
@ -275,6 +282,8 @@ const getToday = function () {
const endTime = today.add(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)
activeTimeRange.value = 'today' //
getChartData()
}
//
@ -284,6 +293,8 @@ const getWeek = function () {
const endTime = today.add(1, 'week').startOf('week').add(1, 'day').format('YYYY-MM-DD HH:mm:ss')
dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)
activeTimeRange.value = 'week' //
getChartData()
}
//
@ -293,6 +304,8 @@ const getMonth = function () {
const endTime = today.add(1, 'month').startOf('month').format('YYYY-MM-DD HH:mm:ss')
dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)
activeTimeRange.value = 'month' //
getChartData()
}
//
@ -302,6 +315,7 @@ const getYear = function () {
const endTime = today.add(1, 'year').startOf('year').format('YYYY-MM-DD HH:mm:ss')
dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)
activeTimeRange.value = 'year' //
getChartData()
}

Loading…
Cancel
Save