Browse Source

fix:充值审核-筛选条件改变时合计数不变,充值审核-审核通过或驳回后合计数不能及时刷新 添加金币消耗卡片问题

zhangrenyuan/feature-20250623164058-金币前端
lihui 10 hours ago
parent
commit
f64fc6118f
  1. 20
      src/views/audit/rechargeAudit.vue
  2. 22
      src/views/consume/addCoinConsume.vue

20
src/views/audit/rechargeAudit.vue

@ -341,6 +341,7 @@ const getRecharge = async function (val) {
console.log('请求失败', error) console.log('请求失败', error)
} }
} }
const getStats = async () => { const getStats = async () => {
try { try {
const params = { const params = {
@ -367,6 +368,7 @@ const handleSearch = function () {
trimJwCode(); trimJwCode();
getObj.value.pageNum = 1 getObj.value.pageNum = 1
getRecharge() getRecharge()
getStats()
} }
// //
@ -382,6 +384,7 @@ const resetSearch = function () {
} }
getTime.value = [] getTime.value = []
getRecharge() getRecharge()
getStats()
} }
// //
@ -400,6 +403,7 @@ const getToday = function () {
getTime.value = [startTime, endTime] getTime.value = [startTime, endTime]
console.log('getTime', getTime.value) console.log('getTime', getTime.value)
getRecharge() getRecharge()
getStats()
} }
// //
@ -419,6 +423,7 @@ const getYesterday = function () {
getTime.value = [startTime, endTime] getTime.value = [startTime, endTime]
console.log('getTime', getTime.value) console.log('getTime', getTime.value)
getRecharge() getRecharge()
getStats()
} }
// 7 // 7
@ -437,6 +442,7 @@ const get7Days = function () {
getTime.value = [startTime, endTime] getTime.value = [startTime, endTime]
console.log('getTime', getTime.value) console.log('getTime', getTime.value)
getRecharge() getRecharge()
getStats()
} }
// //
@ -511,6 +517,7 @@ const handlePagination = (type, val) => {
getObj.value.pageNum = val getObj.value.pageNum = val
} }
getRecharge() getRecharge()
getStats()
} }
// //
@ -518,13 +525,14 @@ const handleApprove = async (row) => {
try { try {
const params = { const params = {
orderCode: row.orderCode, orderCode: row.orderCode,
auditId: 1, // todo ID
auditId: adminData.value.id,
action: 1, action: 1,
rejectReason: '' rejectReason: ''
} }
await request({url: '/audit/audit', data: params}) await request({url: '/audit/audit', data: params})
ElMessage.success('审核通过成功') ElMessage.success('审核通过成功')
getRecharge()
await getRecharge()
await getStats()
} catch (error) { } catch (error) {
console.error('审核通过失败', error) console.error('审核通过失败', error)
ElMessage.error('操作失败') ElMessage.error('操作失败')
@ -547,7 +555,7 @@ const handleReject = async () => {
try { try {
const params = { const params = {
orderCode: currentRecord.value.orderCode, orderCode: currentRecord.value.orderCode,
auditId: 1, // todo ID
auditId: adminData.value.id,
action: 2, action: 2,
rejectReason: rejectReason.value rejectReason: rejectReason.value
} }
@ -556,7 +564,8 @@ const handleReject = async () => {
ElMessage.success('驳回操作成功') ElMessage.success('驳回操作成功')
rejectDialogVisible.value = false rejectDialogVisible.value = false
getRecharge()
await getRecharge()
await getStats()
} catch (error) { } catch (error) {
console.error('驳回操作失败', error) console.error('驳回操作失败', error)
ElMessage.error('操作失败') ElMessage.error('操作失败')
@ -583,6 +592,7 @@ const handleSortChange = (column) => {
} }
sortOrder.value = column.order === 'ascending' ? 'asc' : 'desc' sortOrder.value = column.order === 'ascending' ? 'asc' : 'desc'
getRecharge() getRecharge()
getStats()
} }
// //
const previewImage = (imageUrl) => { const previewImage = (imageUrl) => {
@ -615,7 +625,7 @@ const previewImage = (imageUrl) => {
// //
onMounted(async function () { onMounted(async function () {
// await getAdminData()
await getAdminData()
await getActivity() await getActivity()
await getMarket() await getMarket()
await getRecharge() await getRecharge()

22
src/views/consume/addCoinConsume.vue

@ -68,6 +68,11 @@ const rules = reactive({
goodsName: [{required: true, message: "请选择消费商品", trigger: "change"}], // change goodsName: [{required: true, message: "请选择消费商品", trigger: "change"}], // change
sumGold: [ sumGold: [
{required: true, message: "消费金币总数不能为空", trigger: "blur"}, {required: true, message: "消费金币总数不能为空", trigger: "blur"},
{
pattern: /^\d+(\.\d{1})?$/,
message: "只能输入最多一个小数点的数字",
trigger: "blur"
}
], ],
}); });
// //
@ -98,12 +103,12 @@ const getAdminData = async function () {
function validateInput() { function validateInput() {
const sumGold = parseFloat(addConsume.value.sumGold); const sumGold = parseFloat(addConsume.value.sumGold);
trimJwCode(); trimJwCode();
if (user.value.jwcode == null) { if (user.value.jwcode == null) {
ElMessage.error("请先查询用户信息"); ElMessage.error("请先查询用户信息");
addConsume.value.sumGold = null; addConsume.value.sumGold = null;
return false; return false;
} }
// //
if (user.value.jwcode && (isNaN(sumGold) || sumGold <= 0)) { if (user.value.jwcode && (isNaN(sumGold) || sumGold <= 0)) {
ElMessage.error("消费金币总数必须是大于0的数字"); ElMessage.error("消费金币总数必须是大于0的数字");
@ -112,6 +117,7 @@ function validateInput() {
return false; return false;
} }
// //
const totalAvailableGold = (user.value.nowSumGold) const totalAvailableGold = (user.value.nowSumGold)
if (user.value.jwcode && sumGold > totalAvailableGold) { if (user.value.jwcode && sumGold > totalAvailableGold) {
@ -138,19 +144,19 @@ function calculateCoins(sumGold) {
// //
if (nowFreeGold > 0) { if (nowFreeGold > 0) {
freeUsed = Math.min(parseFloat(nowFreeGold.toFixed(2)), remaining);
remaining = parseFloat((remaining - freeUsed).toFixed(2));
freeUsed = Math.min(parseFloat(nowFreeGold.toFixed(4)), remaining);
remaining = parseFloat((remaining - freeUsed).toFixed(4));
} }
// //
if (remaining > 0 && nowPermanentGold > 0) { if (remaining > 0 && nowPermanentGold > 0) {
permanentUsed = Math.min(parseFloat(nowPermanentGold.toFixed(2)), remaining);
remaining = parseFloat((remaining - permanentUsed).toFixed(2));
permanentUsed = Math.min(parseFloat(nowPermanentGold.toFixed(4)), remaining);
remaining = parseFloat((remaining - permanentUsed).toFixed(4));
} }
// //
if (remaining > 0 && nowTaskGold > 0) { if (remaining > 0 && nowTaskGold > 0) {
taskUsed = parseFloat(remaining.toFixed(2));
taskUsed = parseFloat(remaining.toFixed(4));
} }
// //
@ -422,7 +428,7 @@ onMounted(async function () {
</div> </div>
<el-form-item prop="allGold" label="消费金币总数">
<el-form-item prop="sumGold" label="消费金币总数">
<el-input <el-input
v-model="addConsume.sumGold" v-model="addConsume.sumGold"
style="width: 100px" style="width: 100px"
@ -517,7 +523,7 @@ onMounted(async function () {
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-form-item label="当前金币总数" style="width: 500px">
<el-form-item label="当前金币总数" style="width: 600px">
<span <span
style="color: #2fa1ff; margin-right: 5px" style="color: #2fa1ff; margin-right: 5px"
v-if="user.nowSumGold !== undefined" v-if="user.nowSumGold !== undefined"

Loading…
Cancel
Save