Compare commits

...

24 Commits
dev ... lhl

Author SHA1 Message Date
lihuilin 423b8964b2 没整合,自己的 3 weeks ago
lihuilin 12411d5c77 跳不了 3 weeks ago
lihuilin d6a4c7ae92 充值类型下拉框失败 3 weeks ago
zry 4ee96e5ee2 合并main到feat/lhl 3 weeks ago
zry d1aaf0d4e8 测试合并branch 'feat/zry' 3 weeks ago
zry c1ff9eaca0 测试新的合并方案 3 weeks ago
zry 08c57ccb87 重做了客户金币明细的导出excel 3 weeks ago
lihuilin 229c13b945 改完今昨近七天 3 weeks ago
zry aca98aa791 新增活动的警告修改 3 weeks ago
zry 26012f376d 延迟的更改与提交(合并) 3 weeks ago
zry 204ec99a95 合并 3 weeks ago
zry 5649b90cf7 已完成的合并 3 weeks ago
zry eaf90724fd 活动页数100删除,工作台 3 weeks ago
lihuilin a117177bbb 0428提测未整合 3 weeks ago
lihuilin 653532717b 三期bug结束 3 weeks ago
zry 6736959de2 按钮失效bug修复;商品对应接口改正... 3 weeks ago
zry 83a81b0eca .env.production的更改 3 weeks ago
zry 21fde0c627 1.上正式地址,2.修复金豆明细地区无法更新金豆总额的bug 3 weeks ago
zry 74b52628e0 1.修复了在金豆明细地区搜索条件时的金豆总额更新,2.合并了lhl分支3.上正式环境 3 weeks ago
zry fccafa7087 Merge branch 'lhl' of http://39.101.133.168:8807/yanjiaqing/gold_vue into lhl 3 weeks ago
zry 55cc8c7b81 创建了zry新分支并push代码 3 weeks ago
lihuilin 3ffaf69421 测试正式地址正常 3 weeks ago
lihuilin f454649913 整合完毕 3 weeks ago
lihuilin d9a91abab1 充值审核去空格尝试 3 weeks ago
  1. 6
      gold-system/.env.development
  2. 4
      gold-system/.env.production
  3. 7
      gold-system/.env.test
  4. 6
      gold-system/package-lock.json
  5. 2
      gold-system/src/api/index.js
  6. 2
      gold-system/src/store/area.js
  7. 4
      gold-system/src/util/request.js
  8. 30
      gold-system/src/views/audit/rechargeAudit.vue
  9. 10
      gold-system/src/views/audit/refundAudit.vue
  10. 15
      gold-system/src/views/consume/addConsume.vue
  11. 18
      gold-system/src/views/consume/allConsume.vue
  12. 15
      gold-system/src/views/goldBeen/addGoldenBeen.vue
  13. 39
      gold-system/src/views/goldBeen/goldenBeenBalance.vue
  14. 100
      gold-system/src/views/goldBeen/goldenBeenConsum.vue
  15. 166
      gold-system/src/views/goldBeen/goldenBeenDetail.vue
  16. 101
      gold-system/src/views/goldBeen/onLineDetail.vue
  17. 3
      gold-system/src/views/index.vue
  18. 26
      gold-system/src/views/login.vue
  19. 371
      gold-system/src/views/managerecharge/activity.vue
  20. 111
      gold-system/src/views/managerecharge/rate.vue
  21. 9
      gold-system/src/views/permissions/index.vue
  22. 16
      gold-system/src/views/recharge/addRecharge.vue
  23. 2
      gold-system/src/views/recharge/adminRecharge.vue
  24. 2
      gold-system/src/views/recharge/allRecharge.vue
  25. 16
      gold-system/src/views/refund/addRefund.vue
  26. 2
      gold-system/src/views/refund/allRefund.vue
  27. 704
      gold-system/src/views/usergold/index.vue
  28. 11
      gold-system/src/views/usergoldInfo/index.vue
  29. 2
      gold-system/src/views/workspace/index.vue
  30. 24
      gold-system/stats.html

6
gold-system/.env.development

@ -1 +1,5 @@
VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='http://192.168.8.94:8080/'
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
# VITE_API_BASE='http://54.251.137.151:10704/'
VITE_API_BASE='http://192.168.8.220:8080/'

4
gold-system/.env.production

@ -1 +1,3 @@
VITE_API_BASE='http://54.251.137.151:10702/'
# VITE_API_BASE='http://54.251.137.151:10702/'
VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'

7
gold-system/.env.test

@ -1 +1,6 @@
VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
#VITE_API_BASE='http://54.251.137.151:10704/'
# VITE_API_BASE='http://192.168.8.94:8080/'
# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
VITE_API_BASE='http://192.168.8.220:8080/'

6
gold-system/package-lock.json

