Browse Source

登录做了修改,不需要验证登录,退款页面(基本完成,需要后端的退款类型接口、商品接口;以及计算明细的合计数的正确逻辑

lihui/feature-20250623144029-金币前端lihui
zry 4 days ago
parent
commit
2597185c27
  1. 4
      .env.development
  2. 79
      src/router/index.js
  3. 2
      src/views/audit/refundAudit.vue
  4. 270
      src/views/home.vue
  5. 20
      src/views/index.vue
  6. 47
      src/views/login.vue
  7. 3
      src/views/permissions/permission.vue
  8. 2
      src/views/recharge/coinRechargeDetail.vue
  9. 94
      src/views/refund/addCoinRefund.vue
  10. 383
      src/views/refund/coinRefundDetail.vue
  11. 5
      src/views/usergold/clientCountDetail.vue
  12. 2
      src/views/workspace/index.vue
  13. 3
      vite.config.ts

4
.env.development

@ -3,6 +3,6 @@
# 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.225:8080/'
VITE_API_BASE='http://192.168.8.94:8080/'
# VITE_API_BASE='http://192.168.8.247:8080/'
# VITE_API_BASE='http://192.168.8.94:8080/'
VITE_API_BASE='http://192.168.8.247:8081/'

79
src/router/index.js

@ -2,13 +2,13 @@ import { createRouter, createWebHashHistory } from 'vue-router';
const router = createRouter({
history: createWebHashHistory(),
routes: [
{ path: '/login', name: "login", component: () => import("../views/login.vue") },
{ path: '/', redirect: "/login" },
routes: [//此处在做登录之前做成默认跳转工作台
{ path: '/workspace', name: "workspace", component: () => import("../views/workspace/index.vue") },
{ path: '/', redirect: "/workspace" },
// { path: '/test', component: () => import("../views/z.vue") },
{
meta: { requireAuth: true },
path: '/index', component: () => import("../views/index.vue"),
path: '/', component: () => import("../views/home.vue"),
children: [
// 工作台
@ -76,42 +76,43 @@ const router = createRouter({
});
router.beforeEach((to, from, next) => {
const token = localStorage.getItem("token");
const permission = localStorage.getItem("permission");
if (to.name != "login" && !token) {
next({ name: "login" });
} else {
if (permission == "4" && to.name != "noPermission") {
next({ name: "noPermission" });
} else if (permission == "3") {
if (to.name == "addConsume" || to.name == "allConsume"
|| to.name == "addRecharge" || to.name == "adminRecharge" || to.name == "allRecharge"
|| to.name == "addRefund" || to.name == "allRefund"
|| to.name == "permissions") {
next({ name: "workspace" });
} else {
next();
}
} else if (permission == '2') {
if (to.name == "rechargeAudit" || to.name == "refundAudit"
|| to.name == "activity" || to.name == "rate"
|| to.name == "permissions") {
next({ name: "workspace" })
} else {
next();
}
} else if (permission == '5') {
if (to.name == "permissions") {
next({ name: "workspace" })
} else {
next();
}
}
else {
next();
}
// const token = localStorage.getItem("token");
// const permission = localStorage.getItem("permission");
// if (to.name != "login" && !token) {
// next({ name: "login" });
// } else {
// if (permission == "4" && to.name != "noPermission") {
// next({ name: "noPermission" });
// } else if (permission == "3") {
// if (to.name == "addConsume" || to.name == "allConsume"
// || to.name == "addRecharge" || to.name == "adminRecharge" || to.name == "allRecharge"
// || to.name == "addRefund" || to.name == "allRefund"
// || to.name == "permissions") {
// next({ name: "workspace" });
// } else {
// next();
// }
// } else if (permission == '2') {
// if (to.name == "rechargeAudit" || to.name == "refundAudit"
// || to.name == "activity" || to.name == "rate"
// || to.name == "permissions") {
// next({ name: "workspace" })
// } else {
// next();
// }
// } else if (permission == '5') {
// if (to.name == "permissions") {
// next({ name: "workspace" })
// } else {
// next();
// }
// }
// else {
// next();
// }
}
// }
next();
})
export default router;

2
src/views/audit/refundAudit.vue

@ -190,7 +190,7 @@ const fetchProducts = async () => {
//
const fetchAreas = async () => {
try {
const result = await request({ url: '/recharge/user/search' })
const result = await request({ url: 'http://192.168.8.247:8081/general/market' })
areaOptions.value = result.data || []
} catch (error) {
console.error('获取地区列表失败', error)

270
src/views/home.vue

@ -0,0 +1,270 @@
<script setup>
//
import { ref, onMounted, reactive, computed, watch } from 'vue'
import { useRouter } from 'vue-router'
import ElementPlus from 'element-plus'
import { VscGlobe } from 'vue-icons-plus/vsc'
import { ElMessage, ElMessageBox } from 'element-plus'
import axios from 'axios'
import API from '@/util/http'
import dmmn from '../assets/blue.png'
import { useRoute } from 'vue-router'
const router = useRouter()
const imgrule1 = dmmn
const messageVisible = ref(false)
//
const adminData = ref({
name: ''
})
const getAdminData = async function () {
try {
const result = await API({ url: '/admin/userinfo', data: {} })
adminData.value = result
console.log('请求成功', result)
console.log('用户信息', adminData.value)
} catch (error) {
console.log('请求失败', error)
}
}
//
const areas = ref([])
const currentArea = ref('全部')
const getAreas = async function () {
try {
const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
areas.value = result.data
console.log('请求成功', result)
} catch (error) {
console.log('请求失败', error)
}
}
//
const openMessage = function () {
messageVisible.value = true
}
const closeMessage = function () {
messageVisible.value = false
}
const message = function () {
openMessage()
}
// machineId
// function logout() {
// const machineId = localStorage.getItem('machineId')
// console.log('machineId:', machineId)
// localStorage.removeItem('token')
// // localStorage.clear();
// router.push('/login?machineId=' + machineId)
// //
// // window.location.reload();
// ElMessage.success('退')
// }
//
onMounted(async function () {
//
getAdminData()
//
getAreas()
})
//
const changeDataByArea = (item) => {
currentArea.value = item
}
//
const isCollapse = ref(false)
const handleOpen = (key, keyPath) => {
console.log(key, keyPath)
}
const handleClose = (key, keyPath) => {
console.log(key, keyPath)
}
</script>
<template>
<div class="common-layout">
<el-container>
<el-aside style="
width: 15%;
min-width: 180px;
position: fixed; /* 固定位置 */
top: 0;
left: 0;
height: 100vh; /* 高度占满视口 */
z-index: 100; /* 确保侧边栏在其他元素之上 */
">
<div class="logo">
<img src="../assets/新logo.png" alt="logo" style="width: 80px; height: 80px" />
<!-- <div style="font-size: 16px; font-weight: bold; color: black; text-align: center;" ><h1>海外金币管理系统</h1></div> -->
</div>
<el-card style="min-height: 90%;">
<el-radio-group v-model="isCollapse" style="margin-bottom: 20px">
<el-radio-button :value="false">扩展</el-radio-button>
<el-radio-button :value="true">收缩</el-radio-button>
</el-radio-group>
<el-menu :router="true" class="el-menu-vertical-demo" :collapse="isCollapse" @open="handleOpen" @close="handleClose">
<!-- 移除 v-if 权限验证 -->
<el-menu-item index="/workspace">
<el-icon><Folder /></el-icon>
<span>工作台</span>
</el-menu-item>
<!-- 移除 v-if 权限验证 -->
<el-sub-menu index="2">
<template #title>
<el-icon><Folder /></el-icon>
<span>财务审核</span>
</template>
<el-menu-item index="/rechargeAudit">充值审核</el-menu-item>
<el-menu-item index="/refundAudit">退款审核</el-menu-item>
</el-sub-menu>
<!-- 移除 v-if 权限验证 -->
<el-menu-item index="/rate">
<el-icon><Folder /></el-icon>
<span>汇率管理</span>
</el-menu-item>
<!-- 移除 v-if 权限验证 -->
<el-sub-menu index="4">
<template #title>
<el-icon><Folder /></el-icon>
<span>充值管理</span>
</template>
<el-menu-item index="/coinRecharge">金币充值</el-menu-item>
<el-menu-item index="/beanRecharge">金豆充值</el-menu-item>
</el-sub-menu>
<!-- 移除 v-if 权限验证 -->
<el-sub-menu index="6">
<template #title>
<el-icon>
<Folder />
</el-icon>
<span>消耗管理</span>
</template>
<el-menu-item index="/coinConsume">金币消耗</el-menu-item>
<el-menu-item index="/beanConsume">金豆消耗</el-menu-item>
</el-sub-menu>
<!-- 移除 v-if 权限验证 -->
<el-sub-menu index="8">
<template #title>
<el-icon>
<Folder />
</el-icon>
<span>退款管理</span>
</template>
<el-menu-item index="/coinRefund">金币退款</el-menu-item>
<el-menu-item index="/beanRefund">金豆退款</el-menu-item>
</el-sub-menu>
<!-- 移除 v-if 权限验证 -->
<el-menu-item index="/usergold">
<el-icon><Folder /></el-icon>
<span>客户账户明细</span>
</el-menu-item>
<!-- 移除 v-if 权限验证 -->
<el-menu-item index="/permissions">
<el-icon><Folder /></el-icon>
<span>权限管理</span>
</el-menu-item>
</el-menu>
</el-card>
</el-aside>
<el-container style="margin-left: 15%; min-width: 180px">
<!-- 修改 el-header 样式 -->
<el-header style="
position: fixed;
top: 0;
left: 15%;
right: 0;
z-index: 80;
background: white;
">
<el-menu class="el-menu-demo" mode="horizontal" :ellipsis="false">
<el-sub-menu index="1" class="admin">
<template #title>
<el-image :src="imgrule1" alt="错误" style="width: 50px; height: 50px" />
<span style="margin-left: 10px">{{ adminData.name }}</span>
</template>
<el-menu-item @click="message()">查看个人信息</el-menu-item>
<el-menu-item index="1-2" @click="logout">退出登录</el-menu-item>
</el-sub-menu>
</el-menu>
</el-header>
<!-- 修改 el-main 样式 -->
<el-main style="margin-top: 60px">
<!-- 60px el-header 的大致高度可根据实际情况调整 -->
<router-view></router-view>
</el-main>
</el-container>
</el-container>
</div>
<!-- 查看个人信息 -->
<el-dialog v-model="messageVisible" title="查看个人信息" width="500px">
<el-form :model="adminData">
<el-form-item label="用户姓名" label-width="100px" label-position="left">
<span class="message-font">{{ adminData.name }}</span>
</el-form-item>
<el-form-item label="精网号" label-width="100px" label-position="left">
<span class="message-font">{{ adminData.jwcode }}</span>
</el-form-item>
<el-form-item label="地区" label-width="100px" label-position="left">
<span class="message-font">{{ adminData.area }}</span>
</el-form-item>
<el-form-item label="注册时间" label-width="100px" label-position="left">
<span class="message-font">{{ adminData.createTime }}</span>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button text @click="closeMessage()">关闭</el-button>
</div>
</template>
</el-dialog>
</template>
<style scoped>
.message-font {
font-size: 16px;
font-weight: bold;
}
.admin {
margin-left: auto;
}
.el-aside {
min-height: 100vh;
width: 200px;
}
/* background-color: #BFD8D2; */
.logo {
margin: 20px 0px 20px 20px;
display: flex;
}
.el-menu-demo {
border: none; /* 去除边框 */
padding: 0; /* 去除内边距 */
float: right;
/* 将菜单向右浮动 */
}
.el-menu-vertical-demo:not(.el-menu--collapse) {
width: 240px;
min-height: 400px;
border: none; /* 去除边框 */
}
</style>

20
src/views/index.vue

@ -56,16 +56,16 @@ const message = function () {
// machineId
function logout() {
const machineId = localStorage.getItem('machineId')
console.log('machineId:', machineId)
localStorage.removeItem('token')
// localStorage.clear();
router.push('/login?machineId=' + machineId)
//
// window.location.reload();
ElMessage.success('退出成功')
}
// function logout() {
// const machineId = localStorage.getItem('machineId')
// console.log('machineId:', machineId)
// localStorage.removeItem('token')
// // localStorage.clear();
// router.push('/login?machineId=' + machineId)
// //
// // window.location.reload();
// ElMessage.success('退')
// }
//
onMounted(async function () {

47
src/views/login.vue

@ -27,9 +27,7 @@ getMachineId()
const router = useRouter() //
let formData = new FormData()
// FormData
// formData.append("jwcode", form.value.jwcode);
// formData.append("password", form.value.password);
const form = ref({ jwcode: '', password: '', token: '', machineId: machineId })
//
@ -63,7 +61,7 @@ const login = async function () {
} catch (error) {
console.log('请求失败', error)
ElMessage.error('登录失败,请检查账号密码')
//
}
}
@ -78,7 +76,7 @@ const login = async function () {
class="bg"
fit="fit"
/>
<!-- <div style="height: 100vh; width: 1000px" class="container"></div> -->
<el-col :span="6" :offset="3" class="form">
<!-- 登录表单 -->
<el-form :model="form" size="large" autocomplete="off" >
@ -113,18 +111,13 @@ const login = async function () {
</svg>
<p class="text">登录</p>
</button>
<!-- <el-button
class="button"
type="primary"
auto-insert-space
@click="login()"
>登录</el-button
> -->
</el-form-item>
</el-form>
</el-col>
</el-row>
</template>
<style scoped>
.bg {
border-radius: 0 20px 20px 0;
@ -201,21 +194,6 @@ const login = async function () {
fill: #007acc;
}
/* .box {
padding: 20px;
border-radius: 10px;
background-color: #fff;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
} */
/* From Uiverse.io by marsella_3472 */
/*
More comprehensive version at shenanigans.shoghisimon.ca/collection/css
*/
/* From Uiverse.io by SelfMadeSystem */
.container {
width: 100%;
height: 100%;
@ -226,18 +204,3 @@ More comprehensive version at shenanigans.shoghisimon.ca/collection/css
}
</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>
-->

3
src/views/permissions/permission.vue

@ -157,7 +157,7 @@ const openPermissionAddVisible = function () {
//
const closePermissionAddVisible = function () {
// reset() ...resetreset
//
//
addAdmin.value = {
account: '',
name: '',
@ -170,7 +170,6 @@ const closePermissionAddVisible = function () {
};
permissionAddVisible.value = false;
//
Ref.value.resetFields();
}

2
src/views/recharge/coinRechargeDetail.vue

@ -343,7 +343,7 @@ const getActivity = async function () {
const getArea = async function () {
try {
// POST
const result = await API({ url: 'recharge/user/search', data: {} })
const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
//
console.log('请求成功', result)
//

94
src/views/refund/addCoinRefund.vue

@ -145,27 +145,24 @@ const getUser = async function (jwcode) {
const result = await API({
url: 'http://192.168.8.247:8081/user/selectUser',
data: {
jwcode: addRefund.value.jwcode,
area: adminData.value.area
jwcode: addRefund.value.jwcode
}
})
console.log('请求成功', result)
//
if (result.code === 0) {
//ElMessage.error(result.msg)
ElMessage.error(result.msg);
} else if (result.data === null) {
ElMessage.error("用户不存在");
} else {
user.value = result.data
user.value.A =
Number(user.value.pendingRechargeTimes) +
Number(user.value.pendingSpendTimes)
console.log('用户信息', user.value)
//ElMessage.success(result.msg)
user.value = result.data;
console.log("用户信息", user.value);
ElMessage.success(result.msg);
}
} catch (error) {
console.log('请求失败', error)
ElMessage.error('查询失败,请检查精网号是否正确')
console.log("请求失败", error);
ElMessage.error("查询失败,请检查精网号是否正确");
//
}
}
@ -188,25 +185,46 @@ const AAA = computed(() => {
watch(AAA, (newVal) => {})
// 退
const refundType = [
{
value: '退款商品',
label: '退款商品'
// const refundType = [
// {
// value: '退',
// label: '退'
// }
// ]
// 退
const refundType = ref([])
// 退
const getRefundTypes = async function () {
try {
// 退
const result = await API({
// url: 'http://192.168.8.247:8081/', //退
data: {} })
console.log('退款类型请求成功', result)
// refundType
refundType.value = result.data.map(item => ({
value: item.value,
label: item.label
}))
console.log('退款类型', refundType.value)
} catch (error) {
console.log('退款类型请求失败', error)
}
]
}
//
//
const goods = ref([])
const getGoods = async function (jwcode) {
trimJwCode();
try {
// POST
const result = await API({
url: '/consume/getDeatil',
url: 'http://39.101.133.168:8828/live_mall/api/product/all',
data: {
jwcode: addRefund.value.jwcode,
area: adminData.value.area
market: adminData.value.market
}
})
console.log('请求成功', result)
@ -217,7 +235,7 @@ const getGoods = async function (jwcode) {
//
goods.value = result.data
console.log('用户信息', goods.value)
ElMessage.success(result.msg)
//ElMessage.success(result.msg)
}
} catch (error) {
console.log('请求失败', error)
@ -403,7 +421,7 @@ onMounted(async function () {
</el-form>
<!-- 客户信息栏 -->
<el-card style="width: 850px; float: right" class="customer-info">
<el-card v-if=user.jwcode style="width: 850px; float: right" class="customer-info">
<el-form
:model="user"
label-width="auto"
@ -420,8 +438,8 @@ onMounted(async function () {
<el-col :span="14">
<el-form-item label="历史金币总数">
<!-- 检查 user.totalRechargeGold 是否为有效的数字 -->
<p v-if="!isNaN(Number(user.totalRechargeGold))">
{{ Number(user.totalRechargeGold / 100) }}
<p v-if="!isNaN(Number(user.historySumGold))">
{{ Number(user.historySumGold) }}
</p>
<!-- 如果不是有效的数字显示默认值 -->
<p v-else></p>
@ -436,30 +454,30 @@ onMounted(async function () {
<el-form-item label="当前金币总数" style="width: 500px">
<span
style="color: #2fa1ff; margin-right: 5px"
v-if="user.buyJb !== undefined"
v-if="user.nowSumGold !== undefined"
>{{
(user.buyJb + user.free6 + user.free12 + user.coreJb) / 100
(user.nowSumGold)
}}</span
>
<span
style="display: inline; white-space: nowrap; color: #b1b1b1"
v-if="user.buyJb !== undefined"
>(永久金币:{{ user.buyJb / 100 }};免费金币:{{
(user.free6 + user.free12) / 100
}};任务金币:{{ user.coreJb / 100 }})</span
v-if="user.nowPermanentGold !== undefined"
>(永久金币:{{ user.nowPermanentGold }};免费金币:{{
(user.nowFreeGold)
}};任务金币:{{ user.nowTaskGold}})</span
>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="首次充值日期">
<p v-if="user.firstRechargeDate">
{{ moment(user.firstRechargeDate).format('YYYY-MM-DD HH:mm:ss') }}
<p v-if="user.firstRecharge">
{{ moment(user.firstRecharge).format('YYYY-MM-DD HH:mm:ss') }}
</p>
</el-form-item>
</el-col>
<el-col :span="14">
<el-form-item label="充值次数">
<p style="color: #2fa1ff">{{ user.rechargeTimes }}</p>
<p style="color: #2fa1ff">{{ user.rechargeNum }}</p>
</el-form-item>
</el-col>
<!-- <el-col :span="10">
@ -469,20 +487,16 @@ onMounted(async function () {
</el-col> -->
<el-col :span="10">
<el-form-item label="消费次数">
<p style="color: #2fa1ff">{{ user.spendTimes }}</p>
<p style="color: #2fa1ff">{{ user.consumeNum }}</p>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="所属门店">
<p>{{ adminData.area }}</p>
<p>{{ user.market }}</p>
</el-form-item>
</el-col>
<el-col :span="14">
<!-- <el-form-item label="待审核">
<p style="color: #2fa1ff">
{{ user.A }}
</p>
</el-form-item> -->
</el-col>
</el-row>
</el-form>

383
src/views/refund/coinRefundDetail.vue

@ -25,7 +25,7 @@ const getAdminData = async function () {
const tableData = ref([])
// ======================================
// detail
const detail = ref({})
const refundUser = ref({})
//
const getObj = ref({
pageNum: 1,
@ -35,135 +35,96 @@ const getObj = ref({
const total = ref(100)
//
const getTime = ref([])
//
const allData = ref([])
//
const area = ref([])
const market = ref([])
//
const permanentGolds = ref(0)
const freeGolds = ref(0)
const taskGolds = ref(0)
//
const activeName = ref('all')
//
const sumGold = computed(() => permanentGolds.value + freeGolds.value + taskGolds.value)
// 退
const consumeType = [
{
value: '退款商品',
label: '退款商品'
}
]
const refundType = ref([])
// //
// const tableHeight = computed(function () {
// return (getObj.value.pageSize + 2) * 45 + "px";
// });
//
const formatTime = (val) => val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : ''
// 退
const getRefundTypes = async function () {
try {
// 退
const result = await API({
// url: 'http://192.168.8.247:8081/', //退
data: {} })
console.log('退款类型请求成功', result)
// refundType
refundType.value = result.data.map(item => ({
value: item.value,
label: item.label
}))
console.log('退款类型', refundType.value)
} catch (error) {
console.log('退款类型请求失败', error)
}
}
//
//
const trueGold = ref(0)
const trueRgold = ref(0)
const trueFgold = ref(0)
const trueTgold = ref(0)
//
const pendingRgold = ref(0)
const pendingFgold = ref(0)
const pendingTgold = ref(0)
//
const pendingGold = ref(0)
//
const approvedRgold = ref(0)
const approvedFgold = ref(0)
const approvedTgold = ref(0)
//
const approvedGold = ref(0)
//
const rejectedRgold = ref(0)
const rejectedFgold = ref(0)
const rejectedTgold = ref(0)
//
const rejectedGold = ref(0)
// ==============================================================
//
const get = async function (val) {
const getSelectBy = async function (val) {
try {
//
if (adminData.value.area === '泰国') {
detail.value.areas = ['泰国', '越南']
} else if (adminData.value.area !== '总部') {
detail.value.area = adminData.value.area
}
//
if (typeof val === 'number') {
getObj.value.pageNum = val
}
//
if (getTime.value != null) {
if (getTime.value.startDate != '' && getTime.value.endDate != '') {
detail.value.startDate = getTime.value[0]
detail.value.endDate = getTime.value[1]
if (getTime.value.startTime != '' && getTime.value.endTime != '') {
refundUser.value.startTime = formatTime(getTime.value[0])
refundUser.value.endTime = formatTime(getTime.value[1])
}
} else {
detail.value.startDate = ''
detail.value.endDate = ''
refundUser.value.startTime = ''
refundUser.value.endTime = ''
}
//
detail.value.sortField = sortField.value
detail.value.sortOrder = sortOrder.value
refundUser.value.sortField = sortField.value
refundUser.value.sortOrder = sortOrder.value
console.log('搜索参数', getObj.value)
// POST
const result = await API({
url: '/refund/search',
url: 'http://192.168.8.247:8081/refund/selectBy',
data: {
...getObj.value,
detail: { ...detail.value }
refundUser: { ...refundUser.value }
}
})
// detail.value
const detailWithoutSort = { ...detail.value }
// refundUser.value
const detailWithoutSort = { ...refundUser.value }
delete detailWithoutSort.sortField
delete detailWithoutSort.sortOrder
const result2 = await API({
url: '/refund/RefundA',
const resultTotalGold = await API({
url: 'http://192.168.8.247:8081/refund/statsGold',
data: {
...detailWithoutSort
...detailWithoutSort
}
})
//
if (result2.data) {
result2.data.forEach((item) => {
switch (item.status) {
case '待审核':
// item.raudit 0
pendingRgold.value = item.sumRaudit1 || 0
pendingFgold.value = item.sumRaudit2 || 0
pendingTgold.value = item.sumRaudit3 || 0
// item.sumRaudit 0
pendingGold.value = item.sumRaudit || 0
break
case '已通过':
approvedRgold.value = item.sumRaudit1 || 0
approvedFgold.value = item.sumRaudit2 || 0
approvedTgold.value = item.sumRaudit3 || 0
approvedGold.value = item.sumRaudit || 0
break
case '已驳回':
rejectedRgold.value = item.sumRaudit1 || 0
rejectedFgold.value = item.sumRaudit2 || 0
rejectedTgold.value = item.sumRaudit3 || 0
rejectedGold.value = item.sumRaudit || 0
break
}
})
//
console.log('resultTotalGold请求成功', resultTotalGold)
// code 200 data
if (resultTotalGold.code === 200 && resultTotalGold.data) {
const data = resultTotalGold.data
console.log('获取到的金币数据:', data)
permanentGolds.value = Number(data.permanentGolds) || 0
freeGolds.value = Number(data.freeGolds) || 0
taskGolds.value = Number(data.taskGolds) || 0
}
trueFgold.value =
pendingFgold.value + approvedFgold.value + rejectedFgold.value
trueRgold.value =
pendingRgold.value + approvedRgold.value + rejectedRgold.value
trueTgold.value =
pendingTgold.value + approvedTgold.value + rejectedTgold.value
trueGold.value = pendingGold.value + approvedGold.value + rejectedGold.value
//
console.log('请求成功', result)
//
tableData.value = result.data.list
console.log('tableData', tableData.value)
@ -180,15 +141,16 @@ const get = async function (val) {
//
const search = function () {
getObj.value.pageNum = 1
get()
getSelectBy()
}
//
const reset = function () {
detail.value.refundGoods = ''
detail.value.refundType = ''
detail.value.area = ''
detail.value.startDate = ''
detail.value.endDate = ''
refundUser.value.jwcode= ''
refundUser.value.goodsName = ''
refundUser.value.refundType = ''
refundUser.value.market = ''
refundUser.value.startTime = ''
refundUser.value.endTime = ''
sortField.value = ''
sortOrder.value = ''
getTime.value = {}
@ -196,103 +158,56 @@ const reset = function () {
//
const getToday = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate()
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
getSelectBy()
}
//
const getYesterday = function () {
const yesterday = new Date()
yesterday.setDate(yesterday.getDate() - 1)
const startDate = new Date(
const startTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate()
)
const endDate = new Date(
const endTime = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
yesterday.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
getSelectBy()
}
// 7
const get7Days = function () {
const today = new Date()
const startDate = new Date(
const startTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() - 6
)
const endDate = new Date(
const endTime = new Date(
today.getFullYear(),
today.getMonth(),
today.getDate() + 1
)
getTime.value = [startDate, endDate]
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
get()
getSelectBy()
}
//
const adminAll = function () {
console.log('adminAll')
detail.value.status = ''
getObj.value.pageNum = 1
get()
trueFgold.value =
pendingFgold.value + approvedFgold.value + rejectedFgold.value
trueRgold.value =
pendingRgold.value + approvedRgold.value + rejectedRgold.value
trueTgold.value =
pendingTgold.value + approvedTgold.value + rejectedTgold.value
trueGold.value = pendingGold.value + approvedGold.value + rejectedGold.value
}
//
const adminWait = async function () {
detail.value.status = 0
getObj.value.pageNum = 1
await get()
console.log('adminWait')
trueFgold.value = pendingFgold.value
trueRgold.value = pendingRgold.value
trueTgold.value = pendingTgold.value
trueGold.value = pendingGold.value
}
//
const adminPass = async function () {
detail.value.status = 1
getObj.value.pageNum = 1
await get()
console.log('adminPass')
trueFgold.value = approvedFgold.value
trueRgold.value = approvedRgold.value
trueTgold.value = approvedTgold.value
trueGold.value = approvedGold.value
}
//
const adminReject = async function () {
detail.value.status = 2
getObj.value.pageNum = 1
await get()
console.log('adminReject')
trueFgold.value = rejectedFgold.value
trueRgold.value = rejectedRgold.value
trueTgold.value = rejectedTgold.value
trueGold.value = rejectedGold.value
}
//
// tab.props.nameall
const tabName = ref('all')
@ -312,15 +227,14 @@ const handleClick = function (tab, event) {
const getArea = async function () {
try {
// POST
const result = await API({ url: '/recharge/user/search', data: {} })
const result = await API({ url: 'http://192.168.8.247:8081/general/market', data: {} })
//
console.log('请求成功', result)
//
area.value = result.data
console.log('地区', area.value)
market.value = result.data
console.log('地区', market.value)
} catch (error) {
console.log('请求失败', error)
//
}
}
@ -342,7 +256,7 @@ const delConfirm = async function () {
//
console.log('请求成功', result)
//
get()
getSelectBy()
} catch (error) {
console.log('请求失败', error)
//
@ -359,8 +273,8 @@ const getGoods = async function () {
console.log('请求成功', result)
//
goods.value = result.data
console.log('allData', allData.value)
console.log('地区', area.value)
console.log('地区', market.value)
} catch (error) {
console.log('请求失败', error)
//
@ -378,7 +292,7 @@ const checkNumber = function () {
) {
getObj.value.pageNum = parseInt(getObj.value.pageNum)
console.log('输入的数字合法')
get()
getSelectBy()
} else {
//
ElMessage({
@ -397,8 +311,9 @@ const checkNumber = function () {
//
onMounted(async function () {
await getAdminData()
await get()
await getSelectBy()
await getArea()
await getRefundTypes()
})
//
const sortField = ref('')
@ -407,27 +322,27 @@ const sortOrder = ref('')
const handleSortChange = (column) => {
console.log('排序字段:', column.prop)
console.log('排序方式:', column.order)
if (column.prop === 'rechargeCoin') {
sortField.value = 'recharge_coin'
} else if (column.prop === 'taskCoin') {
sortField.value = 'task_coin'
} else if (column.prop === 'freeCoin') {
sortField.value = 'free_coin'
if (column.prop === 'permanentGold') {
sortField.value = 'permanent_gold'
} else if (column.prop === 'taskGold') {
sortField.value = 'task_gold'
} else if (column.prop === 'freeGold') {
sortField.value = 'free_gold'
} else if (column.prop === 'createTime') {
sortField.value = 'create_time'
} else if (column.prop === 'auditTime') {
sortField.value = 'audit_time'
}
sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
get()
getSelectBy()
}
const handlePageSizeChange = function (val) {
getObj.value.pageSize = val
get()
getSelectBy()
}
const handleCurrentChange = function (val) {
getObj.value.pageNum = val
get()
getSelectBy()
}
</script>
@ -441,7 +356,7 @@ const handleCurrentChange = function (val) {
<el-text class="mx-1" size="large">精网号</el-text>
<el-input
v-model="detail.jwcode"
v-model="refundUser.jwcode"
placeholder="请输入精网号"
size="large"
style="width: 150px"
@ -453,14 +368,14 @@ const handleCurrentChange = function (val) {
<div class="head-card-element">
<el-text class="mx-1" size="large">退款类型</el-text>
<el-select
v-model="detail.refundType"
v-model="refundUser.refundType"
placeholder="请选择退款类型"
size="large"
style="width: 180px"
clearable
>
<el-option
v-for="item in consumeType"
v-for="item in refundType"
:key="item.value"
:label="item.label"
:value="item.value"
@ -472,7 +387,7 @@ const handleCurrentChange = function (val) {
<div class="head-card-element">
<el-text class="mx-1" size="large">退款商品</el-text>
<el-select
v-model="detail.refundGoods"
v-model="refundUser.goodsName"
placeholder="请选择退款商品"
size="large"
style="width: 180px"
@ -489,17 +404,17 @@ const handleCurrentChange = function (val) {
</div>
</el-col>
<el-col :span="6">
<div class="head-card-element" v-if="adminData.area == '总部'">
<div class="head-card-element">
<el-text class="mx-1" size="large">所属地区</el-text>
<el-select
v-model="detail.area"
v-model="refundUser.market"
placeholder="请选择所属地区"
size="large"
style="width: 180px"
clearable
>
<el-option
v-for="item in area"
v-for="item in market"
:key="item"
:label="item"
:value="item"
@ -537,23 +452,11 @@ const handleCurrentChange = function (val) {
<el-row>
<el-col>
<el-card>
<!-- <el-tabs
v-model="activeName"
type="card"
class="demo-tabs"
@tab-click="handleClick"
>
<el-tab-pane label="全部" name="all"></el-tab-pane>
<el-tab-pane label="待审核" name="wait"></el-tab-pane>
<el-tab-pane label="已通过" name="pass"></el-tab-pane>
<el-tab-pane label="已驳回" name="reject"></el-tab-pane>
</el-tabs> -->
<div>
退款金币总数{{ Math.abs(trueGold) }}永久金币{{
Math.abs(truePgold)
}}免费金币{{ Math.abs(trueFgold) }}任务金币{{
Math.abs(trueTgold)
退款金币总数{{ Math.abs(sumGold) }}永久金币{{
Math.abs(permanentGolds)
}}免费金币{{ Math.abs(freeGolds) }}任务金币{{
Math.abs(taskGolds)
}}
</div>
<!-- 设置表格容器的高度和滚动样式 -->
@ -577,7 +480,7 @@ const handleCurrentChange = function (val) {
</template>
</el-table-column>
<el-table-column
prop="username"
prop="name"
label="姓名"
fixed="left"
width="100px"
@ -588,34 +491,36 @@ const handleCurrentChange = function (val) {
fixed="left"
width="110px"
/>
<el-table-column prop="area" label="所属地区" width="110px" />
<el-table-column prop="refundGoods" label="商品名称" width="100px" />
<el-table-column prop="market" label="所属地区" width="110px" />
<el-table-column prop="goodsName" label="商品名称" width="100px" />
<el-table-column prop="refundType" label="退款类型" width="100px" />
<el-table-column label="退款金币总数" width="110px">
<template #default="scope">
{{
scope.row.rechargeCoin +
scope.row.freeCoin +
scope.row.taskCoin
scope.row.sumGold
}}
</template>
</el-table-column>
<el-table-column prop="typeR" label="退款方式" width="110px"/>
<el-table-column prop="refundModel" label="退款方式" width="110px">
<template #default="scope">
{{ scope.row.refundModel === 1 ? '全部退款' : scope.row.refundModel === 2 ? '部分退款' : '' }}
</template>
</el-table-column>
<el-table-column
prop="rechargeCoin"
prop="permanentGold"
label="永久金币"
width="110px"
sortable="“custom”"
/>
<el-table-column
prop="freeCoin"
prop="freeGold"
sortable="“custom”"
label="免费金币"
width="110px"
/>
<el-table-column
prop="taskCoin"
prop="taskGold"
sortable="“custom”"
label="任务金币"
width="110px"
@ -628,34 +533,7 @@ const handleCurrentChange = function (val) {
show-overflow-tooltip
/>
<el-table-column prop="adminName" label="提交人" width="100px" />
<!-- <el-table-column prop="status" label="审核状态" width="120px">
<template #default="scope">
<span v-if="scope.row.status == 1">
<div class="status">
<span class="green-dot"></span>
<span>已通过</span>
</div>
</span>
<span v-if="scope.row.status == 0">
<div class="status">
<span class="grey-dot"></span>
<span>待审核</span>
</div>
</span>
<span v-if="scope.row.status == 2">
<div class="status">
<span class="red-dot"></span>
<span>已驳回</span>
</div>
</span>
</template>
</el-table-column>
<el-table-column
prop="reson"
label="驳回理由"
width="200px"
show-overflow-tooltip
/> -->
<el-table-column
prop="createTime"
sortable="“custom”"
@ -666,31 +544,6 @@ const handleCurrentChange = function (val) {
{{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
</template>
</el-table-column>
<!-- <el-table-column
prop="operation"
label="操作"
fixed="right"
width="120px"
>
<template #default="scope">
<el-popconfirm
title="确定将此条活动删除吗?"
@confirm="delConfirm"
>
<template #reference>
<el-button type="primary" text @click="del(scope.row)">
删除
</el-button>
</template>
<template #actions="{ delConfirm, cancel }">
<el-button size="small" @click="cancel">取消</el-button>
<el-button type="primary" size="small" @click="delConfirm">
确定
</el-button>
</template>
</el-popconfirm>
</template>
</el-table-column> -->
</el-table>
</div>

5
src/views/usergold/clientCountDetail.vue

@ -157,6 +157,11 @@ const get = async function (val) {
console.log('搜索参数', getObj.value)
// POST
// jwcode
console.log('jwcode 类型:', typeof goldDetail.value.jwcode);
console.log('jwcode 值:', goldDetail.value.jwcode);
const requestData = { ...getObj.value, goldDetail: { ...goldDetail.value } };
console.log('最终请求参数', JSON.stringify(requestData, null, 2)); //

2
src/views/workspace/index.vue

@ -223,7 +223,7 @@ const handleDateRangeChange = () => {
const getAreas = async () => {
try {
const result = await API({
url: '/recharge/user/search',
url: 'http://192.168.8.247:8081/general/market',
data: {}
})
middleCategory.value = result.data.map(item => item.name)

3
vite.config.ts

@ -39,6 +39,9 @@ export default defineConfig(({ mode }) => {
]
})
],
server: {
host: true // 允许外部设备访问
},
resolve: {
alias: {
'@': path.resolve(__dirname, './src')

Loading…
Cancel
Save