Browse Source

Merge branch 'lihuilin/feature-20250815155204-金币优化' into milestone-20250815-金币优化

zhangyong/feature-20250815160302-金币优化
lihuilin 2 months ago
parent
commit
00d6fa884c
  1. 8
      src/views/audit/bean/beanAudit.vue
  2. 30
      src/views/audit/gold/audit.vue
  3. 12
      src/views/audit/gold/rechargeAudit.vue
  4. 12
      src/views/audit/gold/refundAudit.vue
  5. 145
      src/views/managerecharge/rate.vue

8
src/views/audit/bean/beanAudit.vue

@ -1,13 +1,13 @@
<template>
<el-card style="margin-bottom: 0.5vh;width:82.5vw">
<el-col style="margin-bottom: 1vh">
<el-card style="margin-bottom: 0.5vh;width:82.8vw">
<div style="margin-bottom: 1vh">
<el-text size="large">精网号</el-text>
<el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw" clearable />
<el-text class="mx-1" size="large">所属地区</el-text>
<el-cascader v-model="selectedMarkets" :options="marketOptions" placeholder="请选择所属地区" clearable
style="width: 12vw" @change="handleMarketChange" />
</el-col>
</div>
<el-col>
<el-text size="large" style="width: 80px" v-show="checkTab === 'pending'">提交时间</el-text>
<el-text size="large" style="width: 80px" v-show="checkTab === 'reject' || checkTab === 'pass'">审核时间</el-text>
@ -36,7 +36,7 @@
免费金豆{{ format3(stats.freeBean) }}金豆
</div>
<el-table :data="tableData" height="540px" @sort-change="handleSortChange">
<el-table :data="tableData" height="55vh" @sort-change="handleSortChange">
<el-table-column type="index" label="序号" width="80">
<template #default="scope">
{{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}

30
src/views/audit/gold/audit.vue

@ -1,36 +1,32 @@
<template>
<div>
<div style="height:2vw;">
<el-button-group>
<el-button
:type="activeTab === 'rechargeAudit' ? 'primary' : 'default'"
@click="navigateTo('rechargeAudit')"
:disabled="!hasRecharge"
>
<el-button :type="activeTab === 'rechargeAudit' ? 'primary' : 'default'" @click="navigateTo('rechargeAudit')"
:disabled="!hasRecharge">
充值审核
</el-button>
<el-button
:type="activeTab === 'refundAudit' ? 'primary' : 'default'"
@click="navigateTo('refundAudit')"
:disabled="!hasRefund"
>
<el-button :type="activeTab === 'refundAudit' ? 'primary' : 'default'" @click="navigateTo('refundAudit')"
:disabled="!hasRefund">
退款审核
</el-button>
</el-button-group>
</div>
<router-view></router-view>
</div>
</template>
<script setup>
import {ref, watch, onMounted} from 'vue';
import {useRouter, useRoute} from 'vue-router';
import {storeToRefs} from 'pinia';
import {useAdminStore} from '@/store/index.js';
import {hasMenuPermission, permissionMapping} from "@/utils/menuTreePermission.js";
import { ref, watch, onMounted } from 'vue';
import { useRouter, useRoute } from 'vue-router';
import { storeToRefs } from 'pinia';
import { useAdminStore } from '@/store/index.js';
import { hasMenuPermission, permissionMapping } from "@/utils/menuTreePermission.js";
const router = useRouter();
const route = useRoute();
const adminStore = useAdminStore();
const {menuTree} = storeToRefs(adminStore);
const { menuTree } = storeToRefs(adminStore);
const activeTab = ref('');
const hasRecharge = ref(false);
@ -38,7 +34,7 @@ const hasRefund = ref(false);
//
const navigateTo = (name) => {
activeTab.value = name;
router.push({name});
router.push({ name });
};

12
src/views/audit/gold/rechargeAudit.vue

@ -1,5 +1,5 @@
<template>
<el-card style="margin-bottom: 0.5vh;margin-top: 0.5vh">
<el-card style="margin-bottom: 0.5vh;">
<el-col style="margin-bottom: 0.5vh">
<el-text size="large">精网号</el-text>
<el-input v-model="rechargeAudit.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw" clearable />
@ -24,7 +24,7 @@
{{ activeName === 'wait' ? '提交时间:' : '审核时间:' }}
</el-text>
<el-date-picker v-model="getTime" type="datetimerange" range-separator="" start-placeholder="起始时间"
end-placeholder="结束时间" class="time-controls" style="margin-right:1vw;width:25vw"
end-placeholder="结束时间" style="margin-right:1vw;width:25vw"
@change="handleDatePickerChange" :default-time="defaultTime" :disabled-date="disabledDate" />
<el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''"></el-button>
<el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"></el-button>
@ -650,12 +650,4 @@ onMounted(async function () {
.operation {
display: flex;
}
.time-controls {
display: flex;
align-items: center;
display: flex;
align-items: center;
gap: 10px;
}
</style>

12
src/views/audit/gold/refundAudit.vue

@ -1,5 +1,5 @@
<template>
<el-card style="margin-bottom: 0.5vh;margin-top:0.5vh;width:82.5vw">
<el-card style="margin-bottom: 0.5vh;width:82.8vw">
<el-col style="margin-bottom: 0.5vh">
<el-text size="large">精网号</el-text>
<el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw" clearable />
@ -24,7 +24,7 @@
{{ activeName === 'wait' ? '提交时间:' : '审核时间:' }}
</el-text>
<el-date-picker v-model="dateRange" type="datetimerange" range-separator="" start-placeholder="开始时间"
class="time-controls" end-placeholder="结束时间" style="margin-right:1vw;width:25vw"
end-placeholder="结束时间" style="margin-right:1vw;width:25vw"
@change="handleDatePickerChange" :default-time="defaultTime" :disabled-date="disabledDate" />
<el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''"></el-button>
<el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"></el-button>
@ -579,12 +579,4 @@ onMounted(async () => {
.operation {
display: flex;
}
.time-controls {
display: flex;
align-items: center;
display: flex;
align-items: center;
gap: 10px;
}
</style>

145
src/views/managerecharge/rate.vue

@ -7,7 +7,6 @@ import { storeToRefs } from "pinia";
import { findMenuById, permissionMapping } from "@/utils/menuTreePermission.js"
const adminStore = useAdminStore()
const { adminData, menuTree } = storeToRefs(adminStore)
const regeEdit = ref(false)
const editFormRef = ref(null)
const tableData = ref([])
@ -122,7 +121,7 @@ const getEditData = async function (row) {
console.log('请求失败', error)
}
}
const editRole = ref( true)
const editRole = ref(true)
editRole.value = findMenuById(menuTree.value, permissionMapping.Exchange_Rate_Modification)
//
const editRate = async function () {
@ -243,81 +242,71 @@ onMounted(async function () {
</script>
<template>
<el-row>
<el-col>
<el-card class="box-card" style="max-width: 100%">
<div>
<el-table :data="tableData" v-if="(tableData.flag = 1)">
<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="rateName" label="货币名称" :span="2" />
<el-table-column prop="num" label="汇率" :span="2">
<template #default="scope">
<p>
{{ scope.row.num }} 1
</p>
</template>
</el-table-column>
<el-card style="width:82.8vw;height:85vh">
<el-table :data="tableData" v-if="(tableData.flag = 1)">
<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="rateName" label="货币名称" :span="2" />
<el-table-column prop="num" label="汇率" :span="2">
<template #default="scope">
<p>
{{ scope.row.num }} 1
</p>
</template>
</el-table-column>
<el-table-column prop="updateTime" label="添加时间" :span="3">
<template #default="scope">
<span>{{ formatDate(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" :span="3" v-if="editRole">
<template #default="scope">
<el-button type="text" @click=" () => {
regeEdit = true
getEditData(scope.row)}"
>编辑
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<el-table-column prop="updateTime" label="添加时间" :span="3">
<template #default="scope">
<span>{{ formatDate(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" :span="3" v-if="editRole">
<template #default="scope">
<el-button type="text" @click="() => {
regeEdit = true
getEditData(scope.row)
}">编辑
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<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>
</div>
</el-card>
</el-col>
</el-row>
<!-- 分页 -->
<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>
</div>
</el-card>
<!-- 这是编辑弹窗 -->
<el-dialog v-model="regeEdit" title="修改汇率" width="500" :close-on-click-modal="false" @close="handleEditDialogClose">
<template #footer>
<el-form ref="editFormRef" style="max-width: 600px" :model="rateEdit" :rules="rules" label-width="auto"
class="demo-ruleForm" :size="formSize" status-icon>
<el-form-item prop="rateName" label="货币名称:">
<el-input v-model="rateEdit.rateName" disabled style="width: 240px" />
</el-form-item>
<el-form-item prop="num" label="汇率:">
<el-input v-model="rateEdit.num" @update:modelValue="handleInput" style="width: 120px" />
<span class="unit">:1</span>
<span class="rate-tip">
(提示当前规则每
<span>{{ rateEdit.num }}</span>
<span>{{ rateEdit.rateName }}</span>可兑换 1 新币)
</span>
</el-form-item>
<el-dialog align-center v-model="regeEdit" title="修改汇率" width="30vw" :close-on-click-modal="false"
@close="handleEditDialogClose">
<el-form ref="editFormRef" :model="rateEdit" :rules="rules" label-width="auto" class="edit-form" :size="formSize"
status-icon>
<el-form-item prop="rateName" label="货币名称:">
<el-input v-model="rateEdit.rateName" disabled style="width: 10vw" />
</el-form-item>
<el-form-item>
<div class="dialog-footer">
<el-button type="primary" @click="edit">修改</el-button>
<el-button @click="cancelEdit">取消</el-button>
</div>
</el-form-item>
</el-form>
</template>
<el-form-item prop="num" label="汇率:">
<el-input v-model="rateEdit.num" @update:modelValue="handleInput" style="width: 120px" />
<span class="unit">:1</span>
<span class="rate-tip">
(提示当前规则每
<span>{{ rateEdit.num }}</span>
<span>{{ rateEdit.rateName }}</span>可兑换 1 新币)
</span>
</el-form-item>
</el-form>
<div class="dialog-footer">
<el-button type="primary" @click="edit">修改</el-button>
<el-button @click="cancelEdit">取消</el-button>
</div>
</el-dialog>
</template>
@ -328,12 +317,18 @@ onMounted(async function () {
display: flex;
}
.box-card {
margin-top: 20px;
.edit-form {
width: 35vw;
height: 13vh;
}
.dialog-footer {
display: flex;
margin-left: 5vw;
}
.unit {
margin-left: 10px;
margin-left: 0.5vw;
}
.rate-tip {

Loading…
Cancel
Save