@ -4093,9 +4093,8 @@
}, },
"node_modules/moment": { "node_modules/moment": {
"version": "2.30.1", "version": "2.30.1",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/moment/-/moment-2.30.1.tgz",
"resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
"integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
"license": "MIT",
"engines": { "engines": {
"node": "*" "node": "*"
} }
@ -4987,9 +4986,8 @@
}, },
"node_modules/xlsx": { "node_modules/xlsx": {
"version": "0.18.5", "version": "0.18.5",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/xlsx/-/xlsx-0.18.5.tgz",
"resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
"integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==", "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
"license": "Apache-2.0",
"dependencies": { "dependencies": {
"adler-32": "~1.3.0", "adler-32": "~1.3.0",
"cfb": "~1.2.1", "cfb": "~1.2.1",

2
gold-system/src/api/index.js

@ -1,6 +1,6 @@
import { pa } from 'element-plus/es/locales.mjs'; import { pa } from 'element-plus/es/locales.mjs';
import http from '../util/http.js'; import http from '../util/http.js';
// 这个是不知道有啥用
const API={ const API={
post: function(url,data){ post: function(url,data){
return http({url:url,method:'post',data:data}) return http({url:url,method:'post',data:data})

2
gold-system/src/store/area.js

@ -1,5 +1,5 @@
import { defineStore } from 'pinia' import { defineStore } from 'pinia'
// 这个也是不知道有啥用,谁给在index.vue里注了
export const useAreaStore = defineStore('area', { export const useAreaStore = defineStore('area', {
state: () => ({ state: () => ({
currentArea: '全部', currentArea: '全部',

4
gold-system/src/util/request.js

@ -1,11 +1,13 @@
import axios from 'axios' import axios from 'axios'
// 创建axios实例
const service = axios.create({ const service = axios.create({
baseURL: import.meta.env.VITE_API_BASE, baseURL: import.meta.env.VITE_API_BASE,
timeout: 10000, timeout: 10000,
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, },
// 设置默认请求方法为 POST
// 设置请求头,指定请求体的格式为 JSON
// 设置默认请求方法为 POST 这行对应的代码搁哪呢?
}) })
// 请求拦截器 // 请求拦截器

30
gold-system/src/views/audit/rechargeAudit.vue

@ -98,6 +98,10 @@ const trueGold = ref(0)
const trueCount = ref(0) const trueCount = ref(0)
const trueRGold = ref(0) const trueRGold = ref(0)
const trueFGold = ref(0) const trueFGold = ref(0)
//
const formattedTrueGold = computed(() => trueGold.value.toFixed(2))
const formattedTrueRGold = computed(() => trueRGold.value.toFixed(2))
const formattedTrueFGold = computed(() => trueFGold.value.toFixed(2))
// //
const pendingCount = ref(0) const pendingCount = ref(0)
// //
@ -215,6 +219,7 @@ const get = async function (val) {
} }
// //
const search = function () { const search = function () {
trimJwCode();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
get() get()
} }
@ -410,7 +415,7 @@ const pass = function (row) {
passObj.value = row passObj.value = row
passObj.value.adminId = adminData.value.adminId passObj.value.adminId = adminData.value.adminId
passObj.value.auditId = row.auditId passObj.value.auditId = row.auditId
passObj.value.status = 1
// passObj.value.status = 1
passObj.value.rechargeId = row.rechargeId passObj.value.rechargeId = row.rechargeId
passObj.value.detailId = row.detailId passObj.value.detailId = row.detailId
passObj.value.jwcode = row.jwcode passObj.value.jwcode = row.jwcode
@ -424,6 +429,8 @@ const pass = function (row) {
// //
const passConfirm = async function () { const passConfirm = async function () {
try { try {
//
passObj.value.status = 1
console.log('通过对象', passObj.value) console.log('通过对象', passObj.value)
// POST // POST
// passObj.value.flag = 0; // passObj.value.flag = 0;
@ -442,8 +449,12 @@ const passConfirm = async function () {
message: '通过成功!' message: '通过成功!'
}) })
} catch (error) { } catch (error) {
console.log('请求失败', error)
//
console.error('请求失败', error);
//
ElMessage({
type: 'error',
message: '网络请求出错,请检查网络连接!'
});
} }
} }
@ -538,6 +549,13 @@ const handleSortChange = (column) => {
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
get() get()
} }
//
const trimJwCode = () => {
if (rechargeVo.value.jwcode) {
rechargeVo.value.jwcode = rechargeVo.value.jwcode.replace(/\s/g, '');
}
}
</script> </script>
<template> <template>
@ -635,7 +653,7 @@ const handleSortChange = (column) => {
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button @click="reset()" type="success">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</el-col> </el-col>
@ -659,8 +677,8 @@ const handleSortChange = (column) => {
<div> <div>
总条数{{ trueCount }}总金币数{{ 总条数{{ trueCount }}总金币数{{
trueGold
}}金币永久金币{{ trueRGold }}金币免费金币{{ trueFGold }}金币
formattedTrueGold
}}金币永久金币{{ formattedTrueRGold }}金币免费金币{{ formattedTrueFGold }}金币
</div> </div>
</el-tabs> </el-tabs>
<div style="height: 540px; overflow-y: auto"> <div style="height: 540px; overflow-y: auto">

10
gold-system/src/views/audit/refundAudit.vue

@ -181,6 +181,7 @@ const get = async function (val) {
} }
// //
const search = function () { const search = function () {
trimJwCode();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
get() get()
} }
@ -494,6 +495,13 @@ const handleSortChange = (column) => {
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
get() get()
} }
//
const trimJwCode = () => {
if (detail.value.jwcode) {
// 使
detail.value.jwcode = detail.value.jwcode.replace(/\s/g, '');
}
}
</script> </script>
<template> <template>
@ -591,7 +599,7 @@ const handleSortChange = (column) => {
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</el-col> </el-col>

15
gold-system/src/views/consume/addConsume.vue

@ -9,7 +9,12 @@ import API from "../../api/index.js";
import moment from "moment"; import moment from "moment";
import _ from "lodash"; import _ from "lodash";
import request from "@/util/http"; import request from "@/util/http";
//
const trimJwCode = () => {
if (addConsume.value.jwcode) {
addConsume.value.jwcode = addConsume.value.jwcode.replace(/\s/g, '');
}
}
// //
const adminData = ref({}); const adminData = ref({});
const getAdminData = async function () { const getAdminData = async function () {
@ -143,12 +148,13 @@ const user = ref({
firstRechargeTime: "", firstRechargeTime: "",
}); });
const getUser = async function (jwcode) { const getUser = async function (jwcode) {
trimJwCode();
try { try {
// POST // POST
const result = await request({ const result = await request({
url: "/recharge/user", url: "/recharge/user",
data: { data: {
jwcode: jwcode,
jwcode: addConsume.value.jwcode,
area: adminData.value.area, area: adminData.value.area,
}, },
}); });
@ -174,12 +180,13 @@ const getUser = async function (jwcode) {
// //
const userGold = ref({}); const userGold = ref({});
const getUserGold = async function (jwcode) { const getUserGold = async function (jwcode) {
trimJwCode();
try { try {
// POST // POST
const result = await request({ const result = await request({
url: "/recharge/user", url: "/recharge/user",
data: { data: {
jwcode: jwcode,
jwcode: addConsume.value.jwcode,
area: adminData.value.area, area: adminData.value.area,
}, },
}); });
@ -436,7 +443,7 @@ onMounted(async function () {
placeholder="提交人姓名" placeholder="提交人姓名"
/> />
</el-form-item> </el-form-item>
<el-button @click="delteConsume" style="margin-left: 280px">重置</el-button>
<el-button type="success" @click="delteConsume" style="margin-left: 280px">重置</el-button>
<el-button type="primary" @click="addBefore"> 提交 </el-button> <el-button type="primary" @click="addBefore"> 提交 </el-button>
</el-form> </el-form>

18
gold-system/src/views/consume/allConsume.vue

@ -284,15 +284,14 @@ const getGoods = async function () {
try { try {
// POST // POST
const result = await request({ const result = await request({
url: '/product',
url: '/product/findProductName',
data: {} data: {}
}) })
// //
console.log('请求成功', result)
console.log('请求成功product', result)
// //
goods.value = result.data goods.value = result.data
console.log('allData', allData.value)
console.log('地区', area.value)
console.log('goods 数据', goods.value) //
} catch (error) { } catch (error) {
console.log('请求失败', error) console.log('请求失败', error)
// //
@ -344,11 +343,12 @@ const handleCurrentChange = function (val) {
style="width: 240px" style="width: 240px"
clearable clearable
> >
<!-- 修改 v-for 绑定逻辑 -->
<el-option <el-option
v-for="item in goods"
:key="item.activityId"
:label="item.name"
:value="item.name"
v-for="(item, index) in goods"
:key="index"
:label="item"
:value="item"
/> />
</el-select> </el-select>
</div> </div>
@ -412,7 +412,7 @@ const handleCurrentChange = function (val) {
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</el-col> </el-col>

15
gold-system/src/views/goldBeen/addGoldenBeen.vue

@ -14,7 +14,7 @@
<el-input v-model="beenObj.jwcode" style="width: 220px" /> <el-input v-model="beenObj.jwcode" style="width: 220px" />
<el-button <el-button
type="primary" type="primary"
@click="getUser(beenObj.jwcode)"
@click="getUser()"
style="margin-left: 20px" style="margin-left: 20px"
>查询</el-button >查询</el-button
> >
@ -62,7 +62,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<div class="btn-group"> <div class="btn-group">
<el-button @click="resetData(ruleFormRef)">重置</el-button>
<el-button type="success" @click="resetData(ruleFormRef)">重置</el-button>
<el-button type="primary" @click="addBean(ruleFormRef)"> <el-button type="primary" @click="addBean(ruleFormRef)">
提交 提交
</el-button> </el-button>
@ -150,13 +150,20 @@ const resetData = (formEl) => {
if (!formEl) return if (!formEl) return
formEl.resetFields() formEl.resetFields()
} }
const getUser = async function (jwcode) {
//
const trimJwCode = () => {
if (beenObj.value.jwcode) {
beenObj.value.jwcode = beenObj.value.jwcode.replace(/\s/g, '');
}
}
const getUser = async function () {
trimJwCode();
try { try {
// POST // POST
const result = await API({ const result = await API({
url: '/dou/search', url: '/dou/search',
data: { data: {
jwcode: jwcode
jwcode: beenObj.value.jwcode
} }
}) })
if (result.code === 0) { if (result.code === 0) {

39
gold-system/src/views/goldBeen/goldenBeenBalance.vue

@ -1,14 +1,17 @@
<template> <template>
<!-- 这是客户金豆余额页面 -->
<div class="filter-box"> <div class="filter-box">
<el-form :model="detailY" ref="ruleFormRef"> <el-form :model="detailY" ref="ruleFormRef">
<el-form-item prop="jwcode" label="精网号">
<el-form-item prop="jwcode">
<el-text class="mx-1" size="large">精网号</el-text>
<el-input <el-input
v-model="detailY.jwcode" v-model="detailY.jwcode"
placeholder="请输入精网号" placeholder="请输入精网号"
style="width: 220px" style="width: 220px"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="area" label="地区">
<el-form-item prop="area">
<el-text class="mx-1" size="large">地区</el-text>
<el-select <el-select
v-model="detailY.area" v-model="detailY.area"
placeholder="请选择所属地区" placeholder="请选择所属地区"
@ -24,21 +27,21 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" size="small" @click="search()"
<el-button type="primary" @click="search()"
>查询</el-button >查询</el-button
> >
<el-button type="primary" size="small" @click="reset(ruleFormRef)"
<el-button type="success" @click="reset(ruleFormRef)"
>重置</el-button >重置</el-button
> >
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div class="table-box"> <div class="table-box">
<p>
现有金豆:&nbsp;&nbsp;付费金豆:{{ getObj.jinbiBuy }}&nbsp;&nbsp;免费金豆:{{
<div>
现有金豆&nbsp;&nbsp;付费金豆{{ getObj.jinbiBuy }}&nbsp;&nbsp;免费金豆{{
getObj.jinbiFree getObj.jinbiFree
}}&nbsp;&nbsp;历史消费:{{ getObj.jinbiCostTotal }}
</p>
}}&nbsp;&nbsp;历史消费{{ getObj.jinbiCostTotal }}
</div>
<el-table <el-table
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
@ -118,7 +121,14 @@ let getObj = ref({
jinbiCostTotal: 0, jinbiCostTotal: 0,
jinbiFree: 0 jinbiFree: 0
}) })
//
const trimJwCode = () => {
if (detailY.jwcode) {
detailY.jwcode = detailY.jwcode.replace(/\s/g, '');
}
}
const search = function () { const search = function () {
trimJwCode();
getInit({}) getInit({})
getCount() getCount()
} }
@ -186,15 +196,24 @@ const getArea = async () => {
} }
} }
const getCount = async () => { const getCount = async () => {
try {
const result = await API({ const result = await API({
url: '/dou/getYveTotal'
url: '/dou/getYveTotal',
// jwcodeipAddress
data: {
jwcode: detailY.jwcode,
ipAddress: detailY.area
}
}) })
if (result.code == 200) {
if (result.code === 200) {
const { jinbiBuy, jinbiFree, jinbiCostTotal } = result.data const { jinbiBuy, jinbiFree, jinbiCostTotal } = result.data
getObj.value.jinbiBuy = jinbiBuy getObj.value.jinbiBuy = jinbiBuy
getObj.value.jinbiFree = jinbiFree getObj.value.jinbiFree = jinbiFree
getObj.value.jinbiCostTotal = jinbiCostTotal getObj.value.jinbiCostTotal = jinbiCostTotal
} }
} catch (error) {
console.log('获取统计数据失败', error)
}
} }
getArea() getArea()
getCount() getCount()

100
gold-system/src/views/goldBeen/goldenBeenConsum.vue

@ -1,14 +1,17 @@
<template> <template>
<!-- 这是金豆消费明细页面 -->
<div class="filter-box"> <div class="filter-box">
<el-form :model="detailY" ref="ruleFormRef"> <el-form :model="detailY" ref="ruleFormRef">
<el-form-item prop="jwcode" label="精网号">
<el-form-item prop="jwcode">
<el-text class="mx-1" size="large">精网号</el-text>
<el-input <el-input
v-model="detailY.jwcode" v-model="detailY.jwcode"
placeholder="请输入精网号" placeholder="请输入精网号"
style="width: 220px" style="width: 220px"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="ipAddress" label="地区">
<el-form-item prop="ipAddress">
<el-text class="mx-1" size="large">地区</el-text>
<el-select <el-select
v-model="detailY.ipAddress" v-model="detailY.ipAddress"
placeholder="请选择所属地区" placeholder="请选择所属地区"
@ -23,7 +26,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="sourceType" label="消费类型">
<el-form-item prop="sourceType">
<el-text class="mx-1" size="large">消费类型</el-text>
<el-select <el-select
v-model="detailY.sourceType" v-model="detailY.sourceType"
placeholder="请选择消费类型" placeholder="请选择消费类型"
@ -54,23 +58,38 @@
/> />
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item prop="sourceName" label="直播间">
<el-form-item prop="sourceName">
<el-text class="mx-1" size="large">直播间</el-text>
<el-input <el-input
v-model="detailY.sourceName" v-model="detailY.sourceName"
placeholder="请输入直播间" placeholder="请输入直播间"
style="width: 220px" style="width: 220px"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="createTime" label="消费时间">
<el-form-item prop="startTime">
<el-text class="mx-1" size="large">开始时间</el-text>
<el-date-picker <el-date-picker
v-model="detailY.createTime"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="YYYY-MM-DD HH:mm:ss"
v-model="detailY.startTime"
type="date"
placeholder="开始日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item prop="endTime">
<el-text class="mx-1" size="large">结束时间</el-text>
<el-date-picker
v-model="detailY.endTime"
type="date"
placeholder="结束日期"
style="width: 240px" style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/> />
<el-button style="margin-left: 10px" @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="search">查询</el-button> <el-button type="primary" @click="search">查询</el-button>
@ -79,7 +98,7 @@
</el-form> </el-form>
</div> </div>
<div class="table-box"> <div class="table-box">
<p>合计数:实际用户金豆数:{{ beenCount }}</p>
<div>合计数实际用户金豆数{{ beenCount }}</div>
<el-table :data="tableData" style="width: 100%" height="584px"> <el-table :data="tableData" style="width: 100%" height="584px">
<el-table-column type="index" label="序号" width="100px" fixed="left"> <el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope"> <template #default="scope">
@ -149,7 +168,7 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref } from 'vue' import { ref } from 'vue'
import type { FormInstance } from 'element-plus' import type { FormInstance } from 'element-plus'
import { ElMessage } from 'element-plus'
// import { ElMessage } from 'element-plus'
import moment from 'moment' import moment from 'moment'
import API from '@/util/http' import API from '@/util/http'
@ -172,14 +191,15 @@ const consumList = ref<any>([
{ value: 10, text: '打赏视频' }, { value: 10, text: '打赏视频' },
{ value: 11, text: '付费购买' } { value: 11, text: '付费购买' }
]) ])
const channelList = ref<string[]>([])
const liveroomList = ref<string[]>([])
// const channelList = ref<string[]>([])
// const liveroomList = ref<string[]>([])
const ruleFormRef = ref<FormInstance>() const ruleFormRef = ref<FormInstance>()
// //
const detailY = ref({ const detailY = ref({
jwcode: '', jwcode: '',
ipAddress: '', ipAddress: '',
createTime: '',
startTime:'',
endTime:'',
// channel: '', // // channel: '', //
sourceName: '', // sourceName: '', //
sourceType: '' // sourceType: '' //
@ -188,11 +208,45 @@ const getObj = ref({
pageNum: 1, pageNum: 1,
pageSize: 50 pageSize: 50
}) })
//
const getToday = function () {
const today = new Date()
//
const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
//
const getYesterday = function () {
const yesterday = moment().subtract(1, 'days')
//
const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
// 7
const get7Days = function () {
//
const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
// //
const getInit = async function () { const getInit = async function () {
try { try {
console.log('搜索参数', getObj.value) console.log('搜索参数', getObj.value)
const [startTime, endTime] = detailY.value.createTime
const startTime = detailY.value.startTime
const endTime = detailY.value.endTime
// POST // POST
const result = await API({ const result = await API({
url: '/dou/getSpend', url: '/dou/getSpend',
@ -218,8 +272,18 @@ const getInit = async function () {
// //
} }
} }
//
const trimJwCode = () => {
if (detailY.value.jwcode) {
detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, '');
}
if (detailY.value.sourceName) {
detailY.value.sourceName = detailY.value.sourceName.replace(/\s/g, '');
}
}
// //
const search = function () { const search = function () {
trimJwCode();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
getInit() getInit()
getCount() getCount()
@ -247,8 +311,8 @@ const getCount = async () => {
ipAddress: detailY.value.ipAddress, ipAddress: detailY.value.ipAddress,
sourceName: detailY.value.sourceName, sourceName: detailY.value.sourceName,
sourceType: detailY.value.sourceType, sourceType: detailY.value.sourceType,
startTime: detailY.value.createTime[0],
endTime: detailY.value.createTime[1]
startTime: detailY.value.startTime,
endTime: detailY.value.endTime
} }
}) })
if (result.code == 200) { if (result.code == 200) {

166
gold-system/src/views/goldBeen/goldenBeenDetail.vue

@ -1,14 +1,17 @@
<template> <template>
<!-- 这是金豆充值明细页面 -->
<div class="filter-box"> <div class="filter-box">
<el-form :model="detailY" ref="ruleFormRef"> <el-form :model="detailY" ref="ruleFormRef">
<el-form-item prop="jwcode" label="精网号">
<el-form-item prop="jwcode">
<el-text class="mx-1" size="large">精网号</el-text>
<el-input <el-input
v-model="detailY.jwcode" v-model="detailY.jwcode"
placeholder="请输入精网号" placeholder="请输入精网号"
style="width: 220px" style="width: 220px"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="deptName" label="地区">
<el-form-item prop="deptName" >
<el-text class="mx-1" size="large">地区</el-text>
<el-select <el-select
v-model="detailY.deptName" v-model="detailY.deptName"
placeholder="请选择所属地区" placeholder="请选择所属地区"
@ -23,20 +26,30 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="orderNo" label="订单号">
<el-form-item prop="orderNo" >
<el-text class="mx-1" size="large">订单号</el-text>
<el-input <el-input
v-model="detailY.orderNo" v-model="detailY.orderNo"
placeholder="请输入订单号" placeholder="请输入订单号"
style="width: 220px" style="width: 220px"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="type" label="充值类型">
<el-form-item prop="type">
<el-text class="mx-1" size="large">充值类型</el-text>
<el-input <el-input
v-model="detailY.type" v-model="detailY.type"
placeholder="请输入充值类型" placeholder="请输入充值类型"
style="width: 220px"
style="width: 240px"
clearable
/>
<el-option
v-for="item in typeList"
:key="item"
:label="item"
:value="item"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item prop="payStyle" label="充值平台"> <!-- <el-form-item prop="payStyle" label="充值平台">
<el-select <el-select
v-model="detailY.payStyle" v-model="detailY.payStyle"
@ -52,18 +65,31 @@
/> />
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item prop="createTime" label="充值时间">
<el-form-item prop="startTime">
<el-text class="mx-1" size="large">开始时间</el-text>
<el-date-picker
v-model="detailY.startTime"
type="date"
placeholder="开始日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item prop="endTime">
<el-text class="mx-1" size="large">结束时间</el-text>
<el-date-picker <el-date-picker
v-model="detailY.createTime"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
v-model="detailY.endTime"
type="date"
placeholder="结束日期"
style="width: 240px" style="width: 240px"
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
:unlinkPanels="true"
/> />
</el-form-item> </el-form-item>
<el-button style="margin-left: 10px" @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
<el-form-item> <el-form-item>
<el-button type="primary" @click="search">查询</el-button> <el-button type="primary" @click="search">查询</el-button>
<el-button type="success" @click="reset(ruleFormRef)">重置</el-button> <el-button type="success" @click="reset(ruleFormRef)">重置</el-button>
@ -72,10 +98,10 @@
</el-form> </el-form>
</div> </div>
<div class="table-box"> <div class="table-box">
<el-card
>金豆总数充值金豆总数{{ countValue }}合计金额数:{{
<div
>金豆总数充值金豆总数{{ countValue }}合计金额数{{
priceValue priceValue
}}</el-card
}}</div
> >
<el-table :data="tableData" style="width: 100%" height="584px"> <el-table :data="tableData" style="width: 100%" height="584px">
<el-table-column type="index" label="序号" width="100px" fixed="left"> <el-table-column type="index" label="序号" width="100px" fixed="left">
@ -195,7 +221,7 @@
</el-dialog> </el-dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { reactive, ref } from 'vue'
import { reactive, ref, onMounted } from 'vue'
import { FormInstance } from 'element-plus' import { FormInstance } from 'element-plus'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import moment from 'moment' import moment from 'moment'
@ -216,12 +242,65 @@ const excelData = reactive({
}) })
const priceValue = ref(0) const priceValue = ref(0)
const countValue = ref(0) const countValue = ref(0)
// areaList
const areaList = ref<string[]>([]) const areaList = ref<string[]>([])
const isExport = ref<boolean>(false) const isExport = ref<boolean>(false)
const rules = ref({ const rules = ref({
jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }], jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
area: [{ required: true, message: '请选择所属地区', trigger: 'change' }] area: [{ required: true, message: '请选择所属地区', trigger: 'change' }]
}) })
//
const getToday = function () {
const today = new Date()
//
const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
//
const getYesterday = function () {
const yesterday = moment().subtract(1, 'days')
//
const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
// 7
const get7Days = function () {
//
const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
const getArea = async () => {
try {
const result = await API({
url: '/dou/getPayIp'
})
areaList.value = result.data
} catch (error) {
console.log('请求失败', error)
}
}
const getType = async () => {
try {
const result = await API({
url: '/dou/getType'
})
typeList.value = result.data
} catch (error) {
console.log('请求失败', error)
}
}
const handlePageSizeChange = (val) => { const handlePageSizeChange = (val) => {
getObj.value.pageSize = val getObj.value.pageSize = val
getObj.value.pageNum = 1 getObj.value.pageNum = 1
@ -240,11 +319,6 @@ const platformList = ref<string[]>([
// '' // ''
]) ])
const typeList = ref<string[]>([ const typeList = ref<string[]>([
'金币换金豆',
'金币换免费金豆',
'赠送金豆',
'购买金豆',
'客服操作'
]) ])
// //
const detailY = ref({ const detailY = ref({
@ -253,7 +327,8 @@ const detailY = ref({
orderNo: '', orderNo: '',
payStyle: '', payStyle: '',
type: '', type: '',
createTime: ''
startTime: '',
endTime: ''
}) })
const getObj = ref({ const getObj = ref({
pageNum: 1, pageNum: 1,
@ -345,8 +420,6 @@ const getInit = async function (
) { ) {
try { try {
console.log('搜索参数', getObj.value) console.log('搜索参数', getObj.value)
const [startTime, endTime] = detailY.value.createTime
console.log(startTime, endTime)
// POST // POST
const result = await API({ const result = await API({
url: '/dou/getPay', url: '/dou/getPay',
@ -354,8 +427,8 @@ const getInit = async function (
pay: { pay: {
jwcode: isExport.value ? excelData.jwcode : detailY.value.jwcode, jwcode: isExport.value ? excelData.jwcode : detailY.value.jwcode,
deptName: isExport.value ? excelData.area : detailY.value.deptName, deptName: isExport.value ? excelData.area : detailY.value.deptName,
startTime: isExport.value ? excelData.startTime : startTime || '',
endTime: isExport.value ? excelData.endTime : endTime || '',
startTime: isExport.value ? excelData.startTime : detailY.value.startTime || '',
endTime: isExport.value ? excelData.endTime : detailY.value.endTime || '',
payStyle: isExport.value ? '' : detailY.value.payStyle, payStyle: isExport.value ? '' : detailY.value.payStyle,
type: isExport.value ? '' : detailY.value.type, type: isExport.value ? '' : detailY.value.type,
orderNo: isExport.value ? '' : detailY.value.orderNo, orderNo: isExport.value ? '' : detailY.value.orderNo,
@ -386,8 +459,21 @@ const getInit = async function (
// getInit({ sortField: prop, sortOrder: 'DESC' }) // getInit({ sortField: prop, sortOrder: 'DESC' })
// } // }
// } // }
//
const trim = () => {
if (detailY.value.jwcode) {
detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, '');
}
if (detailY.value.orderNo) {
detailY.value.orderNo = detailY.value.orderNo.replace(/\s/g, '');
}
if (detailY.value.type) {
detailY.value.type = detailY.value.type.replace(/\s/g, '');
}
}
// //
const search = function () { const search = function () {
trim();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
getInit({}) getInit({})
getCount() getCount()
@ -396,17 +482,7 @@ const search = function () {
const reset = function (formEl) { const reset = function (formEl) {
formEl.resetFields() formEl.resetFields()
} }
//
const getArea = async () => {
try {
const result = await API({
url: '/dou/getPayIp'
})
areaList.value = result.data
} catch (error) {
console.log('请求失败', error)
}
}
// //
const getPayType = async () => { const getPayType = async () => {
try { try {
@ -426,9 +502,9 @@ const getCount = async () => {
url: '/dou/getTotal', url: '/dou/getTotal',
data: { data: {
jwcode: detailY.value.jwcode, jwcode: detailY.value.jwcode,
//deptName: detailY.value.deptName,
startTime: detailY.value.createTime[0],
endTime: detailY.value.createTime[1],
deptName: detailY.value.deptName,
startTime: detailY.value.startTime,
endTime: detailY.value.endTime,
orderNo: detailY.value.orderNo, orderNo: detailY.value.orderNo,
type: detailY.value.type type: detailY.value.type
// payStyle: detailY.value.payStyle // payStyle: detailY.value.payStyle
@ -447,10 +523,14 @@ const getCount = async () => {
console.log('请求失败', error) console.log('请求失败', error)
} }
} }
getInit({})
getArea()
getPayType()
getCount()
onMounted(() => {
getInit({})
//getPayType()
getCount()
getArea()
getType()
})
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.filter-box { .filter-box {

101
gold-system/src/views/goldBeen/onLineDetail.vue

@ -1,14 +1,20 @@
<template> <template>
<!-- 这是线上充值明细页面 -->
<!-- 这是搜索表单 -->
<!-- 咱就是说为什么不加注释 -->
<div class="filter-box"> <div class="filter-box">
<el-form :model="detailY" ref="ruleFormRef"> <el-form :model="detailY" ref="ruleFormRef">
<el-form-item prop="jwcode" label="精网号">
<el-form-item prop="jwcode" >
<el-text class="mx-1" size="large">精网号</el-text>
<el-input <el-input
v-model="detailY.jwcode" v-model="detailY.jwcode"
placeholder="请输入精网号" placeholder="请输入精网号"
style="width: 220px" style="width: 220px"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="deptName" label="地区">
<el-form-item prop="deptName">
<el-text class="mx-1" size="large">地区</el-text>
<el-select <el-select
v-model="detailY.deptName" v-model="detailY.deptName"
placeholder="请选择所属地区" placeholder="请选择所属地区"
@ -23,7 +29,8 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="orderNo" label="订单号">
<el-form-item prop="orderNo">
<el-text class="mx-1" size="large">订单号</el-text>
<el-input <el-input
v-model="detailY.orderNo" v-model="detailY.orderNo"
placeholder="请输入订单号" placeholder="请输入订单号"
@ -37,7 +44,8 @@
style="width: 220px" style="width: 220px"
/> />
</el-form-item> --> </el-form-item> -->
<el-form-item prop="payStyle" label="充值平台">
<el-form-item prop="payStyle">
<el-text class="mx-1" size="large">充值平台</el-text>
<el-select <el-select
v-model="detailY.payStyle" v-model="detailY.payStyle"
placeholder="请选择充值平台" placeholder="请选择充值平台"
@ -52,27 +60,43 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="createTime" label="充值时间">
<el-form-item prop="startTime">
<el-text class="mx-1" size="large">开始时间</el-text>
<el-date-picker
v-model="detailY.startTime"
type="date"
placeholder="开始日期"
style="width: 240px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item prop="endTime">
<el-text class="mx-1" size="large">结束时间</el-text>
<el-date-picker <el-date-picker
v-model="detailY.createTime"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
v-model="detailY.endTime"
type="date"
placeholder="结束日期"
style="width: 240px" style="width: 240px"
format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
:unlinkPanels="true"
/> />
<el-button style="margin-left: 10px" @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
</el-form-item> </el-form-item>
<el-col :span="10">
<el-form-item> <el-form-item>
<el-button type="primary" @click="search">查询</el-button> <el-button type="primary" @click="search">查询</el-button>
<el-button type="success" @click="reset(ruleFormRef)">重置</el-button> <el-button type="success" @click="reset(ruleFormRef)">重置</el-button>
<el-button type="primary" @click="exportExcel">导出excel</el-button> <el-button type="primary" @click="exportExcel">导出excel</el-button>
</el-form-item> </el-form-item>
</el-col>
</el-form> </el-form>
</div> </div>
<div class="table-box"> <div class="table-box">
<p>金豆总数充值金豆总数{{ countValue }}合计金额数:{{ priceValue }}</p>
<div>金豆总数充值金豆总数{{ countValue }}合计金额数{{ priceValue }}</div>
<el-table :data="tableData" style="width: 100%" height="584px"> <el-table :data="tableData" style="width: 100%" height="584px">
<el-table-column type="index" label="序号" width="100px" fixed="left"> <el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope"> <template #default="scope">
@ -218,6 +242,38 @@ const rules = ref({
jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }], jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
area: [{ required: true, message: '请选择所属地区', trigger: 'change' }] area: [{ required: true, message: '请选择所属地区', trigger: 'change' }]
}) })
//
const getToday = function () {
const today = new Date()
//
const startDate = moment(today).startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment(today).endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
//
const getYesterday = function () {
const yesterday = moment().subtract(1, 'days')
//
const startDate = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
// 7
const get7Days = function () {
//
const startDate = moment().subtract(6, 'days').startOf('day').format('YYYY-MM-DD HH:mm:ss')
//
const endDate = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss')
detailY.value.startTime = startDate
detailY.value.endTime = endDate
search()
}
const handlePageSizeChange = (val) => { const handlePageSizeChange = (val) => {
getObj.value.pageSize = val getObj.value.pageSize = val
getObj.value.pageNum = 1 getObj.value.pageNum = 1
@ -242,6 +298,8 @@ const typeList = ref<string[]>([
'购买金豆', '购买金豆',
'客服操作' '客服操作'
]) ])
// //
const detailY = ref({ const detailY = ref({
jwcode: '', jwcode: '',
@ -249,7 +307,8 @@ const detailY = ref({
orderNo: '', orderNo: '',
payStyle: '', payStyle: '',
type: '', type: '',
createTime: ''
startTime: '',
endTime: ''
}) })
const getObj = ref({ const getObj = ref({
pageNum: 1, pageNum: 1,
@ -341,7 +400,9 @@ const getInit = async function (
) { ) {
try { try {
console.log('搜索参数', getObj.value) console.log('搜索参数', getObj.value)
const [startTime, endTime] = detailY.value.createTime
const startTime = detailY.value.startTime
const endTime = detailY.value.endTime
console.log(startTime, endTime) console.log(startTime, endTime)
// POST // POST
const result = await API({ const result = await API({
@ -382,8 +443,18 @@ const getInit = async function (
// getInit({ sortField: prop, sortOrder: 'DESC' }) // getInit({ sortField: prop, sortOrder: 'DESC' })
// } // }
// } // }
//
const trimJwCode = () => {
if (detailY.value.jwcode) {
detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, '');
}
if (detailY.value.orderNo) {
detailY.value.orderNo = detailY.value.orderNo.replace(/\s/g, '');
}
}
// //
const search = function () { const search = function () {
trimJwCode();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
getInit({}) getInit({})
getCount() getCount()
@ -434,8 +505,8 @@ const getCount = async () => {
data: { data: {
jwcode: detailY.value.jwcode, jwcode: detailY.value.jwcode,
deptName: detailY.value.deptName, deptName: detailY.value.deptName,
startTime: detailY.value.createTime[0],
endTime: detailY.value.createTime[1],
startTime: detailY.value.startTime,
endTime: detailY.value.endTime,
orderNo: detailY.value.orderNo, orderNo: detailY.value.orderNo,
payStyle: detailY.value.payStyle payStyle: detailY.value.payStyle
} }

3
gold-system/src/views/index.vue

@ -1,4 +1,6 @@
<script setup> <script setup>
//
// index
import { ref, onMounted, reactive, computed, watch } from 'vue' import { ref, onMounted, reactive, computed, watch } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import ElementPlus from 'element-plus' import ElementPlus from 'element-plus'
@ -20,6 +22,7 @@ const { currentArea, updateArea } = storeToRefs(areaStore)
const adminData = ref({ const adminData = ref({
name: '' name: ''
}) })
const getAdminData = async function () { const getAdminData = async function () {
try { try {
const result = await API({ url: '/admin/userinfo', data: {} }) const result = await API({ url: '/admin/userinfo', data: {} })

26
gold-system/src/views/login.vue

@ -49,7 +49,7 @@ const login = async function () {
result.data.permission == '2' || result.data.permission == '2' ||
result.data.permission == '3' result.data.permission == '3'
) { ) {
router.push('/usergold')
router.push('/workspace')
} else if (result.data.permission == '4') { } else if (result.data.permission == '4') {
router.push('/noPermission') router.push('/noPermission')
} }
@ -66,6 +66,8 @@ const login = async function () {
// //
} }
} }
</script> </script>
<template> <template>
<el-row class="login-page"> <el-row class="login-page">
@ -79,14 +81,14 @@ const login = async function () {
<!-- <div style="height: 100vh; width: 1000px" class="container"></div> --> <!-- <div style="height: 100vh; width: 1000px" class="container"></div> -->
<el-col :span="6" :offset="3" class="form"> <el-col :span="6" :offset="3" class="form">
<!-- 登录表单 --> <!-- 登录表单 -->
<el-form :model="form" size="large" autocomplete="off">
<el-form :model="form" size="large" autocomplete="off" >
<el-form-item> <el-form-item>
<h1 style="color: #409eff">金币系统登录</h1> <h1 style="color: #409eff">金币系统登录</h1>
</el-form-item> </el-form-item>
<el-form-item prop="jwcode"> <el-form-item prop="jwcode">
<el-input v-model="form.jwcode" placeholder="请输入精网号"></el-input>
<el-input v-model="form.jwcode" placeholder="请输入精网号" @keyup.enter="login"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password">
<el-form-item prop="password" @keyup.enter="login">
<el-input <el-input
v-model="form.password" v-model="form.password"
type="password" type="password"
@ -223,3 +225,19 @@ More comprehensive version at shenanigans.shoghisimon.ca/collection/css
background-size: 100% 2px, 100% 100%, 100% 100%; background-size: 100% 2px, 100% 100%, 100% 100%;
} }
</style> </style>
<!-- 这是补救
const run = () => {
const width = window.innerWidth;
const height = window.innerHeight;
const chartNode = document.querySelector("main");
drawChart.default(chartNode,data,width,height);
};
window.addEventListener("resize", run);
document.addEventListener("DOMContentLoaded", run);
</script>
</body>
</html>
-->

371
gold-system/src/views/managerecharge/activity.vue

@ -1,4 +1,5 @@
<script setup> <script setup>
//
import { ref, onMounted, reactive, computed } from 'vue' import { ref, onMounted, reactive, computed } from 'vue'
import ElementPlus from 'element-plus' import ElementPlus from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
@ -25,7 +26,6 @@ const getAdminData = async function () {
} }
} }
//
// //
const tableData = ref([]) const tableData = ref([])
// //
@ -43,19 +43,10 @@ const getObj = ref({
const addObj = ref({ const addObj = ref({
add: '' add: ''
}) })
//
// //
const delObj = ref({}) const delObj = ref({})
// //
// const tableHeight = computed(function () {
// return (getObj.value.pageSize + 1) * 50 + "px";
// });
// ref
const Ref = ref(null)
//
//
//
const get = async function (val) { const get = async function (val) {
try { try {
// //
@ -63,26 +54,34 @@ const get = async function (val) {
getObj.value.pageNum = val getObj.value.pageNum = val
} }
// //
if (getTime.value != null) {
if (getTime.value.startDate != '' && getTime.value.endDate != '') {
if (getTime.value.length === 2) {
activity.value.startDate = getTime.value[0] activity.value.startDate = getTime.value[0]
activity.value.endDate = getTime.value[1] activity.value.endDate = getTime.value[1]
}
} else { } else {
activity.value.startDate = ''
activity.value.endDate = ''
activity.value.startDate = null
activity.value.endDate = null
} }
console.log('搜索参数', getObj.value)
const requestData = {
pageNum: getObj.value.pageNum,
pageSize: getObj.value.pageSize,
activity: {
...activity.value,
activityName: activity.value.activityName,
status: activity.value.status
}
};
console.log('搜索参数', requestData)
// POST // POST
const result = await request({ const result = await request({
url: '/recharge/activity/select', url: '/recharge/activity/select',
data: {
...getObj.value,
activity: { ...activity.value }
}
method: 'post',
data: requestData
}) })
//
console.log('响应数据', result);
// //
console.log('请求成功', result) console.log('请求成功', result)
// //
@ -93,227 +92,163 @@ const get = async function (val) {
console.log('total', total.value) console.log('total', total.value)
} catch (error) { } catch (error) {
console.log('请求失败', error) console.log('请求失败', error)
//
ElMessage.error('请求失败')
}
}
//
const getToday = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
}
//
const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
)
const endDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
)
getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
}
// 7
const get7Days = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
}
//
const trim = () => {
if (activity.value.activityName) {
activity.value.activityName = activity.value.activityName.replace(/\s/g, '');
} }
} }
// //
const search = function () { const search = function () {
trim();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
get() get()
} }
// //
const reset = function () { const reset = function () {
getObj.value = {}
getObj.value.pageNum = 1
getObj.value.pageSize = 10
getTime.value = {}
getObj.value = {
pageNum: 1,
pageSize: 10
}
getTime.value = []
activity.value = {} activity.value = {}
} }
//
//
onMounted(async function () {
await getAdminData()
get()
})
// false
const addActivityVisible = ref(false) const addActivityVisible = ref(false)
//
const openAddActivityVisible = function () {
addActivityVisible.value = true
}
//
const closeAddActivityVisible = function (done) {
addActivityVisible.value = false
// addActivity
const addActivity = () => {
console.log('点击了新增活动按钮');
// addActivityVisible true
addActivityVisible.value = true;
};
//
const closeAddActivityVisible = () => {
addActivityVisible.value = false;
};
//
const handlePageSizeChange = function (val) {
getObj.value.pageSize = val
get()
} }
//
const addActicity = function () {
console.log('Date', new Date())
//
addObj.value = {}
addObj.value.adminId = adminData.value.adminId
addObj.value.adminName = adminData.value.name
addObj.value.freeGold = '0'
addObj.value.rechargeRatio = 0
addObj.value.startTime = null
addObj.value.endTime = null
openAddActivityVisible()
//
const handleCurrentChange = function (val) {
getObj.value.pageNum = val
get()
} }
//
const add = async function () {
Ref.value.validate(async (valid) => {
console.log('valid', valid)
if (valid) {
//
const throttledAdd = async () => {
try { try {
console.log('添加对象', addObj.value)
// POST
// 'add'
const { add, ...validData } = addObj.value;
// POST
const result = await request({ const result = await request({
url: '/recharge/activity/add',
data: addObj.value
url: '/recharge/activity/add', //
method: 'post',
data: validData
}) })
//
console.log('请求成功', result)
//
get()
//
console.log('新增活动成功', result)
ElMessage.success('新增活动成功')
//
closeAddActivityVisible() closeAddActivityVisible()
//
ElMessage({
type: 'success',
message: '活动添加成功!'
})
//
get()
} catch (error) { } catch (error) {
console.log('请求失败', error)
//
}
} else {
//
ElMessage({
type: 'error',
message: '请检查输入内容'
})
console.log('新增活动失败', error)
ElMessage.error('新增活动失败')
} }
})
} }
// 使 _.throttle trailing false
const throttledAdd = _.throttle(add, 5000, { trailing: false })
//
// let onceFunction = true;
//
// const throttledAdd = (...args) => {
// if (onceFunction) {
// add.apply(null, args);
// onceFunction = false; // false
// timer = setTimeout(() => {
// onceFunction = true; //
// timer = null;
// }, 1000); // 10001
// }
// };
// =========================================================
//
const del = function (row) {
delObj.value.activityId = row.activityId
console.log('delObj', delObj.value)
}
//
const delConfirm = async function () {
//
const delConfirm = async (row) => {
try { try {
console.log('delObj', delObj.value)
// POST
delObj.value = row
//
const result = await request({ const result = await request({
url: '/recharge/activity/edit',
url: '/recharge/activity/delete', //
method: 'post',
data: delObj.value data: delObj.value
}) })
if (result.code == 200) {
ElMessage({
type: 'success',
message: '删除成功'
})
//
console.log('请求成功', result)
//
console.log('删除活动成功', result)
ElMessage.success('删除活动成功')
//
get() get()
} else {
ElMessage({
type: 'error',
message: '删除失败'
})
}
} catch (error) { } catch (error) {
console.log('请求失败', error)
//
}
}
const handlePageSizeChange = function (val) {
getObj.value.pageSize = val
get()
}
const handleCurrentChange = function (val) {
getObj.value.pageNum = val
get()
}
//
//
const handleStartTimeChange = () => {
Ref.value.validateField('endTime')
}
const checkFreeGoldRadio = function (rule, value, callback) {
if (addObj.value.freeGold == 1) {
if (value == '0' || value == null || value == '') {
callback(new Error('请输入免费金币兑换比'))
} else if (value < 0 || isNaN(value)) {
callback(new Error('请输入正确的格式'))
} else {
callback()
}
} else {
callback()
console.log('删除活动失败', error)
ElMessage.error('删除活动失败')
} }
} }
const checkStartTime = function (rule, value, callback) {
if (value < new Date()) {
callback(new Error('开始时间不能小于当前时间'))
} else {
callback()
}
}
const checkEndTime = function (rule, value, callback) {
if (value < new Date()) {
callback(new Error('结束时间不能小于当前时间'))
} else if (value <= addObj.value.startTime) {
callback(new Error('结束时间不能小于开始时间'))
} else {
callback()
}
}
const rules = reactive({
activityName: [
{ required: true, message: '请输入活动名称', trigger: 'blur' }
],
freeGold: [
{ required: true, message: '请选择是否赠送免费金币', trigger: 'blur' }
],
rechargeRatio: [{ validator: checkFreeGoldRadio, trigger: 'blur' }],
startTime: [
{ required: true, message: '请选择开始时间', trigger: 'blur' },
{ validator: checkStartTime, trigger: 'blur' }
],
endTime: [
{ required: true, message: '请选择结束时间', trigger: 'blur' },
{ validator: checkEndTime, trigger: 'blur' }
]
})
//
const checkNumber = function () {
if (typeof parseInt(getObj.value.pageNum) === 'number') {
console.log('总共有多少页' + Math.ceil(total.value / getObj.value.pageSize))
if (
getObj.value.pageNum > 0 &&
getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
) {
getObj.value.pageNum = parseInt(getObj.value.pageNum)
console.log('输入的数字合法')
get()
} else {
//
ElMessage({
type: 'error',
message: '请检查输入内容'
})
}
} else {
//
ElMessage({
type: 'error',
message: '请检查输入内容'
})
}
//
const del = (row) => {
delObj.value = row
} }
//
onMounted(async function () {
await getAdminData()
get()
})
</script> </script>
<template> <template>
@ -339,9 +274,14 @@ onMounted(async function () {
start-placeholder="起始时间" start-placeholder="起始时间"
end-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>
</div> </div>
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</div> </div>
@ -354,13 +294,13 @@ onMounted(async function () {
<div> <div>
<el-button <el-button
plain plain
@click="addActicity()"
@click="addActivity()"
style="color: #048efb; border: 1px solid #048efb" style="color: #048efb; border: 1px solid #048efb"
>新增活动</el-button >新增活动</el-button
> >
</div> </div>
<div> <div>
<el-table :data="tableData" :height="tableHeight" style="width: 100%">
<el-table :data="tableData" style="width: 100%">
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
@ -384,6 +324,7 @@ onMounted(async function () {
{{ moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') }} {{ moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="rechargeRatio" label="免费兑换比"> <el-table-column prop="rechargeRatio" label="免费兑换比">
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.rechargeRatio }}:1</span> <span>{{ scope.row.rechargeRatio }}:1</span>
@ -421,7 +362,7 @@ onMounted(async function () {
<template #default="scope"> <template #default="scope">
<el-popconfirm <el-popconfirm
title="确定将此条活动删除吗?" title="确定将此条活动删除吗?"
@confirm="delConfirm"
@confirm="delConfirm(delObj.value)"
> >
<template #reference> <template #reference>
<el-button type="primary" text @click="del(scope.row)"> <el-button type="primary" text @click="del(scope.row)">
@ -445,7 +386,7 @@ onMounted(async function () {
<el-pagination <el-pagination
background background
:page-size="getObj.pageSize" :page-size="getObj.pageSize"
:page-sizes="[5, 10, 20, 50, 100]"
:page-sizes="[5, 10, 20, 50]"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="total" :total="total"
@size-change="handlePageSizeChange" @size-change="handlePageSizeChange"

111
gold-system/src/views/managerecharge/rate.vue

@ -22,7 +22,7 @@ const getAdminData = async function () {
rateAdd.value.adminId = adminData.value.adminId rateAdd.value.adminId = adminData.value.adminId
rateEdit.value.adminId = adminData.value.adminId rateEdit.value.adminId = adminData.value.adminId
console.log('请求成功', result) console.log('请求成功', result)
console.log('用户信息', user.value)
// console.log('', user.value)
} catch (error) { } catch (error) {
console.log('请求失败', error) console.log('请求失败', error)
} }
@ -31,7 +31,6 @@ getAdminData()
const regeAdd = ref(false) const regeAdd = ref(false)
const regeEdit = ref(false) const regeEdit = ref(false)
// //
const tableData = ref([]) const tableData = ref([])
// //
@ -39,10 +38,11 @@ const getObj = ref({
pageNum: 1, pageNum: 1,
pageSize: 10 pageSize: 10
}) })
const total = ref(0) const total = ref(0)
// //
//
//
const value1 = ref({ const value1 = ref({
startTime: '', startTime: '',
endTime: '' endTime: ''
@ -58,45 +58,102 @@ function handleDateChange(value) {
const time = ref({}) const time = ref({})
const get = async function (val) { const get = async function (val) {
// //
if (value1.value != null) {
if (value1.value.startDate != '' && value1.value.endDate != '') {
time.value.startTime = value1.value[0]
time.value.endTime = value1.value[1]
}
if (value1.value && value1.value.length === 2) {
time.value.startTime = value1.value[0];
time.value.endTime = value1.value[1];
} else { } else {
time.value.startTime = ''
time.value.endTime = ''
time.value.startTime = '';
time.value.endTime = '';
} }
try { try {
// //
if (typeof val === 'number') { if (typeof val === 'number') {
getObj.value.pageNum = val
getObj.value.pageNum = val;
} }
console.log('搜索参数', getObj.value)
console.log('搜索参数', {
...getObj.value,
rate: { ...time.value }
});
// POST // POST
const result = await request({ const result = await request({
url: '/rates/search', url: '/rates/search',
method: 'POST',
data: { data: {
...getObj.value, ...getObj.value,
rate: { ...time.value } rate: { ...time.value }
} }
})
});
// //
console.log('请求成功', result)
console.log('请求成功', result);
// //
tableData.value = result.data.list
console.log('tableData', tableData.value)
// UI
tableData.value = result.data.list;
console.log('tableData', tableData.value);
// //
total.value = result.data.total
console.log('total', total.value)
total.value = result.data.total;
console.log('total', total.value);
} catch (error) { } catch (error) {
console.log('请求失败', error)
//
console.log('请求失败', error);
ElMessage.error('请求失败');
} }
} }
//
const getToday = function () {
const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
);
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
);
// value1!!value1!!lhl
value1.value = [startDate, endDate];
console.log('value1', value1.value);
get();
}
//
const getYesterday = function () {
const yesterday = new Date();
yesterday.setDate(yesterday.getDate() - 1);
const startDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
);
const endDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
);
// value1
value1.value = [startDate, endDate];
console.log('value1', value1.value);
get();
}
// 7
const get7Days = function () {
const today = new Date();
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
);
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
);
// value1
value1.value = [startDate, endDate];
console.log('value1', value1.value);
get();
}
// //
const search = function () { const search = function () {
getObj.value.pageNum = 1 getObj.value.pageNum = 1
@ -464,20 +521,22 @@ function handleInput(value) {
:size="size" :size="size"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
/> />
<el-button style="margin-left: 10px" @click="getToday"></el-button>
<el-button @click="getYesterday"></el-button>
<el-button @click="get7Days">近7天</el-button>
<!-- 按钮 --> <!-- 按钮 -->
<el-button <el-button
class="button-item" class="button-item"
type="primary" type="primary"
style="float: right" style="float: right"
@click="search()"
>查询</el-button
>
@click="search"
>查询</el-button>
<el-button <el-button
class="button-item" class="button-item"
type="success"
style="float: right" style="float: right"
@click="handledelete" @click="handledelete"
>重置</el-button
>
>重置</el-button>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>

9
gold-system/src/views/permissions/index.vue

@ -62,8 +62,15 @@ const get = async function (val) {
console.log('请求失败', error) console.log('请求失败', error)
} }
} }
//
const trimJwCode = () => {
if (admin.value.jwcode) {
admin.value.jwcode = admin.value.jwcode.replace(/\s/g, '');
}
}
// //
const search = function () { const search = function () {
trimJwCode();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
get() get()
} }
@ -466,7 +473,7 @@ const handleCurrentChange = function (val) {
</div> </div>
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</div> </div>

16
gold-system/src/views/recharge/addRecharge.vue

@ -9,7 +9,12 @@ import moment from 'moment'
import { range, re } from 'mathjs' import { range, re } from 'mathjs'
import { utils, read } from 'xlsx' import { utils, read } from 'xlsx'
import throttle from 'lodash/throttle' import throttle from 'lodash/throttle'
//
const trimJwCode = () => {
if (addRecharge.value.jwcode) {
addRecharge.value.jwcode = addRecharge.value.jwcode.replace(/\s/g, '');
}
}
// //
const beforeAvatarUpload = (file) => { const beforeAvatarUpload = (file) => {
const isJPG = file.type === 'image/jpeg' const isJPG = file.type === 'image/jpeg'
@ -154,12 +159,14 @@ const rules = reactive({
// //
const user = ref({}) const user = ref({})
const getUser = async function (jwcode) { const getUser = async function (jwcode) {
trimJwCode();
try { try {
// POST // POST
const result = await API({ const result = await API({
url: '/recharge/user', url: '/recharge/user',
data: { data: {
jwcode: jwcode,
jwcode: addRecharge.value.jwcode,
area: adminData.value.area area: adminData.value.area
} }
}) })
@ -924,6 +931,7 @@ onMounted(async function () {
type="primary" type="primary"
@click="getUser(addRecharge.jwcode)" @click="getUser(addRecharge.jwcode)"
style="margin-left: 20px" style="margin-left: 20px"
>查询</el-button >查询</el-button
> >
</el-form-item> </el-form-item>
@ -1036,7 +1044,7 @@ onMounted(async function () {
placeholder="提交人姓名" placeholder="提交人姓名"
/> />
</el-form-item> </el-form-item>
<el-button @click="deleteRecharge" style="margin-left: 280px"
<el-button @click="deleteRecharge" style="margin-left: 280px" type="success"
>重置</el-button >重置</el-button
> >
<el-button type="primary" @click="addBefore"> 提交 </el-button> <el-button type="primary" @click="addBefore"> 提交 </el-button>
@ -1389,7 +1397,7 @@ onMounted(async function () {
@confirm="resetConfirm" @confirm="resetConfirm"
> >
<template #reference> <template #reference>
<el-button type="primary" text @click="reset(scope.row)">
<el-button type="success" text @click="reset(scope.row)">
重置 重置
</el-button> </el-button>
</template> </template>

2
gold-system/src/views/recharge/adminRecharge.vue

@ -517,7 +517,7 @@ const handleSortChange = (column) => {
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</el-col> </el-col>

2
gold-system/src/views/recharge/allRecharge.vue

@ -482,7 +482,7 @@ const handleSortChange = (column) => {
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</el-col> </el-col>

16
gold-system/src/views/refund/addRefund.vue

@ -25,7 +25,12 @@ const getAdminData = async function () {
console.log('请求失败', error) console.log('请求失败', error)
} }
} }
//
const trimJwCode = () => {
if (addRefund.value.jwcode) {
addRefund.value.jwcode = addRefund.value.jwcode.replace(/\s/g, '');
}
}
// 退 // 退
const addRefund = ref({ const addRefund = ref({
updateType: '3', updateType: '3',
@ -134,12 +139,13 @@ const user = ref({
firstRechargeTime: '' firstRechargeTime: ''
}) })
const getUser = async function (jwcode) { const getUser = async function (jwcode) {
trimJwCode();
try { try {
// POST // POST
const result = await API({ const result = await API({
url: '/recharge/user', url: '/recharge/user',
data: { data: {
jwcode: jwcode,
jwcode: addRefund.value.jwcode,
area: adminData.value.area area: adminData.value.area
} }
}) })
@ -188,14 +194,16 @@ const refundType = [
] ]
// //
//
const goods = ref([]) const goods = ref([])
const getGoods = async function (jwcode) { const getGoods = async function (jwcode) {
trimJwCode();
try { try {
// POST // POST
const result = await API({ const result = await API({
url: '/consume/getDeatil', url: '/consume/getDeatil',
data: { data: {
jwcode: jwcode,
jwcode: addRefund.value.jwcode,
area: adminData.value.area area: adminData.value.area
} }
}) })
@ -388,7 +396,7 @@ onMounted(async function () {
placeholder="提交人姓名" placeholder="提交人姓名"
/> />
</el-form-item> </el-form-item>
<el-button @click="cancel()" style="margin-left: 280px">重置</el-button>
<el-button type="success" @click="cancel()" style="margin-left: 280px">重置</el-button>
<el-button type="primary" @click="addBefore"> 提交 </el-button> <el-button type="primary" @click="addBefore"> 提交 </el-button>
</el-form> </el-form>

2
gold-system/src/views/refund/allRefund.vue

@ -512,7 +512,7 @@ const handleCurrentChange = function (val) {
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3">
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</el-col> </el-col>

704
gold-system/src/views/usergold/index.vue

@ -1,14 +1,14 @@
<!-- 这是客户金币明细页面 -->
<script setup> <script setup>
import { ref, onMounted, reactive, computed } from 'vue'
import ElementPlus from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ref, onMounted, computed ,nextTick} from 'vue'
import { ElMessage } from 'element-plus'
import axios from 'axios' import axios from 'axios'
import moment from 'moment' import moment from 'moment'
import { ta } from 'element-plus/es/locales.mjs'
import API from '@/util/http' import API from '@/util/http'
import { writeFile, utils } from 'xlsx' import { writeFile, utils } from 'xlsx'
// //
//
const adminData = ref({}) const adminData = ref({})
const getAdminData = async function () { const getAdminData = async function () {
try { try {
@ -24,10 +24,34 @@ const getAdminData = async function () {
console.log('请求失败', error) console.log('请求失败', error)
} }
} }
//
const isLoadingArea = ref(false);
const area = ref([])
const getArea = async () => {
isLoadingArea.value = true;
try {
const result = await API({
url: '/detailY/getarea'
});
// { value, label }
if (Array.isArray(result.data) && typeof result.data[0] === 'string') {
area.value = result.data.map(item => ({ value: item, label: item }));
} else {
area.value = result.data;
}
} catch (error) {
console.error('获取地区数据失败:', error);
ElMessage.error('获取地区数据失败,请稍后重试');
//
area.value = [];
} finally {
isLoadingArea.value = false;
}
};
// //
const tableData = ref([]) const tableData = ref([])
//
// const tableAllData = ref([]);
// //
const rechargeCoin = ref(0) const rechargeCoin = ref(0)
const freeCoin = ref(0) const freeCoin = ref(0)
@ -39,14 +63,12 @@ const total = ref(100)
const getTime = ref([]) const getTime = ref([])
// detailY // detailY
const detailY = ref({}) const detailY = ref({})
//
const getAllObj = ref({})
// //
const getObj = ref({ const getObj = ref({
pageNum: 1, pageNum: 1,
pageSize: 50 pageSize: 50
}) })
//excel
// excel
const getPutEX = ref(false) const getPutEX = ref(false)
// //
@ -61,10 +83,6 @@ const num = [
} }
] ]
// //
// const tableHeight = computed(function () {
// return (getObj.value.pageSize + 2) * 38 + "px";
// });
// //
// =========================================================================== // ===========================================================================
@ -81,12 +99,9 @@ const get = async function (val) {
if (typeof val === 'number') { if (typeof val === 'number') {
getObj.value.pageNum = val getObj.value.pageNum = val
} }
//
if (getTime.value != null) {
if (getTime.value.startDate != '' && getTime.value.endDate != '') {
if (getTime.value.length === 2) {
detailY.value.startDate = getTime.value[0] detailY.value.startDate = getTime.value[0]
detailY.value.endDate = getTime.value[1] detailY.value.endDate = getTime.value[1]
}
} else { } else {
detailY.value.startDate = '' detailY.value.startDate = ''
detailY.value.endDate = '' detailY.value.endDate = ''
@ -101,116 +116,62 @@ const get = async function (val) {
method: 'post', method: 'post',
data: { ...getObj.value, detailY: { ...detailY.value } } data: { ...getObj.value, detailY: { ...detailY.value } }
}) })
// const result2 = await API.post("http://54.251.137.151:10702/detailY", {
// ...getAllObj.value,
// detailY: { ...detailY.value },
// });
//
console.log('请求成功', result)
// console.log("2", result2);
//
tableData.value = result.data.list tableData.value = result.data.list
console.log('tableData', tableData.value)
// tableAllData.value = result2.data;
// console.log("tableAllData", tableAllData.value);
//
total.value = result.data.total total.value = result.data.total
console.log('total', total.value)
// 100
// 100
// rechargeCoin.value = parseFloat((tableAllData.value.sumR / 100).toFixed(2));
// freeCoin.value = parseFloat((tableAllData.value.sumF / 100).toFixed(2));
// taskCoin.value = parseFloat((tableAllData.value.sumT / 100).toFixed(2));
// for (let i = 0; i < tableAllData.value.length; i++) {
// rechargeCoin.value += tableAllData.value[i].rechargeCoin;
// freeCoin.value += tableAllData.value[i].freeCoin;
// taskCoin.value += tableAllData.value[i].taskCoin;
// }
// console.log(
// "",
// rechargeCoin.value,
// freeCoin.value,
// taskCoin.value
// );
} catch (error) { } catch (error) {
console.log('请求失败', error) console.log('请求失败', error)
//
} }
} }
// detailY jwcode
const trimJwCode = () => {
if (detailY.value.jwcode) {
detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, '');
}
}
// //
const search = function () { const search = function () {
trimJwCode();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
get() get()
} }
// //
const reset = function () { const reset = function () {
//
delete detailY.value.jwcode delete detailY.value.jwcode
//
delete detailY.value.num delete detailY.value.num
//
delete detailY.value.startDate delete detailY.value.startDate
//
delete detailY.value.endDate delete detailY.value.endDate
//
delete detailY.value.area delete detailY.value.area
delete sortField.value delete sortField.value
delete sortOrder.value delete sortOrder.value
getTime.value = {}
//
getTime.value = []
delete detailY.value.consumePlatform delete detailY.value.consumePlatform
} }
// //
const getToday = function () { const getToday = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
const today = moment()
const startDate = today.startOf('day').toDate()
const endDate = today.endOf('day').toDate()
getTime.value = [startDate, endDate] getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
search()
} }
// //
const getYesterday = function () { const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
)
const endDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
)
const yesterday = moment().subtract(1, 'day')
const startDate = yesterday.startOf('day').toDate()
const endDate = yesterday.endOf('day').toDate()
getTime.value = [startDate, endDate] getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
search()
} }
// 7 // 7
const get7Days = function () { const get7Days = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
const startDate = moment().subtract(6, 'day').startOf('day').toDate()
const endDate = moment().endOf('day').toDate()
getTime.value = [startDate, endDate] getTime.value = [startDate, endDate]
console.log('getTime', getTime.value)
get()
search()
} }
// //
@ -242,153 +203,222 @@ const checkNumber = function () {
// //
onMounted(async function () { onMounted(async function () {
await getArea()
await getAdminData() await getAdminData()
await get() await get()
}) })
// excel
// Excel // Excel
//
const json_fields = (row) => {
return [
row.jwcode, //
row.area, //
row.platform, //
row.consumePlatform, //
row.gold, //
row.rechargeCoin, //
row.freeCoin, //
row.taskCoin, //
row.createAdmin, //
row.createTime,
row.name,
row.id
]
}
//
const json_meta = [
[
{
key: 'charset',
value: 'utf-8'
}
]
]
const headers = [ const headers = [
'序号',
'姓名',
'精网号', '精网号',
'地区',
'所属地区',
'平台信息', '平台信息',
'数量',
'数量更新类型',
'更新数量',
'更新类型',
'永久金币', '永久金币',
'免费金币', '免费金币',
'任务金币', '任务金币',
'提交人', '提交人',
'更新时间',
'用户名',
'id'
'更新时间'
] ]
const exportExcel = () => {
// json_fields
const data = excelInfo.value.map(json_fields)
const ws = utils.aoa_to_sheet(data)
//
utils.sheet_add_aoa(ws, [headers], { origin: 'A1' })
const showExportInfoPanel = ref(false)
//
const exportExcel = async () => {
try {
console.log('点击导出按钮,尝试显示信息面板');
showExportInfoPanel.value = true;
await nextTick();//
} catch (error) {
console.error('显示信息面板失败:', error);
ElMessage.error('显示信息面板失败,请稍后重试');
}
};
//
const exportProgress = ref(0)
const isExporting = ref(false)
const exportCancelToken = ref(null)
//
const doExportExcel = async () => {
try {
isExporting.value = true
exportProgress.value = 0
showExportInfoPanel.value = false
// Excel
const wb = utils.book_new() const wb = utils.book_new()
const ws = utils.aoa_to_sheet([headers])
utils.book_append_sheet(wb, ws, 'Sheet1') utils.book_append_sheet(wb, ws, 'Sheet1')
writeFile(wb, '客户金币明细.xlsx')
}
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
const putExcel = ref({
startDate: startDate,
endDate: endDate
})
const excelInfo = ref({})
const loading = ref(false)
const areyour = async function () {
try {
loading.value = true
const result = await API({
url: '/detailY/searchAll',
method: 'post',
data: { ...putExcel.value }
})
excelInfo.value = result.data
// excelInfo
if (Array.isArray(excelInfo.value)) {
excelInfo.value.forEach((item) => {
if (item.rechargeCoin) {
item.rechargeCoin = item.rechargeCoin / 100
//
const writer = {
write: (d, o) => {
if (!d) return
utils.sheet_add_aoa(ws, d, { origin: -1 })
} }
if (item.freeCoin) {
item.freeCoin = item.freeCoin / 100
} }
if (item.taskCoin) {
item.taskCoin = item.taskCoin / 100
let page = 1
let totalExported = 0
const pageSize = 5000 // 5000
let totalRecords = 0
//
const firstResult = await API({
url: '/detailY',
method: 'post',
data: {
pageNum: 1,
pageSize,
detailY: { ...detailY.value }
} }
}) })
totalRecords = firstResult.data.total
//
const CancelToken = axios.CancelToken
exportCancelToken.value = CancelToken.source()
//
const platformMap = {
0: '初始化金币',
1: 'ERP系统',
2: 'Homily Chart',
3: 'Homily Link',
4: '金币系统'
};
//
const updateTypeMap = {
0: '充值',
1: '消费',
2: '退款',
3: '其他'
};
//
const firstData = firstResult.data.list
if (firstData.length) {
const rows = firstData.map((row, index) => [
totalExported + index + 1,
row.username || '',
row.jwcode || '',
row.area || '',
platformMap[row.consumePlatform] || '',
(row.gold).toFixed(2) || '0.00',
updateTypeMap[row.updateType] || '',
(row.rechargeCoin / 100).toFixed(2) || '0.00',
(row.freeCoin / 100).toFixed(2) || '0.00',
(row.taskCoin / 100).toFixed(2) || '0.00',
row.name || '',
moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') || ''
])
writer.write(rows)
totalExported += firstData.length
exportProgress.value = Math.round((totalExported / totalRecords) * 100)
page++
} }
areyouright.value = true
ElMessage({
type: 'success',
message: '查询成功'
while (totalExported < totalRecords) {
const result = await API({
url: '/detailY',
method: 'post',
data: {
pageNum: page,
pageSize,
detailY: { ...detailY.value }
},
cancelToken: exportCancelToken.value.token
}) })
loading.value = false
const data = result.data.list
if (!data.length) break
//
const rows = data.map((row, index) => [
totalExported + index + 1,
row.username || '',
row.jwcode || '',
row.area || '',
platformMap[row.consumePlatform] || '',
(row.gold / 100).toFixed(2) || '0.00',
updateTypeMap[row.updateType] || '',
(row.rechargeCoin / 100).toFixed(2) || '0.00',
(row.freeCoin / 100).toFixed(2) || '0.00',
(row.taskCoin / 100).toFixed(2) || '0.00',
row.name || '',
moment(row.createTime).format('YYYY-MM-DD HH:mm:ss') || ''
])
//
writer.write(rows)
totalExported += data.length
exportProgress.value = Math.round((totalExported / totalRecords) * 100)
// 500
if (page % 500 === 0) {
await new Promise(resolve => setTimeout(resolve, 0))
}
page++
}
//
writeFile(wb, '客户金币明细.xlsx')
ElMessage.success(`导出成功,共${totalExported}条数据`)
} catch (error) { } catch (error) {
console.log('请求失败', error)
loading.value = false
if (!axios.isCancel(error)) {
ElMessage.error(`导出失败: ${error.message}`)
}
} finally {
isExporting.value = false
exportCancelToken.value = null
} }
} }
const areyouright = ref(false)
//
const cancelExport = () => {
if (exportCancelToken.value) {
exportCancelToken.value.cancel('用户取消导出')
ElMessage.warning('导出已取消')
isExporting.value = false
}
}
//
const area = [
{
value: '马来西亚',
label: '马来西亚'
},
{
value: '新加坡',
label: '新加坡'
},
{
value: '香港',
label: '香港'
},
{
value: '泰国',
label: '泰国'
},
{
value: '加拿大',
label: '加拿大'
},
{
value: '越南HCM',
label: '越南HCM'
const putExcel = ref({
startDate: new Date(),
endDate: new Date(new Date().setDate(new Date().getDate() + 1))
})
//
const checkJwCode = async (jwcode) => {
try {
const result = await API({
url: '/recharge/user',
method: 'post',
data: {
jwcode,
area: adminData.value.area
} }
]
//
})
// code
return result.code !== 0
} catch (error) {
console.log('校验精网号失败', error)
return false
}
}
//
const platform = [ const platform = [
{ {
value: '4', value: '4',
label: '金币系统' label: '金币系统'
}, },
{ {
value: '1', value: '1',
label: 'ERP系统' label: 'ERP系统'
@ -406,84 +436,12 @@ const platform = [
label: '初始化金币' label: '初始化金币'
} }
] ]
const TimeGet = ref('1')
//
const getT = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
putExcel.value.startDate = startDate
putExcel.value.endDate = endDate
console.log('putExcel', putExcel.value)
}
//3
const get3 = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 2
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
putExcel.value.startDate = startDate
putExcel.value.endDate = endDate
console.log('putExcel', putExcel.value)
}
// 7
const get7 = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
putExcel.value.startDate = startDate
putExcel.value.endDate = endDate
console.log('putExcel', putExcel.value)
}
// 30
const get30 = function () {
const today = new Date()
const startDate = new Date(
today.getFullYear(),
today.getMonth() - 1,
today.getDate()
)
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
putExcel.value.startDate = startDate
putExcel.value.endDate = endDate
console.log('putExcel', putExcel.value)
}
// //
const sortField = ref('') const sortField = ref('')
const sortOrder = ref('') const sortOrder = ref('')
// //
const handleSortChange = (column) => { const handleSortChange = (column) => {
console.log('排序字段:', column.prop)
console.log('排序方式:', column.order)
if (column.prop === 'rechargeCoin') { if (column.prop === 'rechargeCoin') {
sortField.value = 'recharge_coin' sortField.value = 'recharge_coin'
} else if (column.prop === 'taskCoin') { } else if (column.prop === 'taskCoin') {
@ -497,11 +455,14 @@ const handleSortChange = (column) => {
} }
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
} }
get() get()
const handlePageSizeChange = function (val) { const handlePageSizeChange = function (val) {
getObj.value.pageSize = val getObj.value.pageSize = val
get() get()
} }
const handleCurrentChange = function (val) { const handleCurrentChange = function (val) {
getObj.value.pageNum = val getObj.value.pageNum = val
get() get()
@ -509,73 +470,59 @@ const handleCurrentChange = function (val) {
</script> </script>
<template> <template>
<!-- 导出excel提前展示的信息面板 -->
<el-dialog <el-dialog
v-model="areyouright"
title=""
width="500"
v-model="showExportInfoPanel"
title="导出信息确认"
width="400px"
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<el-button type="success" @click="exportExcel()">导出</el-button>
<div class="info-panel-header">导出信息</div>
<div>你正在导出以下数据</div>
<!-- 直接使用 detailY 显示信息添加可选链操作符 -->
<!-- detailY是一个ref所以在模板中应该直接使用detailY.consumePlatform
而不是detailY.value.consumePlatform
因为在模板中ref变量会自动解包不需要.value
例如在代码中用户可能错误地在模板中使用了detailY.value但实际上应该直接使用detailY -->
<div v-if="detailY.jwcode">精网号{{ detailY.jwcode || '' }}</div>
<div v-if="detailY.consumePlatform">平台信息{{ detailY.consumePlatform ? (platform.find(item => item.value === detailY.consumePlatform)?.label) : '' }}</div>
<div v-if="detailY.num">数量更新类型{{ detailY.num ? (num.find(item => item.value === detailY.num)?.label || '') : '' }}</div>
<div v-if="detailY.area">所属地区{{ detailY.area || '' }}</div>
<div v-if="Array.isArray(getTime) && getTime.length >= 2">
<span>更新时间</span>
<!-- 直接使用 getTime 而非 getTime.value -->
<span v-if="Array.isArray(getTime) && getTime.length >= 2">
{{ moment(getTime[0]).format('YYYY-MM-DD') }} {{ moment(getTime[1]).format('YYYY-MM-DD') }}
</span>
<span v-else></span>
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="showExportInfoPanel = false">取消</el-button>
<el-button type="primary" @click="doExportExcel">导出</el-button>
</span>
</template>
</el-dialog> </el-dialog>
<!-- 这是导出excel的弹窗 -->
<!-- 导出进度弹窗 -->
<el-dialog <el-dialog
v-model="getPutEX"
title="请选择导出条件"
width="500"
v-model="isExporting"
title="正在导出"
width="400px"
:close-on-click-modal="false" :close-on-click-modal="false"
:show-close="false"
> >
<template #footer>
<el-form
v-loading="loading"
ref="ruleFormRef"
style="max-width: 600px"
:model="putExcel"
:rules="rules"
label-width="auto"
class="demo-ruleForm"
:size="formSize"
status-icon
>
<el-form-item prop="activityName" label="精网号:">
<el-input
v-model="putExcel.jwcode"
placeholder="请输入精网号"
style="width: 220px"
/>
</el-form-item>
<el-form-item label="所属地区:"
><el-select
v-model="putExcel.area"
placeholder="请选择所属地区"
style="width: 240px"
clearable
>
<el-option
v-for="item in area"
:key="item.value"
:label="item.label"
:value="item.value"
<el-progress
:percentage="exportProgress"
:stroke-width="15"
striped
animated
/> />
</el-select>
</el-form-item>
<el-form-item label="更新时间:">
<el-radio-group v-model="TimeGet">
<el-radio value="1" @click="getT()">今天</el-radio>
<el-radio value="3" @click="get3()">近三天</el-radio>
<el-radio value="7" @click="get7()">近一周</el-radio>
<el-radio value="30" @click="get30()">近一个月</el-radio>
</el-radio-group>
</el-form-item>
<el-button
type="primary"
size="small"
style="margin-left: 10px"
@click="areyour()"
>确定</el-button
>
</el-form>
<div class="export-status">
已导出 {{ Math.round((exportProgress / 100) * total) }} / {{ total }}
</div>
<template #footer>
<el-button type="danger" @click="cancelExport">取消导出</el-button>
</template> </template>
</el-dialog> </el-dialog>
@ -636,14 +583,15 @@ const handleCurrentChange = function (val) {
<el-select <el-select
v-model="detailY.area" v-model="detailY.area"
placeholder="请选择所属地区" placeholder="请选择所属地区"
style="width: 200px"
style="width: 240px"
clearable clearable
:loading="isLoadingArea"
> >
<el-option <el-option
v-for="item in area" v-for="item in area"
:key="item.value"
:label="item.label"
:value="item.value"
:key="item.value || item"
:label="item.label || item"
:value="item.value || item"
/> />
</el-select> </el-select>
</div> </div>
@ -658,12 +606,13 @@ const handleCurrentChange = function (val) {
range-separator="至" range-separator="至"
start-placeholder="起始时间" start-placeholder="起始时间"
end-placeholder="结束时间" end-placeholder="结束时间"
style="margin-right: 700px"
style="margin-right: 10px"
/> />
<el-button type="success" @click="getPutEX = true"
>导出Excel表格</el-button
>
<el-button @click="reset()">重置</el-button>
<el-button @click="getToday()"></el-button>
<el-button @click="getYesterday()"></el-button>
<el-button @click="get7Days()">近7天</el-button>
<el-button type="success" @click="exportExcel">导出Excel表格</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</el-card> </el-card>
@ -672,12 +621,6 @@ const handleCurrentChange = function (val) {
<el-row> <el-row>
<el-col> <el-col>
<el-card> <el-card>
<!-- <div>
现有金币永久金币{{ Math.abs(rechargeCoin) }}免费金币{{
Math.abs(freeCoin)
}}任务金币{{ Math.abs(taskCoin) }}
</div> -->
<!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 584px; overflow-y: auto"> <div style="height: 584px; overflow-y: auto">
<el-table <el-table
:data="tableData" :data="tableData"
@ -728,7 +671,7 @@ const handleCurrentChange = function (val) {
prop="gold" prop="gold"
label="更新数量" label="更新数量"
width="120" width="120"
sortable="custom"
sortable="custom"
> >
<template #default="scope"> <template #default="scope">
<span>{{ scope.row.gold / 100 }}</span> <span>{{ scope.row.gold / 100 }}</span>
@ -737,23 +680,15 @@ const handleCurrentChange = function (val) {
<el-table-column prop="updateType" label="更新类型" width="110"> <el-table-column prop="updateType" label="更新类型" width="110">
<!-- 模板内容 --> <!-- 模板内容 -->
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.updateType == 1">
<span>消费</span>
</span>
<span v-if="scope.row.updateType == 0">
<span>充值</span>
</span>
<span v-if="scope.row.updateType == 2">
<span>退款</span>
</span>
<span v-if="scope.row.updateType == 3">
<span>其他</span>
</span>
<span v-if="scope.row.updateType == 1">消费</span>
<span v-if="scope.row.updateType == 0">充值</span>
<span v-if="scope.row.updateType == 2">退款</span>
<span v-if="scope.row.updateType == 3">其他</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="rechargeCoin" prop="rechargeCoin"
sortable="custom"
sortable="custom"
label="永久金币" label="永久金币"
width="110" width="110"
> >
@ -763,7 +698,7 @@ const handleCurrentChange = function (val) {
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="freeCoin" prop="freeCoin"
sortable="custom"
sortable="custom"
label="免费金币" label="免费金币"
width="110" width="110"
> >
@ -771,10 +706,9 @@ const handleCurrentChange = function (val) {
<span>{{ scope.row.freeCoin / 100 }}</span> <span>{{ scope.row.freeCoin / 100 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="taskCoin" prop="taskCoin"
sortable="custom"
sortable="custom"
label="任务金币" label="任务金币"
width="110" width="110"
> >
@ -785,7 +719,7 @@ const handleCurrentChange = function (val) {
<el-table-column prop="name" label="提交人" width="110" /> <el-table-column prop="name" label="提交人" width="110" />
<el-table-column <el-table-column
prop="createTime" prop="createTime"
sortable="custom"
sortable="custom"
label="更新时间" label="更新时间"
width="210" width="210"
show-overflow-tooltip show-overflow-tooltip
@ -799,8 +733,7 @@ const handleCurrentChange = function (val) {
</el-table> </el-table>
</div> </div>
<!-- 分页 -->
<!-- 分页 -->
<!-- 此处分页 -->
<div class="pagination" style="margin-top: 20px"> <div class="pagination" style="margin-top: 20px">
<el-pagination <el-pagination
background background
@ -830,11 +763,24 @@ const handleCurrentChange = function (val) {
display: flex; display: flex;
} }
/* .head-card-element {
margin-right: 20px;
} */
.info-panel-header {
font-weight: bold;
margin-bottom: 10px;
}
.dialog-footer {
display: flex;
justify-content: flex-end;
}
.export-status {
margin-top: 15px;
text-align: center;
color: #666;
}
.el-progress-bar__inner {
transition: width 0.5s ease;
}
/* .head-card-btn {
margin-left: auto;
} */
</style> </style>

11
gold-system/src/views/usergoldInfo/index.vue

@ -1,4 +1,5 @@
<script setup> <script setup>
//
import { ref, onMounted, reactive, computed } from 'vue' import { ref, onMounted, reactive, computed } from 'vue'
import ElementPlus from 'element-plus' import ElementPlus from 'element-plus'
import { ElMessage, ElMessageBox } from 'element-plus' import { ElMessage, ElMessageBox } from 'element-plus'
@ -136,8 +137,16 @@ const get = async function (val) {
// //
} }
} }
// detailY putExcel jwcode
const trimJwCode = () => {
if (detailY.value.jwcode) {
detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, '');
}
}
// //
const search = function () { const search = function () {
trimJwCode();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
get() get()
} }
@ -278,7 +287,7 @@ const handleCurrentChange = function (val) {
</div> </div>
<div class="head-card-btn"> <div class="head-card-btn">
<el-button @click="reset()">重置</el-button>
<el-button type="success" @click="reset()">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button> <el-button type="primary" @click="search()">查询</el-button>
</div> </div>
</div> </div>

2
gold-system/src/views/workspace/index.vue

@ -1,6 +1,6 @@
<script setup> <script setup>
import * as echarts from 'echarts' import * as echarts from 'echarts'
//
import { ref, onMounted, reactive, computed } from 'vue' import { ref, onMounted, reactive, computed } from 'vue'
import { VscInfo } from 'vue-icons-plus/vsc' import { VscInfo } from 'vue-icons-plus/vsc'
import * as bs from 'vue-icons-plus/bs' import * as bs from 'vue-icons-plus/bs'

24
gold-system/stats.html
File diff suppressed because it is too large
View File

Loading…
Cancel
Save