Browse Source

0512 merge success gogo test

main
zry 6 days ago
parent
commit
875359c192
  1. 415
      gold-system/src/views/audit/rechargeAudit.vue
  2. 2
      gold-system/src/views/audit/refundAudit.vue
  3. 24
      gold-system/src/views/consume/addConsume.vue
  4. 5
      gold-system/src/views/goldBeen/onLineDetail.vue
  5. 6
      gold-system/src/views/index.vue
  6. 181
      gold-system/src/views/managerecharge/rate.vue
  7. 3
      gold-system/src/views/permissions/index.vue
  8. 214
      gold-system/src/views/recharge/addRecharge.vue
  9. 5
      gold-system/src/views/workspace/index.vue

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

@ -8,7 +8,29 @@ import request from '@/util/http'
import moment from 'moment'
import API from '../../api/index.js'
//
//
const columnOptions = ref([
{ prop: 'username', label: '姓名', width: 125 },
{ prop: 'jwcode', label: '精网号', width: 125 },
{ prop: 'area', label: '所属地区', width: 125 },
{ prop: 'activityName', label: '活动名称', width: 150 },
{ prop: 'rechargeGold', label: '充值金额', width: 125, sortable: true },
{ prop: 'rechargeWay', label: '充值方式', width: 125 },
{ prop: 'paidGold', label: '永久金币', width: 125, sortable: true },
{ prop: 'freeGold', label: '免费金币', width: 125, sortable: true },
{ prop: 'remark', label: '备注', width: 200, showOverflowTooltip: true },
{ prop: 'payWay', label: '支付方式', width: 125 },
{ prop: 'rechargeVoucher', label: '支付凭证', width: 125 },
{ prop: 'name', label: '提交人', width: 125 },
{ prop: 'status', label: '审核状态', width: 125 },
{ prop: 'reson', label: '驳回理由', width: 200 },
{ prop: 'rechargeTime', label: '交款时间', width: 200, sortable: true },
{ prop: 'createTime', label: '提交时间', width: 200, sortable: true }
])
//
const defaultColumns = ['username', 'jwcode', 'area', 'status', 'operation']
const selectedColumns = ref([...defaultColumns])
//
const adminData = ref({})
const getAdminData = async function () {
@ -566,76 +588,40 @@ const trimJwCode = () => {
<el-col :span="6">
<div class="head-card-element">
<el-text class="mx-1" size="large">精网号</el-text>
<el-input
v-model="rechargeVo.jwcode"
placeholder="请输入精网号"
size="large"
style="width: 240px"
clearable
/>
<el-input v-model="rechargeVo.jwcode" placeholder="请输入精网号" style="width: 240px" clearable />
</div>
</el-col>
<el-col :span="6">
<div class="head-card-element">
<el-text class="mx-1" size="large">活动名称</el-text>
<el-select
v-model="rechargeVo.activityId"
placeholder="请选择活动名称"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in activity"
:key="item.activityId"
:label="item.activityName"
:value="item.activityId"
/>
<el-select v-model="rechargeVo.activityId" placeholder="请选择活动名称" style="width: 240px"
clearable>
<el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
:value="item.activityId" />
</el-select>
</div>
</el-col>
<el-col :span="6">
<div class="head-card-element">
<el-text class="mx-1" size="large">支付方式</el-text>
<el-select
v-model="rechargeVo.payWay"
placeholder="请选择支付方式"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in payWay"
:key="item.value"
:label="item.label"
:value="item.value"
/>
<el-select v-model="rechargeVo.payWay" placeholder="请选择支付方式" style="width: 240px" clearable>
<el-option v-for="item in payWay" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</div>
</el-col>
<el-col :span="6">
<div class="head-card-element" v-if="adminData.area == '总部'">
<el-text class="mx-1" size="large">所属地区</el-text>
<el-select
v-model="rechargeVo.area"
placeholder="请选择所属地区"
size="large"
style="width: 240px"
clearable
>
<el-option
v-for="item in area"
:key="item"
:label="item"
:value="item"
/>
<el-select v-model="rechargeVo.area" placeholder="请选择所属地区" style="width: 240px" clearable>
<el-option v-for="item in area" :key="item" :label="item" :value="item" />
</el-select>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="21">
<div class="head-card-element">
<el-col :span="16">
<div class="time-controls">
<div class="time-group">
<el-text class="mx-1" size="large">充值时间</el-text>
<el-date-picker
v-model="getTime"
@ -643,18 +629,27 @@ const trimJwCode = () => {
range-separator="至"
start-placeholder="起始时间"
end-placeholder="结束时间"
style="width: 400px"
/>
<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 @click="getToday()" style="margin-left: 10px"> </el-button>
<el-button @click="getYesterday()" style="margin-left: 10px"> </el-button>
<el-button @click="get7Days()" style="margin-left: 10px"> 近7天 </el-button>
</div>
</el-col>
<el-col :span="3">
<div class="head-card-btn">
<el-button @click="reset()" type="success">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>
</div>
</el-col>
<el-col :span="8">
<el-button @click="reset()" type="success" style="margin-right: 10px">重置</el-button>
<el-button type="primary" @click="search()">查询</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="21">
<div>
<el-text class="mx-1" size="large">显示列</el-text>
<el-select v-model="selectedColumns" multiple placeholder="请选择显示列" size="large" style="width: 800px">
<el-option v-for="item in columnOptions" :key="item.prop" :label="item.label" :value="item.prop" />
</el-select>
</div>
</el-col>
</el-row>
@ -664,12 +659,7 @@ const trimJwCode = () => {
<el-row>
<el-col>
<el-card>
<el-tabs
v-model="activeName"
type="card"
class="demo-tabs"
@tab-click="handleClick"
>
<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>
@ -678,161 +668,65 @@ const trimJwCode = () => {
<div>
总条数{{ trueCount }}总金币数{{
formattedTrueGold
}}金币永久金币{{ formattedTrueRGold }}金币免费金币{{ formattedTrueFGold }}金币
}}金币永久金币{{ formattedTrueRGold }}金币免费金币{{ formattedTrueFGold }}金币
</div>
</el-tabs>
<div style="height: 540px; overflow-y: auto">
<el-table
:data="tableData"
style="width: 100%"
height="540px"
@sort-change="handleSortChange"
>
<el-table-column
type="index"
label="序号"
width="100px"
fixed="left"
>
<el-table :data="tableData" style="width: 100%" height="540px" @sort-change="handleSortChange" :row-style="{ height: '50px' }">
<el-table-column type="index" label="序号" width="100px" fixed="left">
<template #default="scope">
<span>{{
scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
}}</span>
</template>
</el-table-column>
<el-table-column prop="username" label="姓名" width="100px" />
<el-table-column prop="jwcode" label="精网号" width="110px" />
<el-table-column prop="area" label="所属地区" width="100px" />
<el-table-column
prop="activityName"
label="活动名称"
width="150px"
/>
<el-table-column
prop="rechargeGold"
label="充值金额"
sortable="“custom”"
width="110px"
>
<template #default="scope">
{{ scope.row.rechargeGold }}
</template>
</el-table-column>
<el-table-column
prop="rechargeWay"
label="充值方式"
width="110px"
/>
<el-table-column
prop="paidGold"
label="永久金币"
sortable="“custom”"
width="110px"
>
<template #default="scope">
{{ scope.row.paidGold / 100 }}
</template>
</el-table-column>
<el-table-column
prop="freeGold"
label="免费金币"
sortable="“custom”"
width="110px"
>
<template #default="scope">
{{ scope.row.freeGold / 100 }}
</template>
</el-table-column>
<el-table-column
prop="remark"
label="备注"
width="200px"
show-overflow-tooltip
/>
<el-table-column prop="payWay" label="支付方式" width="100px" />
<el-table-column
prop="rechargeVoucher"
label="支付凭证"
width="150px"
>
<template #default="scope">
<el-image
:src="scope.row.rechargeVoucher"
alt="凭证"
style="width: 50px; height: 50px"
/>
</template>
</el-table-column>
<el-table-column prop="name" label="提交人" width="100px" />
<el-table-column prop="status" label="审核状态" width="100px">
<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="rechargeTime"
label="交款时间"
sortable="“custom”"
width="200px"
>
<template #default="scope">
{{
moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss')
}}
</template>
</el-table-column>
<el-table-column
prop="createTime"
label="提交时间"
sortable="“custom”"
width="200px"
/>
<el-table-column
fixed="right"
prop="operation"
label="操作"
width="150px"
>
<!-- 动态列 -->
<template v-for="col in columnOptions" :key="col.prop">
<el-table-column v-if="selectedColumns.includes(col.prop)" :prop="col.prop" :label="col.label"
:width="col.width" :sortable="col.sortable ? 'custom' : false"
:show-overflow-tooltip="true" >
<template #default="scope">
<!-- 特殊列模板 -->
<template v-if="col.prop === 'rechargeTime'">
{{ moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss') }}
</template>
<template v-else-if="col.prop === 'remark'">
<span>{{ scope.row[col.prop] }}</span>
</template>
<template v-else-if="col.prop === 'rechargeVoucher'">
<el-image :src="scope.row.rechargeVoucher" style="width: 50px; height: 50px" />
</template>
<template v-else-if="col.prop === 'status'">
<div class="status">
<span :class="{
'green-dot': scope.row.status === 1,
'grey-dot': scope.row.status === 0,
'red-dot': scope.row.status === 2
}"></span>
<span>{{
scope.row.status === 1 ? '已通过' :
scope.row.status === 0 ? '待审核' : '已驳回'
}}</span>
</div>
</template>
<template v-else-if="['paidGold', 'freeGold'].includes(col.prop)">
{{ scope.row[col.prop] / 100 }}
</template>
<span v-else>
{{ scope.row[col.prop] }}
</span>
</template>
</el-table-column>
</template>
<el-table-column fixed="right" prop="operation" label="操作" width="150px">
<template #default="scope">
<div class="operation">
<el-popconfirm
title="确定要通过此条记录吗?"
@confirm="passConfirm"
>
<el-popconfirm title="确定要通过此条记录吗?" @confirm="passConfirm">
<template #reference>
<el-button
:disabled="
scope.row.status === 1 || scope.row.status === 2
? true
: false
"
type="primary"
text
@click="pass(scope.row)"
>
<el-button :disabled="scope.row.status === 1 || scope.row.status === 2
? true
: false
" type="primary" text @click="pass(scope.row)">
通过
</el-button>
</template>
@ -843,16 +737,10 @@ const trimJwCode = () => {
</el-button>
</template>
</el-popconfirm>
<el-button
:disabled="
scope.row.status === 1 || scope.row.status === 2
? true
: false
"
type="primary"
text
@click="reject(scope.row)"
>
<el-button :disabled="scope.row.status === 1 || scope.row.status === 2
? true
: false
" type="primary" text @click="reject(scope.row)">
驳回
</el-button>
</div>
@ -863,44 +751,21 @@ const trimJwCode = () => {
<!-- 分页 -->
<div class="pagination">
<el-pagination
background
:page-size="getObj.pageSize"
:page-sizes="[5, 10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
@size-change="handlePageSizeChange"
@current-change="handleCurrentChange"
></el-pagination>
<el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
@current-change="handleCurrentChange"></el-pagination>
</div>
</el-card>
</el-col>
</el-row>
<!-- 驳回弹出框 -->
<el-dialog
v-model="rejectVisible"
title="驳回理由"
width="500"
:before-close="closeRejectVisible"
>
<el-dialog v-model="rejectVisible" title="驳回理由" width="500" :before-close="closeRejectVisible">
<template #footer>
<el-form
:model="rejectObj"
ref="Ref"
:rules="rules"
label-width="auto"
style="max-width: 600px"
>
<el-form :model="rejectObj" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px">
<el-form-item prop="reson" label="驳回理由:">
<el-input
v-model="rejectObj.reson"
maxlength="150"
show-word-limit
style="width: 350px"
type="textarea"
placeholder="请输入内容"
/>
<el-input v-model="rejectObj.reson" maxlength="150" show-word-limit style="width: 350px" type="textarea"
placeholder="请输入内容" />
</el-form-item>
</el-form>
@ -917,23 +782,65 @@ const trimJwCode = () => {
display: flex;
}
.status {
.operation {
display: flex;
}
.operation {
.green-dot {
background-color: #67C23A;
}
.grey-dot {
background-color: #909399;
}
.red-dot {
background-color: #F56C6C;
}
.time-controls {
display: flex;
align-items: center;
}
.time-group {
display: flex;
align-items: center;
gap: 10px;
}
.quick-buttons {
display: flex;
align-items: center;
}
.head-card {
.status {
display: flex;
align-items: center; /* 确保子元素垂直居中对齐 */
gap: 6px; /* 设置圆点和文字之间的间距 */
}
.head-card-element {
margin-right: 20px;
.green-dot, .grey-dot, .red-dot {
display: inline-block;
width: 8px;
height: 8px;
border-radius: 50%;
flex-shrink: 0; /* 防止圆点在空间不足时缩小 */
margin: 0; /* 移除原有的 margin-right */
}
.head-card-btn {
margin-left: auto;
/* 备注列样式 */
.remark-cell {
display: block;
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
/* 设置单元格内容溢出隐藏 */
.el-table .el-table__cell {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>

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

@ -582,7 +582,7 @@ const trimJwCode = () => {
<el-row>
<el-col :span="21">
<div class="head-card-element">
<el-text class="mx-1" size="large">时间</el-text>
<el-text class="mx-1" size="large">退款时间</el-text>
<el-date-picker
v-model="getTime"
type="datetimerange"

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

@ -324,6 +324,21 @@ onMounted(async function () {
await getGoods();
await getIndexs(1);
});
const handleSelectBlur = (value) => {
//
// v-model
if (value) {
//
if (addConsume.value.productName === value) {
addConsume.value.productName = value;
}
//
else if (indexs.value.name === value) {
indexs.value.name = value;
}
}
};
</script>
<template>
@ -360,9 +375,10 @@ onMounted(async function () {
placeholder="请选择"
style="width: 300px"
@change="handleProductSelect(addConsume.productName)"
@blur="handleSelectBlur(addConsume.productName)"
filterable
allow-create
default-first-option
allow-create
default-first-option
>
<el-option
v-for="item in goods"
@ -513,11 +529,11 @@ onMounted(async function () {
<p style="color: #2fa1ff">{{ user.rechargeTimes }}</p>
</el-form-item>
</el-col>
<el-col :span="10">
<!-- <el-col :span="10">
<el-form-item label="负责客服">
<p>{{ adminData.name }}</p>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="14">
<el-form-item label="消费次数">
<p style="color: #2fa1ff">{{ user.spendTimes }}</p>

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

@ -81,6 +81,9 @@
<el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button type="success" @click="reset(ruleFormRef)">重置</el-button>
<!-- 这是重置参数formEl: FormInstance -->
<!-- 为啥要这个参数 -->
<el-button type="primary" @click="showExportInfoPanel = true">导出excel</el-button>
</el-form-item>
</el-col>
@ -264,7 +267,7 @@ const getObj = ref({
pageNum: 1,
pageSize: 50
})
//
const ruleFormRef = ref<FormInstance>()
//

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

@ -157,7 +157,7 @@ const changeDataByArea = (item) => {
</el-icon>
<span>充值管理</span>
</template>
<el-menu-item index="/activity">活动管理</el-menu-item>
<!-- <el-menu-item index="/activity">活动管理</el-menu-item> -->
<el-menu-item index="/rate">汇率管理</el-menu-item>
</el-sub-menu>
@ -225,7 +225,7 @@ const changeDataByArea = (item) => {
<el-menu-item index="/allRefund">退款明细</el-menu-item>
</el-sub-menu>
</el-sub-menu>
<el-sub-menu index="10">
<!-- <el-sub-menu index="10">
<template #title
><el-icon> <Folder /> </el-icon></template
>
@ -234,7 +234,7 @@ const changeDataByArea = (item) => {
<el-menu-item index="/onLineDetail">线上充值明细</el-menu-item>
<el-menu-item index="/goldenBeenConsum">金豆消费明细</el-menu-item>
<el-menu-item index="/goldenBeenBalance">客户金豆余额</el-menu-item>
</el-sub-menu>
</el-sub-menu> -->
<el-menu-item
index="/usergold"
v-if="

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

@ -43,28 +43,25 @@ const total = ref(0)
//
//
const value1 = ref({
startTime: '',
endTime: ''
}) //
function handleDateChange(value) {
if (value && value.length === 2) {
value1.value.startTime = value[0] //
value1.value.endTime = value[1] //
}
console.log(value1)
}
// const value1 = ref([]) //
// function handleDateChange(value) {
// if (value && value.length === 2) {
// value1.value.startTime = value[0] //
// value1.value.endTime = value[1] //
// }
// console.log(value1)
// }
const time = ref({})
const get = async function (val) {
//
if (value1.value && value1.value.length === 2) {
time.value.startTime = value1.value[0];
time.value.endTime = value1.value[1];
} else {
time.value.startTime = '';
time.value.endTime = '';
}
// if (value1.value && value1.value.length === 2) {
// time.value.startTime = value1.value[0];
// time.value.endTime = value1.value[1];
// } else {
// time.value.startTime = '';
// time.value.endTime = '';
// }
try {
//
if (typeof val === 'number') {
@ -100,60 +97,40 @@ const get = async function (val) {
}
//
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 getToday = () => {
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')
time.value.startTime = startDate
time.value.endTime = endDate
search()
}
//
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();
const getYesterday = () => {
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')
time.value.startTime = startDate
time.value.endTime = endDate
search()
}
// 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 get7Days = () => {
//
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')
time.value.startTime = startDate
time.value.endTime = endDate
search()
}
//
const search = function () {
getObj.value.pageNum = 1
@ -516,32 +493,50 @@ function handleInput(value) {
<el-card>
<!-- 这是时间 -->
<div class="demo-range">
时间
<el-date-picker
v-model="value1"
type="daterange"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
:size="size"
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
class="button-item"
type="primary"
style="float: right"
@click="search"
>查询</el-button>
<el-button
class="button-item"
type="success"
style="float: right"
@click="handledelete"
>重置</el-button>
<el-row>
<el-col :span="6">
<el-form-item prop="startTime">
<el-text class="mx-1" size="large">开始时间</el-text>
<el-date-picker
v-model="time.startTime"
type="date"
placeholder="开始日期"
style="width: 210px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="endTime">
<el-text class="mx-1" size="large">结束时间</el-text>
<el-date-picker
v-model="time.endTime"
type="date"
placeholder="结束日期"
style="width: 210px"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-button @click="getToday"></el-button>
<el-button @click="getYesterday"></el-button>
<el-button @click="get7Days">近7天</el-button>
</el-col>
<el-col :span="4">
<el-button
type="primary"
@click="search"
>查询</el-button>
<el-button
class="button-item"
type="success"
@click="handledelete"
>重置</el-button>
</el-col>
</el-row>
</div>
</el-card>
</el-col>

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

@ -531,7 +531,7 @@ const handleCurrentChange = function (val) {
修改权限
</el-button>
<el-popconfirm
title="确定将此条活动删除吗?"
title="确定将此用户删除吗?"
@confirm="delConfirm"
>
<template #reference>
@ -869,6 +869,7 @@ const handleCurrentChange = function (val) {
</template>
<style scoped>
.permissionVisible {
font-size: 16px;
font-weight: bold;

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

@ -132,24 +132,51 @@ const rules = reactive({
jwcode: [{ required: true, message: '请输入精网号', trigger: 'blur' }],
activityId: [{ required: true, message: '请选择活动名称', trigger: 'blur' }],
paidGold: [
{ required: true, message: '请输入充值金额', trigger: 'blur' },
{ required: true, message: '请输入永久金币数', trigger: 'blur' },
{
validator: (rule, value, callback) => {
if (value > 0) {
if (value >= 0) {
callback()
} else {
callback(new Error('输入大于0的金额'))
callback(new Error('输入金额至少为0'))
}
}
}
],
//
rechargeGold: [
freeGold: [
{
required: true,
message: '请选择充值方式',
message: '请输入免费金币数',
trigger: 'blur'
},
{
validator: (rule, value, callback) => {
// ()
//
const numValue = Number(value);
if (isNaN(numValue)) {
callback(new Error('请输入有效的数字'));
} else if (numValue >= 0) {
callback();
} else {
callback(new Error('输入金额至少为 0'));
}
},
trigger: 'blur'
}
],
//
rechargeGold: [
{
required: true,message: '请选择充值方式',trigger: 'blur'
},{
validator: (rule, value, callback) => {
if (value >= 0) {
callback()
} else {
callback(new Error('输入金额至少为0'))
}
}
}
],
payWay: [{ required: true, message: '请选择付款方式', trigger: 'blur' }],
@ -245,28 +272,20 @@ const handleAvatarSuccess = (response, uploadFile) => {
//
const options = [
{
value: '微信',
label: '微信'
},
{
value: '支付宝',
label: '支付宝'
},
{
value: '银联',
label: '银联'
value: '现金',
label: '现金'
},
{
value: '信用卡',
label: '信用卡'
value: '支票',
label: '支票'
},
{
value: '借记卡',
label: '借记卡'
value: '刷卡',
label: '刷卡'
},
{
value: '现金充值',
label: '现金充值'
value: '其他(各地区电子支付)',
label: '其他(各地区电子支付)'
}
]
@ -293,23 +312,23 @@ function handleActivityChange(value) {
console.log('看看', addRecharge.value)
}
// paidGold
const calculatedFree = computed(() => {
const result = addRecharge.value.paidGold / addRecharge.value.rechargeRatio
if (isNaN(result) || result < 1 || addRecharge.value.rechargeRatio == 0) {
return 0
} else {
return Math.trunc(result)
}
})
watch(calculatedFree, (newVal) => {
addRecharge.value.freeGold = newVal
})
const calculatedRecharge = computed(() => {
return addRecharge.value.paidGold * Rate.value
})
watch(calculatedRecharge, (newVal) => {
addRecharge.value.rechargeGold = newVal
})
// const calculatedFree = computed(() => {
// const result = addRecharge.value.paidGold / addRecharge.value.rechargeRatio
// if (isNaN(result) || result < 1 || addRecharge.value.rechargeRatio == 0) {
// return 0
// } else {
// return Math.trunc(result)
// }
// })
// watch(calculatedFree, (newVal) => {
// addRecharge.value.freeGold = newVal
// })
// const calculatedRecharge = computed(() => {
// return addRecharge.value.paidGold * Rate.value
// })
// watch(calculatedRecharge, (newVal) => {
// addRecharge.value.rechargeGold = newVal
// })
//
const deleteRecharge = function () {
addRecharge.value = {
@ -548,55 +567,6 @@ const batchDel = function () {
})
})
}
//
const del = function (row) {
console.log('row===', row)
delObj.value.line = row.line
}
//
const delConfirm = function () {
batchData.value = batchData.value.filter(
(item) => item.line != delObj.value.line
)
console.log('batchData===', batchData.value)
}
//
const reset = function (row) {
resetObj.value.line = row.line
}
//
const resetConfirm = function () {
for (let i = 0; i < batchData.value.length; i++) {
if (batchData.value[i].line == resetObj.value.line) {
batchData.value[i] = {}
batchData.value[i].line = resetObj.value.line
batchData.value[i].showInput = true
break
}
}
}
//
const cancelBatch = function () {
ElMessageBox.confirm('确认取消吗?此操作将不会保存任何数据。', '确认取消', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
batchData.value = [{ line: 1, showInput: true }]
closeBatchRechargeVisible()
ElMessage({
type: 'success',
message: '操作成功'
})
})
.catch(() => {
ElMessage({
type: 'info',
message: '操作撤销'
})
})
}
//
const changeActivity = function (row) {
console.log('row===', row)
@ -618,36 +588,36 @@ const changeActivity = function (row) {
}
}
}
//
const changePaidGold = function (row) {
console.log('row===', row)
let ratio = 0
if (row.activityId == null || row.activityId == '') {
row.freeGold = 0
} else {
for (let i = 0; i < activity.value.length; i++) {
if (activity.value[i].activityId == row.activityId) {
ratio = activity.value[i].rechargeRatio
break
}
}
if (ratio == 0) {
row.freeGold = 0
} else {
row.freeGold = Math.ceil(Number(row.paidGold) / ratio)
}
}
let rate = row.rate
if (rate == null || rate == '') {
row.rechargeGold = 0
} else {
if (row.paidGold == null || row.paidGold == '') {
row.rechargeGold = 0
} else {
row.rechargeGold = Math.ceil(Number(row.paidGold) * rate)
}
}
}
// //
// const changePaidGold = function (row) {
// console.log('row===', row)
// let ratio = 0
// if (row.activityId == null || row.activityId == '') {
// row.freeGold = 0
// } else {
// for (let i = 0; i < activity.value.length; i++) {
// if (activity.value[i].activityId == row.activityId) {
// ratio = activity.value[i].rechargeRatio
// break
// }
// }
// if (ratio == 0) {
// row.freeGold = 0
// } else {
// row.freeGold = Math.ceil(Number(row.paidGold) / ratio)
// }
// }
// let rate = row.rate
// if (rate == null || rate == '') {
// row.rechargeGold = 0
// } else {
// if (row.paidGold == null || row.paidGold == '') {
// row.rechargeGold = 0
// } else {
// row.rechargeGold = Math.ceil(Number(row.paidGold) * rate)
// }
// }
// }
//
const changeRate = function (row) {
console.log('row===', row)
@ -1114,12 +1084,12 @@ onMounted(async function () {
<p style="color: #2fa1ff">{{ user.rechargeTimes }}</p>
</el-form-item>
</el-col>
<el-col :span="10">
<!-- <el-col :span="10">
<el-form-item label="负责客服">
<p>{{ adminData.name }}</p>
</el-form-item>
</el-col>
<el-col :span="14">
</el-col> -->
<el-col :span="10">
<el-form-item label="消费次数">
<p style="color: #2fa1ff">{{ user.spendTimes }}</p>
</el-form-item>

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

@ -1019,6 +1019,7 @@ onMounted(async function () {
tooltip: {
trigger: 'item',
position: ['15%', '-3%'],
show:true, //
formatter: function (params) {
return params.seriesName + '<br/>' + params.name
}
@ -1026,7 +1027,9 @@ onMounted(async function () {
legend: {
bottom: '-1%',
left: 'center',
orient: 'vertical'
orient: 'vertical',
//
selectedMode: true,
},
series: [
{

Loading…
Cancel
Save