From 335a64abda3c3879e7048addd6940a4634628591 Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Mon, 2 Dec 2024 10:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=20=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/audit/rechargeAudit.vue  | 538 +++++++++++++++++-
 vue/gold-system/src/views/audit/refundAudit.vue    | 532 +++++++++++++++++-
 .../src/views/managerecharge/activity.vue          |  25 +-
 vue/gold-system/src/views/managerecharge/rate.vue  | 617 ++++++++++-----------
 .../src/views/recharge/adminRecharge.vue           |  25 +-
 vue/gold-system/src/views/recharge/allRecharge.vue |  19 +-
 vue/gold-system/src/views/workspace/index.vue      |  50 +-
 7 files changed, 1434 insertions(+), 372 deletions(-)

diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue
index dccaee9..e62a201 100644
--- a/vue/gold-system/src/views/audit/rechargeAudit.vue
+++ b/vue/gold-system/src/views/audit/rechargeAudit.vue
@@ -1,13 +1,543 @@
 <script setup>
-    
+import { ref, onMounted, reactive, computed } from "vue";
+import ElementPlus from "element-plus";
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { AiFillRead } from "vue-icons-plus/ai";
+import axios from 'axios';
+import moment from 'moment';
+// 变量
+// 充值明细表格
+const tableData = ref([]);
+// 搜索======================================
+// 搜索rechargeVo
+const rechargeVo = ref({});
+// 搜索对象
+const getObj = ref({
+    pageNum: 1,
+    pageSize: 5,
+});
+//分页总条目
+const total = ref(100);
+// 搜索对象时间
+const getTime = ref([]);
+// 搜索活动列表
+const activity = ref([]);
+// 所有信息
+const allData = ref([]);
+// 搜索地区列表
+const area = ref([]);
+
+// 编辑======================================
+// 驳回弹出框
+const rejectVisible = ref(false);
+// 驳回对象
+const rejectObj = ref({});
+// 通过对象
+const passObj = ref({});
+
+//标签页默认高亮选项
+const activeName = ref('all')
+
+// 支付方式选项
+const payWay = [
+    {
+        value: '微信',
+        label: '微信',
+    },
+    {
+        value: '支付宝',
+        label: '支付宝',
+    },
+    {
+        value: '银联',
+        label: '银联',
+    },
+    {
+        value: '信用卡',
+        label: '信用卡',
+    },
+    {
+        value: '借记卡',
+        label: '借记卡',
+    },
+]
+
+//表格高度
+const tableHeight = computed(function () {
+    return (getObj.value.pageSize + 2) * 60 + 'px';
+});
+
+// 表单验证ref
+const Ref = ref(null);
+
+// 方法
+// 搜索==============================================================
+// 搜索方法
+const get = async function (val) {
+    try {
+        // 搜索参数页码赋值 
+        if (typeof val === 'number') {
+            getObj.value.pageNum = val;
+        }
+        // 搜索参数时间赋值
+        if (getTime.value != null) {
+            if (getTime.value.startDate != '' && getTime.value.endDate != '') {
+                rechargeVo.value.startDate = getTime.value[0];
+                rechargeVo.value.endDate = getTime.value[1];
+            }
+        } else {
+            rechargeVo.value.startDate = '';
+            rechargeVo.value.endDate = '';
+        }
+        console.log('搜索参数', getObj.value);
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', { ...getObj.value, rechargeVo: { ...rechargeVo.value } });
+
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 存储表格数据
+        tableData.value = result.data.data.list;
+        console.log('tableData', tableData.value);
+        // 存储分页总数
+        total.value = result.data.data.total;
+        console.log('total', total.value);
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+}
+// 重置
+const reset = function () {
+    rechargeVo.value.activityId = '';
+    rechargeVo.value.payWay = '';
+    rechargeVo.value.area = '';
+    rechargeVo.value.startDate = '';
+    rechargeVo.value.endDate = '';
+    get();
+}
+// 今天
+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 adminAll = function () {
+    console.log('adminAll');
+    rechargeVo.value.status = '';
+    get();
+}
+//待审核充值明细
+const adminWait = function () {
+    rechargeVo.value.status = 0;
+    get();
+    console.log('adminWait');
+}
+//已通过充值明细
+const adminPass = function () {
+    rechargeVo.value.status = 1;
+    get();
+    console.log('adminPass');
+}
+//点击标签页
+const handleClick = function (tab, event) {
+    if (tab.props.name === 'all') {
+        adminAll();
+    } else if (tab.props.name === 'wait') {
+        adminWait();
+    } else if (tab.props.name === 'pass') {
+        adminPass();
+    }
+}
+// 获取活动名称
+const getActivity = async function () {
+    try {
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10010/recharge/activity/select', {});
+
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 存储表格数据
+        activity.value = result.data.data;
+        console.log('activity', activity.value);
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+}
+// 获取地区
+const getArea = async function () {
+    try {
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', {});
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 存储全部数据
+        allData.value = result.data.data;
+        console.log('allData', allData.value);
+        // 分离并去重地区列表
+        area.value = [...new Set(allData.value.map(item => item.area))]
+        console.log('地区', area.value);
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+
+}
+// 验证跳转输入框的数字是否合法
+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))) {
+            console.log('输入的数字合法');
+            get();
+        } else {
+            //提示
+            ElMessage({
+                type: 'error',
+                message: '请检查输入内容',
+            })
+        }
+    } else {
+        //提示
+        ElMessage({
+            type: 'error',
+            message: '请检查输入内容',
+        })
+    }
+}
+
+// 编辑====================================
+// 通过按钮
+const pass = function (row) {
+    // 通过初始化
+    passObj.value.auditId = row.rechargeId;
+    passObj.value.status = 1;
+    console.log('通过对象', passObj.value);
+}
+
+// 通过确认
+const passConfirm = async function () {
+
+    try {
+        console.log('通过对象', passObj.value);
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10030/audit/audit/edit', passObj.value);
+
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 刷新表格数据
+        get();
+        //提示
+        ElMessage({
+            type: 'success',
+            message: '通过成功！',
+
+        })
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+}
+
+// 打开驳回弹出框
+const openRejectVisible = function () {
+    rejectVisible.value = true;
+}
+// 关闭驳回弹出框
+const closeRejectVisible = function () {
+    rejectVisible.value = false;
+}
+// 驳回按钮
+const reject = function (row) {
+    // 驳回初始化
+    rejectObj.value.auditId = row.rechargeId;
+    rejectObj.value.status = 2;
+    rejectObj.value.reson = '';
+    console.log('驳回对象', rejectObj.value);
+    openRejectVisible();
+}
+// 驳回确认
+const rejectConfirm = async function () {
+    Ref.value.validate(async (valid) => {
+        if (valid) {
+            try {
+                console.log('驳回对象', rejectObj.value);
+                // 发送POST请求
+                const result = await axios.post('http://192.168.8.93:10030/audit/audit/edit', rejectObj.value);
+
+                // 将响应结果存储到响应式数据中
+                console.log('请求成功', result);
+                // 刷新表格数据
+                get();
+                // 关闭弹出框
+                closeRejectVisible();
+                //提示
+                ElMessage({
+                    type: 'success',
+                    message: '驳回成功！',
+                })
+            } catch (error) {
+                console.log('请求失败', error);
+                // 在这里可以处理错误逻辑，比如显示错误提示等
+            }
+        } else {
+            //提示
+            ElMessage({
+                type: 'error',
+                message: '请检查输入内容',
+            })
+        }
+
+    })
+
+}
+
+// 表单验证
+
+const rules = reactive({
+    reson: [{ required: true, message: '请输入驳回理由', trigger: 'blur' },],
+})
+
+// 挂载
+onMounted(async function () {
+    await get();
+    getActivity();
+    await getArea();
+})
+
 </script>
 
 <template>
-    <div>
-        <h1>Recharge Audit</h1>
-    </div>
+    <el-row>
+        <el-col>
+            <el-card style="margin-bottom: 20px">
+                <el-row style="margin-bottom: 10px;">
+                    <el-col :span="8">
+                        <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">
+                                <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
+                                    :value="item.activityId" />
+                            </el-select>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <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">
+                                <el-option v-for="item in payWay" :key="item.value" :label="item.label"
+                                    :value="item.value" />
+                            </el-select>
+                        </div>
+
+                    </el-col>
+                    <el-col :span="8">
+                        <div class="head-card-element">
+                            <el-text class="mx-1" size="large">所属地区：</el-text>
+                            <el-select v-model="rechargeVo.area" placeholder="请选择所属地区" size="large"
+                                style="width: 240px">
+                                <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-text class="mx-1" size="large">充值时间：</el-text>
+                            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
+                                start-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>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="head-card-btn">
+                            <el-button @click="reset()">重置</el-button>
+                            <el-button type="primary" @click="get()">查询</el-button>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-card>
+        </el-col>
+    </el-row>
+    <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-tabs>
+                <div>
+                    <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+                        <el-table-column prop="username" label="姓名" width="100px" />
+                        <el-table-column prop="homilyId" label="精网号" width="150px" />
+                        <el-table-column prop="area" label="所属地区" width="100px" />
+                        <el-table-column prop="activityName" label="活动名称" width="150px" />
+                        <el-table-column prop="rechargeGold" label="充值金额" width="100px" />
+                        <el-table-column prop="rechargeWay" label="充值方式" width="100px" />
+                        <el-table-column prop="paidGold" label="充值金币" width="100px" />
+                        <el-table-column prop="freeGold" label="免费金币" width="100px" />
+                        <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="交款时间" 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="提交时间" width="200px" />
+                        <el-table-column fixed="right" prop="operation" label="操作" width="150px">
+                            <template #default="scope">
+                                <div class="operation">
+                                    <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>
+                                        </template>
+                                        <template #actions="{ confirm, cancel }">
+                                            <el-button size="small" @click="cancel">取消</el-button>
+                                            <el-button type="primary" size="small" @click="confirm">
+                                                确定
+                                            </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>
+                                </div>
+                            </template>
+
+                        </el-table-column>
+                    </el-table>
+                </div>
+
+                <!-- 分页 -->
+                <div class="pagination">
+                    <el-pagination background :page-size="getObj.pageSize" layout="slot" :total="total">
+                        <div>共{{ total }}条,每页 </div>
+                        <el-select v-model="getObj.pageSize" class="page-size" @change="get()" style="width: 80px">
+                            <el-option v-for="item in [5, 6, 7, 8, 9, 10]" :key="item" :label="item"
+                                :value="item"></el-option>
+                        </el-select>
+                        <div> 条</div>
+                    </el-pagination>
+                    <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize"
+                        :total="total" :current-page="getObj.pageNum" @current-change="get">
+                        <div>跳至</div>
+                        <el-input v-model="getObj.pageNum" style="width: 40px;" @change="checkNumber" />
+                        <div>页</div>
+                    </el-pagination>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+
+    <!-- 驳回弹出框 -->
+    <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-item prop="reson" label="驳回理由:">
+                    <el-input v-model="rejectObj.reson" maxlength="150" show-word-limit style="width: 350px"
+                        type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+
+
+            </el-form>
+
+            <div class="dialog-footer">
+                <el-button @click="closeRejectVisible()">取消</el-button>
+                <el-button type="primary" @click="rejectConfirm()">
+                    确定
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>
+
 </template>
 
 <style scoped>
+.pagination {
+    display: flex;
+}
+
+.status {
+    display: flex;
+}
+
+.operation {
+    display: flex;
+}
+
+.head-card {
+    display: flex;
+}
+
+.head-card-element {
+    margin-right: 20px;
+}
 
+.head-card-btn {
+    margin-left: auto;
+}
 </style>
\ No newline at end of file
diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue
index d52d774..590b2ed 100644
--- a/vue/gold-system/src/views/audit/refundAudit.vue
+++ b/vue/gold-system/src/views/audit/refundAudit.vue
@@ -1,13 +1,537 @@
 <script setup>
-    
+import { ref, onMounted, reactive, computed } from "vue";
+import ElementPlus from "element-plus";
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { AiFillRead } from "vue-icons-plus/ai";
+import axios from 'axios';
+import moment from 'moment';
+// 变量
+// 充值明细表格
+const tableData = ref([]);
+// 搜索======================================
+// 搜索rechargeVo
+const rechargeVo = ref({});
+// 搜索对象
+const getObj = ref({
+    pageNum: 1,
+    pageSize: 5,
+});
+//分页总条目
+const total = ref(100);
+// 搜索对象时间
+const getTime = ref([]);
+// 搜索活动列表
+const activity = ref([]);
+// 所有信息
+const allData = ref([]);
+// 搜索地区列表
+const area = ref([]);
+
+// 编辑======================================
+// 驳回弹出框
+const rejectVisible = ref(false);
+// 驳回对象
+const rejectObj = ref({});
+// 通过对象
+const passObj = ref({});
+
+//标签页默认高亮选项
+const activeName = ref('all')
+
+// 支付方式选项
+const payWay = [
+    {
+        value: '微信',
+        label: '微信',
+    },
+    {
+        value: '支付宝',
+        label: '支付宝',
+    },
+    {
+        value: '银联',
+        label: '银联',
+    },
+    {
+        value: '信用卡',
+        label: '信用卡',
+    },
+    {
+        value: '借记卡',
+        label: '借记卡',
+    },
+]
+
+//表格高度
+const tableHeight = computed(function () {
+    return (getObj.value.pageSize + 2) * 60 + 'px';
+});
+
+// 表单验证ref
+const Ref = ref(null);
+
+// 方法
+// 搜索==============================================================
+// 搜索方法
+const get = async function (val) {
+    try {
+        // 搜索参数页码赋值 
+        if (typeof val === 'number') {
+            getObj.value.pageNum = val;
+        }
+        // 搜索参数时间赋值
+        if (getTime.value != null) {
+            if (getTime.value.startDate != '' && getTime.value.endDate != '') {
+                rechargeVo.value.startDate = getTime.value[0];
+                rechargeVo.value.endDate = getTime.value[1];
+            }
+        } else {
+            rechargeVo.value.startDate = '';
+            rechargeVo.value.endDate = '';
+        }
+        console.log('搜索参数', getObj.value);
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10030/audit/audit/refund', { ...getObj.value, rechargeVo: { ...rechargeVo.value } });
+
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 存储表格数据
+        tableData.value = result.data.data.list;
+        console.log('tableData', tableData.value);
+        // 存储分页总数
+        total.value = result.data.data.total;
+        console.log('total', total.value);
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+}
+// 重置
+const reset = function () {
+    rechargeVo.value.activityId = '';
+    rechargeVo.value.payWay = '';
+    rechargeVo.value.area = '';
+    rechargeVo.value.startDate = '';
+    rechargeVo.value.endDate = '';
+    get();
+}
+// 今天
+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 adminAll = function () {
+    console.log('adminAll');
+    rechargeVo.value.status = '';
+    get();
+}
+//待审核充值明细
+const adminWait = function () {
+    rechargeVo.value.status = 0;
+    get();
+    console.log('adminWait');
+}
+//已通过充值明细
+const adminPass = function () {
+    rechargeVo.value.status = 1;
+    get();
+    console.log('adminPass');
+}
+//点击标签页
+const handleClick = function (tab, event) {
+    if (tab.props.name === 'all') {
+        adminAll();
+    } else if (tab.props.name === 'wait') {
+        adminWait();
+    } else if (tab.props.name === 'pass') {
+        adminPass();
+    }
+}
+// 获取活动名称
+const getActivity = async function () {
+    try {
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10010/recharge/activity/select', {});
+
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 存储表格数据
+        activity.value = result.data.data;
+        console.log('activity', activity.value);
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+}
+// 获取地区
+const getArea = async function () {
+    try {
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', {});
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 存储全部数据
+        allData.value = result.data.data;
+        console.log('allData', allData.value);
+        // 分离并去重地区列表
+        area.value = [...new Set(allData.value.map(item => item.area))]
+        console.log('地区', area.value);
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+
+}
+// 验证跳转输入框的数字是否合法
+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))) {
+            console.log('输入的数字合法');
+            get();
+        } else {
+            //提示
+            ElMessage({
+                type: 'error',
+                message: '请检查输入内容',
+            })
+        }
+    } else {
+        //提示
+        ElMessage({
+            type: 'error',
+            message: '请检查输入内容',
+        })
+    }
+}
+
+// 编辑====================================
+// 通过按钮
+const pass = function (row) {
+    // 通过初始化
+    passObj.value.auditId = row.rechargeId;
+    passObj.value.status = 1;
+    console.log('通过对象', passObj.value);
+}
+
+// 通过确认
+const passConfirm = async function () {
+
+    try {
+        console.log('通过对象', passObj.value);
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10030/audit/audit/edit', passObj.value);
+
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 刷新表格数据
+        get();
+        //提示
+        ElMessage({
+            type: 'success',
+            message: '通过成功！',
+
+        })
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+}
+
+// 打开驳回弹出框
+const openRejectVisible = function () {
+    rejectVisible.value = true;
+}
+// 关闭驳回弹出框
+const closeRejectVisible = function () {
+    rejectVisible.value = false;
+}
+// 驳回按钮
+const reject = function (row) {
+    // 驳回初始化
+    rejectObj.value.auditId = row.rechargeId;
+    rejectObj.value.status = 2;
+    rejectObj.value.reson = '';
+    console.log('驳回对象', rejectObj.value);
+    openRejectVisible();
+}
+// 驳回确认
+const rejectConfirm = async function () {
+    Ref.value.validate(async (valid) => {
+        if (valid) {
+            try {
+                console.log('驳回对象', rejectObj.value);
+                // 发送POST请求
+                const result = await axios.post('http://192.168.8.93:10030/audit/audit/edit', rejectObj.value);
+
+                // 将响应结果存储到响应式数据中
+                console.log('请求成功', result);
+                // 刷新表格数据
+                get();
+                // 关闭弹出框
+                closeRejectVisible();
+                //提示
+                ElMessage({
+                    type: 'success',
+                    message: '驳回成功！',
+                })
+            } catch (error) {
+                console.log('请求失败', error);
+                // 在这里可以处理错误逻辑，比如显示错误提示等
+            }
+        } else {
+            //提示
+            ElMessage({
+                type: 'error',
+                message: '请检查输入内容',
+            })
+        }
+
+    })
+
+}
+
+// 表单验证
+
+const rules = reactive({
+    reson: [{ required: true, message: '请输入驳回理由', trigger: 'blur' },],
+})
+
+// 挂载
+onMounted(async function () {
+    await get();
+    getActivity();
+    await getArea();
+})
+
 </script>
 
 <template>
-    <div>
-        <h1>refundAudit</h1>
-    </div>
+    <el-row>
+        <el-col>
+            <el-card style="margin-bottom: 20px">
+                <el-row style="margin-bottom: 10px;">
+                    <el-col :span="8">
+                        <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">
+                                <el-option v-for="item in activity" :key="item.activityId" :label="item.activityName"
+                                    :value="item.activityId" />
+                            </el-select>
+                        </div>
+                    </el-col>
+                    <el-col :span="8">
+                        <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">
+                                <el-option v-for="item in payWay" :key="item.value" :label="item.label"
+                                    :value="item.value" />
+                            </el-select>
+                        </div>
+
+                    </el-col>
+                    <el-col :span="8">
+                        <div class="head-card-element">
+                            <el-text class="mx-1" size="large">所属地区：</el-text>
+                            <el-select v-model="rechargeVo.area" placeholder="请选择所属地区" size="large"
+                                style="width: 240px">
+                                <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-text class="mx-1" size="large">充值时间：</el-text>
+                            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
+                                start-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>
+                    </el-col>
+                    <el-col :span="3">
+                        <div class="head-card-btn">
+                            <el-button @click="reset()">重置</el-button>
+                            <el-button type="primary" @click="get()">查询</el-button>
+                        </div>
+                    </el-col>
+                </el-row>
+            </el-card>
+        </el-col>
+    </el-row>
+    <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-tabs>
+                <div>
+                    <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+                        <el-table-column prop="name" label="姓名" width="100px" />
+                        <el-table-column prop="homilyId" label="精网号" width="150px" />
+                        <el-table-column prop="area" label="所属地区" width="100px" />
+                        <el-table-column prop="refundType" label="退款类型" width="150px" />
+                        <el-table-column prop="goods" label="退款商品" width="100px" />
+                        <el-table-column prop="refundCoin" label="退款金币数" width="100px" >
+                            <template #default="scope">
+                                <span>{{ scope.row.rechargeCoin+scope.row.freeCoin+scope.row.taskCoin }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="rechargeCoin" label="充值金币" width="100px" />
+                        <el-table-column prop="freeCoin" label="免费金币" width="100px" />
+                        <el-table-column prop="taskCoin" label="任务金币" width="100px" />
+                        <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
+                        <el-table-column prop="adminName" 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="createTime" label="提交时间" width="200px" />
+                        <el-table-column fixed="right" prop="operation" label="操作" width="150px">
+                            <template #default="scope">
+                                <div class="operation">
+                                    <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>
+                                        </template>
+                                        <template #actions="{ confirm, cancel }">
+                                            <el-button size="small" @click="cancel">取消</el-button>
+                                            <el-button type="primary" size="small" @click="confirm">
+                                                确定
+                                            </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>
+                                </div>
+                            </template>
+
+                        </el-table-column>
+                    </el-table>
+                </div>
+
+                <!-- 分页 -->
+                <div class="pagination">
+                    <el-pagination background :page-size="getObj.pageSize" layout="slot" :total="total">
+                        <div>共{{ total }}条,每页 </div>
+                        <el-select v-model="getObj.pageSize" class="page-size" @change="get()" style="width: 80px">
+                            <el-option v-for="item in [5, 6, 7, 8, 9, 10]" :key="item" :label="item"
+                                :value="item"></el-option>
+                        </el-select>
+                        <div> 条</div>
+                    </el-pagination>
+                    <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize"
+                        :total="total" :current-page="getObj.pageNum" @current-change="get">
+                        <div>跳至</div>
+                        <el-input v-model="getObj.pageNum" style="width: 40px;" @change="checkNumber" />
+                        <div>页</div>
+                    </el-pagination>
+                </div>
+            </el-card>
+        </el-col>
+    </el-row>
+
+    <!-- 驳回弹出框 -->
+    <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-item prop="reson" label="驳回理由:">
+                    <el-input v-model="rejectObj.reson" maxlength="150" show-word-limit style="width: 350px"
+                        type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+
+
+            </el-form>
+
+            <div class="dialog-footer">
+                <el-button @click="closeRejectVisible()">取消</el-button>
+                <el-button type="primary" @click="rejectConfirm()">
+                    确定
+                </el-button>
+            </div>
+        </template>
+    </el-dialog>
+
 </template>
 
 <style scoped>
+.pagination {
+    display: flex;
+}
+
+.status {
+    display: flex;
+}
+
+.operation {
+    display: flex;
+}
+
+.head-card {
+    display: flex;
+}
+
+.head-card-element {
+    margin-right: 20px;
+}
 
+.head-card-btn {
+    margin-left: auto;
+}
 </style>
\ No newline at end of file
diff --git a/vue/gold-system/src/views/managerecharge/activity.vue b/vue/gold-system/src/views/managerecharge/activity.vue
index db4b13f..8406c62 100644
--- a/vue/gold-system/src/views/managerecharge/activity.vue
+++ b/vue/gold-system/src/views/managerecharge/activity.vue
@@ -144,12 +144,13 @@ const add = async function () {
     })
 
 }
-
+// 删除=========================================================
+// 删除按钮
 const del = function (row) {
     delObj.value.activityId = row.activityId;
     console.log('delObj', delObj.value);
 }
-
+// 删除按钮的气泡弹出框确认按钮
 const delConfirm = async function () {
     try {
         console.log('delObj', delObj.value);
@@ -174,8 +175,8 @@ const checkFreeGoldRadio = function (rule, value, callback) {
     if (addObj.value.freeGold == 1) {
         if (value == '0' || value == null || value == '') {
             callback(new Error('请输入免费金币兑换比'))
-        } else {
-            callback();
+        }else if(value<0||typeof value!='number') {
+            callback(new Error('请输入正确的格式'));
         }
     } else {
         callback()
@@ -230,9 +231,9 @@ const checkNumber = function () {
     } else {
         //提示
         ElMessage({
-                type: 'error',
-                message: '请检查输入内容',
-            })
+            type: 'error',
+            message: '请检查输入内容',
+        })
     }
 }
 
@@ -306,11 +307,11 @@ onMounted(async function () {
                             </template>
                         </el-table-column>
                         <el-table-column prop="name" label="添加人" />
-                        <el-table-column prop="createTime" label="添加时间" >
+                        <el-table-column prop="createTime" label="添加时间">
                             <template #default="scope">
-                               {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+                                {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
                             </template>
-                            </el-table-column>
+                        </el-table-column>
                         <el-table-column prop="operation" label="操作">
                             <template #default="scope">
                                 <el-popconfirm title="确定将此条活动删除吗？" @confirm="delConfirm">
@@ -342,8 +343,8 @@ onMounted(async function () {
                         </el-select>
                         <div> 条</div>
                     </el-pagination>
-                    <el-pagination background layout="prev, pager, next, slot" :page-size="getObj.pageSize" :total="total"
-                        :current-page="getObj.pageNum" @current-change="get">
+                    <el-pagination background layout="prev, pager, next, slot" :page-size="getObj.pageSize"
+                        :total="total" :current-page="getObj.pageNum" @current-change="get">
                         <div>跳至</div>
                         <el-input v-model="getObj.pageNum" style="width: 40px;" @change="checkNumber" />
                         <div>页</div>
diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 47d7607..24110f7 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -1,152 +1,153 @@
 <script setup>
-  import { ref, onMounted,computed,reactive} from 'vue'
-  import { ElMessageBox } from 'element-plus'
-  import axios from 'axios'
-  import { createApp } from 'vue';
+import { ref, onMounted, computed, reactive } from 'vue'
+import { ElMessageBox } from 'element-plus'
+import axios from 'axios'
+import { createApp } from 'vue';
 
-  const regeAdd = ref(false)
-  const regeEdit = ref(false)
+const regeAdd = ref(false)
+const regeEdit = ref(false)
 
- //汇率表格数据
-  const tableData = ref([]);
+//汇率表格数据
+const tableData = ref([]);
 //搜索对象
 const getObj = ref({
-    pageNum: 1,
-    pageSize: 5,
+  pageNum: 1,
+  pageSize: 5,
 })
 //分页总条目
 const get = async function () {
-    try {
-        console.log('搜索参数', getObj.value);
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.174:10010/rates/search', {
-          ...getObj.value,
-         rate:{  ...value1.value},
-});
-
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        // 存储表格数据
-        tableData.value = result.data.data.list;
-        console.log('tableData', tableData.value);
-        // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
-        getObj.value.pageNum = result.data.data.pageNum;
-        getObj.value.pageSize = result.data.data.pageSize;
-        getObj.value.total = result.data.data.total;
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
+  try {
+    console.log('搜索参数', getObj.value);
+    // 发送POST请求
+    const result = await axios.post('http://192.168.8.174:10010/rates/search', {
+      ...getObj.value,
+      rate: { ...value1.value },
+    });
+
+    // 将响应结果存储到响应式数据中
+    console.log('请求成功', result);
+    // 存储表格数据
+    tableData.value = result.data.data.list;
+    console.log('tableData', tableData.value);
+    // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
+    getObj.value.pageNum = result.data.data.pageNum;
+    getObj.value.pageSize = result.data.data.pageSize;
+    getObj.value.total = result.data.data.total;
+  } catch (error) {
+    console.log('请求失败', error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
 }
 
-  // 添加方法
-  const rateAdd = ref({})
-  const addRate = async function () {
-
-    try {
-        console.log('搜索参数', getObj.value);
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.174:10010/rates/add', rateAdd.value);
-
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        get();
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
+// 添加方法
+const rateAdd = ref({})
+const addRate = async function () {
+
+  try {
+    console.log('搜索参数', getObj.value);
+    // 发送POST请求
+    const result = await axios.post('http://192.168.8.174:10010/rates/add', rateAdd.value);
+
+    // 将响应结果存储到响应式数据中
+    console.log('请求成功', result);
+    get();
+  } catch (error) {
+    console.log('请求失败', error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+
+}
+const add = () => {
+  Ref.value.validate(async (valid) => {
+    if (valid) {
+      ElMessageBox.confirm('确认添加？').then(() => {
+        addRate();
+        rateAdd.value = {}
+        value1.value = {
+          startTime: '',
+          endTime: '',
+        };
+        regeAdd.value = false
+      }).catch(() => {
+        regeAdd.value = false
+      })
+    } else {
+      //提示
+      ElMessage({
+        type: 'error',
+        message: '请检查输入内容',
+      })
     }
- 
+
+  })
 }
-  const add = () => {
-    Ref.value.validate(async (valid) => {
-      if (valid) {
-    ElMessageBox.confirm('确认添加？').then(() => {
-      addRate();
-      rateAdd.value = {}
-      value1.value = {
-        startTime: '',
-        endTime: '',
-      };
-      regeAdd.value = false
-    }).catch(() => {
-      regeAdd.value = false
-    }) } else {
-            //提示
-            ElMessage({
-                type: 'error',
-                message: '请检查输入内容',
-            })
-        }
-
-    })
-  }
 
 
-  // 编辑方法
+// 编辑方法
 const rateEdit = ref({})
 //查询已有的数据
 const getEditData = async function (row) {
-    try {
-        console.log('搜索参数', getObj.value);
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.174:10010/rates/search', {rate:{rateId:row.rateId}});
-
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        // 存储表格数据
-        rateEdit.value = result.data.data[0];
- 
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-}
-  const editRate = async function () {
-    try {
-        console.log('搜索参数', rateEdit.value);
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.174:10010/rates/update', rateEdit.value);
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        get();
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
+  try {
+    console.log('搜索参数', getObj.value);
+    // 发送POST请求
+    const result = await axios.post('http://192.168.8.174:10010/rates/search', { rate: { rateId: row.rateId } });
+
+    // 将响应结果存储到响应式数据中
+    console.log('请求成功', result);
+    // 存储表格数据
+    rateEdit.value = result.data.data[0];
+
+  } catch (error) {
+    console.log('请求失败', error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
 }
-  const edit = () => {
-    ElMessageBox.confirm('确认修改？').then(() => {
-      editRate();
-      regeEdit.value = false
-    }).catch(() => {
-      regeEdit.value = false
-    })
+const editRate = async function () {
+  try {
+    console.log('搜索参数', rateEdit.value);
+    // 发送POST请求
+    const result = await axios.post('http://192.168.8.174:10010/rates/update', rateEdit.value);
+    // 将响应结果存储到响应式数据中
+    console.log('请求成功', result);
+    get();
+  } catch (error) {
+    console.log('请求失败', error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
   }
+}
+const edit = () => {
+  ElMessageBox.confirm('确认修改？').then(() => {
+    editRate();
+    regeEdit.value = false
+  }).catch(() => {
+    regeEdit.value = false
+  })
+}
 
-  // 删除方法
-  const deleteRate = async function (row) {
-    try {
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.174:10010/rates/delete/ '+ row.rateId);
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        get();
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
+// 删除方法
+const deleteRate = async function (row) {
+  try {
+    // 发送POST请求
+    const result = await axios.post('http://192.168.8.174:10010/rates/delete/ ' + row.rateId);
+    // 将响应结果存储到响应式数据中
+    console.log('请求成功', result);
+    get();
+  } catch (error) {
+    console.log('请求失败', error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
 }
 
 // 挂载
-onMounted(async function(){
-    get();
+onMounted(async function () {
+  get();
 })
 //分页
-function handlePageChange(currentPage,pageSize){
-    get();
+function handlePageChange(currentPage, pageSize) {
+  get();
 }
-  //货币条目
-  const options = [
+//货币条目
+const options = [
   {
     value: 'USD',
     label: 'USD',
@@ -175,66 +176,66 @@ const value1 = ref({
   endTime: '',
 }); // 时间数组
 function handleDateChange(value) {
-      if (value && value.length === 2) {
-        value1.value.startTime = value[0]; // 开始日期
-        value1.value.endTime = value[1]; // 结束日期
-      }
-      console.log(value1);
-    }
+  if (value && value.length === 2) {
+    value1.value.startTime = value[0]; // 开始日期
+    value1.value.endTime = value[1]; // 结束日期
+  }
+  console.log(value1);
+}
 
 
-  function formatDate(value) {
-    if (!value) return '';
-    const date = new Date(value);
-    const year = date.getFullYear();
-    const month = (date.getMonth() + 1).toString().padStart(2, '0');
-    const day = date.getDate().toString().padStart(2, '0');
-    const hours = date.getHours().toString().padStart(2, '0');
-    const minutes = date.getMinutes().toString().padStart(2, '0');
-    const seconds = date.getSeconds().toString().padStart(2, '0');
-    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-  }
+function formatDate(value) {
+  if (!value) return '';
+  const date = new Date(value);
+  const year = date.getFullYear();
+  const month = (date.getMonth() + 1).toString().padStart(2, '0');
+  const day = date.getDate().toString().padStart(2, '0');
+  const hours = date.getHours().toString().padStart(2, '0');
+  const minutes = date.getMinutes().toString().padStart(2, '0');
+  const seconds = date.getSeconds().toString().padStart(2, '0');
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
 
 
 //表格高度
 const tableHeight = computed(function () {
-    return (getObj.value.pageSize + 1) * 50 + 'px';
+  return (getObj.value.pageSize + 1) * 50 + 'px';
 });
 
 // 新增数据规则
 // 表单验证ref
 const Ref = ref(null);
 const handleStartTimeChange = () => {
-    Ref.value.validateField('endTime');
+  Ref.value.validateField('endTime');
 };
 const checkStartTime = function (rule, value, callback) {
-    if (value <= new Date()) {
-        callback(new Error('开始时间不能小于当前时间'))
-    } else {
-        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()
-    }
+  if (value <= new Date()) {
+    callback(new Error('结束时间不能小于当前时间'))
+  } else if (value <= addObj.value.startTime) {
+    callback(new Error('结束时间不能小于开始时间'))
+  } else {
+    callback()
+  }
 }
 const rules = reactive({
-     currency: [{ required: true, message: '请选择货币名称', trigger: 'blur' },],
-     exchangeRate: [{ required: true, message: '请输入汇率', trigger: 'blur' },],
-     updateName: [{ required: true, message: '请输入添加人', trigger: 'blur' },],
-    startTime: [
-        { required: true, message: '请选择开始时间', trigger: 'blur' },
-        { validator: checkStartTime, trigger: 'blur' },
-    ],
-    endTime: [
-        { required: true, message: '请选择结束时间', trigger: 'blur' },
-        { validator: checkEndTime, trigger: 'blur' },
-    ],
+  currency: [{ required: true, message: '请选择货币名称', trigger: 'blur' },],
+  exchangeRate: [{ required: true, message: '请输入汇率', trigger: 'blur' },],
+  updateName: [{ required: true, message: '请输入添加人', trigger: 'blur' },],
+  startTime: [
+    { required: true, message: '请选择开始时间', trigger: 'blur' },
+    { validator: checkStartTime, trigger: 'blur' },
+  ],
+  endTime: [
+    { required: true, message: '请选择结束时间', trigger: 'blur' },
+    { validator: checkEndTime, trigger: 'blur' },
+  ],
 })
 </script>
 
@@ -242,190 +243,135 @@ const rules = reactive({
   <!-- 这是主页面 -->
   <el-row>
     <el-col>
-            <el-card >
-              <!-- 这是时间 -->
-            <div class="demo-range">
-              时间：
-              <el-date-picker
-        v-model="value1"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        @change="handleDateChange"
-        :size="size"
-        value-format="YYYY-MM-DD"
-              />
-              <!-- 按钮 -->
-              <el-button class="button-item" type="primary" style="float:right" @click="get">查询</el-button>
-              <el-button class="button-item"  style="float:right" @click="handledelete">重置</el-button>
-            </div>
-            </el-card>
-
-          </el-col>
-        </el-row>
-  
-
-    <el-row>
-      <el-col>
-            <el-card class="box-card" style="max-width: 100%">
-              <!-- 添加 -->
-            <div class="add-item">
-              <el-button style="color: #048EFB; border:1px solid #048EFB" @click=" regeAdd = true">新增汇率</el-button>
-            </div>
-            <!-- 表格 -->
-            <div>
-              <el-table :data="tableData" v-if="tableData.flag=1"  :height="tableHeight" style="width: 100%" >
-                <el-table-column prop="currency" label="货币名称" :span="3" />
-                <el-table-column prop="exchangeRate" label="汇率" :span="3"/>
-
-                <el-table-column prop="createTime" label="添加时间" :span="5">
-                  <template #default="scope">
-                    <span>{{ formatDate(scope.row.createTime) }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="updateTime" label="更新时间" :span="5">
-                  <template #default="scope">
-                    <span>{{ formatDate(scope.row.updateTime) }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="updateName" label="更新人" :span="4"/>
-                <el-table-column label="操作" :span="4">
-                  <template #default="scope">
-                    <el-button type="text" @click="regeEdit=true; getEditData(scope.row)">编辑</el-button>
-                  <el-button type="text" @click="deleteRate(scope.row)">删除</el-button>
-                  </template>
-                  
-                </el-table-column>
-              </el-table>
-            </div>
-            <!-- 分页 -->
-             <div class="pagination" >
-              <el-pagination background layout="prev, pager, next" 
-              v-model:current-page="getObj.pageNum"
-              v-model:page-size="getObj.pageSize"
-              :total="getObj.total"
-              @change="handlePageChange" />
-             </div>
-            </el-card>
-          
-        </el-col>
-      </el-row>
-
-      <!-- 这是添加弹窗 -->
-      <el-dialog
-      v-model="regeAdd"
-      title="新增汇率"
-      width="500"
-    >
-      <template #footer>
-        <el-form
-        ref="Ref"
-        style="max-width: 600px"
-        :model="rateAdd"
-        :rules="rules"
-        label-width="auto"
-        class="demo-ruleForm"
-        :size="formSize"
-        status-icon
-      >
+      <el-card>
+        <!-- 这是时间 -->
+        <div class="demo-range">
+          时间：
+          <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始时间"
+            end-placeholder="结束时间" @change="handleDateChange" :size="size" value-format="YYYY-MM-DD" />
+          <!-- 按钮 -->
+          <el-button class="button-item" type="primary" style="float:right" @click="get">查询</el-button>
+          <el-button class="button-item" style="float:right" @click="handledelete">重置</el-button>
+        </div>
+      </el-card>
+
+    </el-col>
+  </el-row>
+
+
+  <el-row>
+    <el-col>
+      <el-card class="box-card" style="max-width: 100%">
+        <!-- 添加 -->
+        <div class="add-item">
+          <el-button style="color: #048EFB; border:1px solid #048EFB" @click=" regeAdd = true">新增汇率</el-button>
+        </div>
+        <!-- 表格 -->
+        <div>
+          <el-table :data="tableData" v-if="tableData.flag = 1" :height="tableHeight" style="width: 100%">
+            <el-table-column prop="currency" label="货币名称" :span="3" />
+            <el-table-column prop="exchangeRate" label="汇率" :span="3" />
+
+            <el-table-column prop="createTime" label="添加时间" :span="5">
+              <template #default="scope">
+                <span>{{ formatDate(scope.row.createTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="updateTime" label="更新时间" :span="5">
+              <template #default="scope">
+                <span>{{ formatDate(scope.row.updateTime) }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="updateName" label="更新人" :span="4" />
+            <el-table-column label="操作" :span="4">
+              <template #default="scope">
+                <el-button type="text" @click="regeEdit = true; getEditData(scope.row)">编辑</el-button>
+                <el-button type="text" @click="deleteRate(scope.row)">删除</el-button>
+              </template>
+
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="pagination">
+          <el-pagination background layout="prev, pager, next" v-model:current-page="getObj.pageNum"
+            v-model:page-size="getObj.pageSize" :total="getObj.total" @change="handlePageChange" />
+        </div>
+      </el-card>
+
+    </el-col>
+  </el-row>
+
+  <!-- 这是添加弹窗 -->
+  <el-dialog v-model="regeAdd" title="新增汇率" width="500">
+    <template #footer>
+      <el-form ref="Ref" style="max-width: 600px" :model="rateAdd" :rules="rules" label-width="auto"
+        class="demo-ruleForm" :size="formSize" status-icon>
         <el-form-item prop="currency" label="货币名称:">
           <el-select v-model.number="rateAdd.currency" placeholder="请选择" style="width: 240px">
-            <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-            />
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item prop="exchangeRate" label="汇率:">
-          <el-input v-model="rateAdd.exchangeRate" style="width: 120px;"/><p class="unit">:1</p>
+          <el-input v-model="rateAdd.exchangeRate" style="width: 120px;" />
+          <p class="unit">:1</p>
           <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
         </el-form-item>
         <el-form-item prop="updateName" label="提交人:">
-          <el-input v-model="rateAdd.updateName" style="width: 240px;"/>
+          <el-input v-model="rateAdd.updateName" style="width: 240px;" />
         </el-form-item>
         <el-form-item prop="startTime" label="开始时间:">
-          <el-date-picker
-        v-model="rateAdd.startTime"
-        type="date"
-        placeholder="请选择时间"
-        :default-value="new Date"
-        @change="handleStartTimeChange"
-        value-format="YYYY-MM-DD"
-      />
+          <el-date-picker v-model="rateAdd.startTime" type="date" placeholder="请选择时间" :default-value="new Date"
+            @change="handleStartTimeChange" value-format="YYYY-MM-DD" />
         </el-form-item>
         <el-form-item prop="endTime" label="结束时间:">
-          <el-date-picker
-          v-model="rateAdd.endTime"
-          type="date"
-          placeholder="请选择时间"
-          :default-value="new Date"
-          value-format="YYYY-MM-DD"
-        />
+          <el-date-picker v-model="rateAdd.endTime" type="date" placeholder="请选择时间" :default-value="new Date"
+            value-format="YYYY-MM-DD" />
         </el-form-item>
-        <el-form-item >
+        <el-form-item>
           <div class="dialog-footer">
-          <el-button  type="primary" @click="add">添加</el-button>
-          <el-button @click="regeAdd = false">取消</el-button>
+            <el-button type="primary" @click="add">添加</el-button>
+            <el-button @click="regeAdd = false">取消</el-button>
           </div>
-      </el-form-item>
+        </el-form-item>
       </el-form>
-      </template>
-    </el-dialog>
-
-     <!-- 这是编辑弹窗 -->
-     <el-dialog
-     v-model="regeEdit"
-     title="修改汇率"
-     width="500"
-   >
-     <template #footer>
-       <el-form
-       ref="ruleFormRef"
-       style="max-width: 600px"
-       :model="rateEdit"
-       :rules="rules"
-       label-width="auto"
-       class="demo-ruleForm"
-       :size="formSize"
-       status-icon
-     >
-       <el-form-item label="货币名称:">
-         <el-select v-model="rateEdit.currency" placeholder="请选择" style="width: 240px">
-           <el-option
-           v-for="item in options"
-           :key="item.value"
-           :label="item.label"
-           :value="item.value"
-           />
-         </el-select>
-       </el-form-item>
-       <el-form-item label="汇率:">
-         <el-input v-model="rateEdit.exchangeRate" style="width: 120px;"/><p class="unit">:1</p>
-         <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
-       </el-form-item>
-       <el-form-item label="提交人:">
-         <el-input v-model="rateEdit.updateName" style="width: 240px;"/>
-       </el-form-item>
-       <el-form-item >
-         <div class="dialog-footer">
-         <el-button  type="primary" @click="edit">修改</el-button>
-         <el-button @click="regeEdit = false">取消</el-button>
-         </div>
-     </el-form-item>
-     </el-form>
-     </template>
-   </el-dialog>
+    </template>
+  </el-dialog>
+
+  <!-- 这是编辑弹窗 -->
+  <el-dialog v-model="regeEdit" title="修改汇率" width="500">
+    <template #footer>
+      <el-form ref="ruleFormRef" style="max-width: 600px" :model="rateEdit" :rules="rules" label-width="auto"
+        class="demo-ruleForm" :size="formSize" status-icon>
+        <el-form-item label="货币名称:">
+          <el-select v-model="rateEdit.currency" placeholder="请选择" style="width: 240px">
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="汇率:">
+          <el-input v-model="rateEdit.exchangeRate" style="width: 120px;" />
+          <p class="unit">:1</p>
+          <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
+        </el-form-item>
+        <el-form-item label="提交人:">
+          <el-input v-model="rateEdit.updateName" style="width: 240px;" />
+        </el-form-item>
+        <el-form-item>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="edit">修改</el-button>
+            <el-button @click="regeEdit = false">取消</el-button>
+          </div>
+        </el-form-item>
+      </el-form>
+    </template>
+  </el-dialog>
 
 
 </template>
 
 
 <style scoped>
-
-p{
+p {
   margin: 0px
 }
 
@@ -434,7 +380,7 @@ p{
 
 }
 
-.ad{
+.ad {
   margin-left: 10px;
 }
 
@@ -442,25 +388,32 @@ p{
   margin-top: 20px;
   margin-left: 33%;
 }
+
 .box-card {
   margin-top: 20px;
 }
+
 .button-item {
   margin-left: 10px;
 }
+
 .add-item {
   margin-bottom: 10px;
 }
-el-table-column{
+
+el-table-column {
   text-align: center;
 }
-p{
+
+p {
   color: rgb(150, 150, 150);
 }
-.unit{
+
+.unit {
   margin-left: 10px;
 }
-.el-card{
+
+.el-card {
   padding: 0px;
 }
 </style>
\ No newline at end of file
diff --git a/vue/gold-system/src/views/recharge/adminRecharge.vue b/vue/gold-system/src/views/recharge/adminRecharge.vue
index abcb37e..35ad070 100644
--- a/vue/gold-system/src/views/recharge/adminRecharge.vue
+++ b/vue/gold-system/src/views/recharge/adminRecharge.vue
@@ -4,6 +4,7 @@ import ElementPlus from "element-plus";
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { AiFillRead } from "vue-icons-plus/ai";
 import axios from 'axios';
+import moment from 'moment';
 // 变量
 // 用户对象假的
 const admin = ref({
@@ -250,9 +251,9 @@ const checkNumber = function () {
     } else {
         //提示
         ElMessage({
-                type: 'error',
-                message: '请检查输入内容',
-            })
+            type: 'error',
+            message: '请检查输入内容',
+        })
     }
 }
 
@@ -317,7 +318,7 @@ onMounted(async function () {
                     <el-col :span="3">
                         <div class="head-card-btn">
                             <el-button @click="reset()">重置</el-button>
-                            <el-button type="primary" @click="get()" >查询</el-button>
+                            <el-button type="primary" @click="get()">查询</el-button>
                         </div>
                     </el-col>
                 </el-row>
@@ -344,7 +345,11 @@ onMounted(async function () {
                         <el-table-column prop="freeGold" label="免费金币" width="100px" />
                         <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" />
+                        <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">
@@ -369,7 +374,11 @@ onMounted(async function () {
                             </template>
                         </el-table-column>
                         <el-table-column prop="reson" label="驳回理由" width="200px" show-overflow-tooltip />
-                        <el-table-column prop="rechargeTime" label="交款时间" width="200px" />
+                        <el-table-column prop="rechargeTime" label="交款时间" 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="提交时间" width="200px" />
                         <el-table-column fixed="right" prop="operation" label="操作" width="150px">
                             <template #default="scope">
@@ -402,8 +411,8 @@ onMounted(async function () {
                         </el-select>
                         <div> 条</div>
                     </el-pagination>
-                    <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize" :total="total"
-                        :current-page="getObj.pageNum" @current-change="get">
+                    <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize"
+                        :total="total" :current-page="getObj.pageNum" @current-change="get">
                         <div>跳至</div>
                         <el-input v-model="getObj.pageNum" style="width: 40px;" @change="checkNumber" />
                         <div>页</div>
diff --git a/vue/gold-system/src/views/recharge/allRecharge.vue b/vue/gold-system/src/views/recharge/allRecharge.vue
index 67011d6..01d45c0 100644
--- a/vue/gold-system/src/views/recharge/allRecharge.vue
+++ b/vue/gold-system/src/views/recharge/allRecharge.vue
@@ -4,6 +4,7 @@ import ElementPlus from "element-plus";
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { AiFillRead } from "vue-icons-plus/ai";
 import axios from 'axios';
+import moment from 'moment';
 // 变量
 // 充值明细表格
 const tableData = ref([]);
@@ -221,9 +222,9 @@ const checkNumber = function () {
     } else {
         //提示
         ElMessage({
-                type: 'error',
-                message: '请检查输入内容',
-            })
+            type: 'error',
+            message: '请检查输入内容',
+        })
     }
 }
 
@@ -343,7 +344,11 @@ onMounted(async function () {
                             </template>
                         </el-table-column>
                         <el-table-column prop="reson" label="驳回理由" width="200px" show-overflow-tooltip />
-                        <el-table-column prop="rechargeTime" label="交款时间" width="200px" />
+                        <el-table-column prop="rechargeTime" label="交款时间" 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="提交时间" width="200px" />
                     </el-table>
                 </div>
@@ -358,8 +363,8 @@ onMounted(async function () {
                         </el-select>
                         <div> 条</div>
                     </el-pagination>
-                    <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize" :total="total"
-                        :current-page="getObj.pageNum" @current-change="get">
+                    <el-pagination background layout="prev, pager, next,slot" :page-size="getObj.pageSize"
+                        :total="total" :current-page="getObj.pageNum" @current-change="get">
                         <div>跳至</div>
                         <el-input v-model="getObj.pageNum" style="width: 40px;" @change="checkNumber" />
                         <div>页</div>
@@ -375,7 +380,7 @@ onMounted(async function () {
 .pagination {
     display: flex;
 }
- 
+
 .status {
     display: flex;
 }
diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue
index e905a10..e03f26e 100644
--- a/vue/gold-system/src/views/workspace/index.vue
+++ b/vue/gold-system/src/views/workspace/index.vue
@@ -35,6 +35,45 @@ onMounted(function () {
 
     // 使用刚指定的配置项和数据显示图表。
     myChart.setOption(option);
+
+    option = {
+        tooltip: {
+            trigger: 'item'
+        },
+        legend: {
+            top: '5%',
+            left: 'center'
+        },
+        series: [
+            {
+                name: 'Access From',
+                type: 'pie',
+                radius: ['40%', '70%'],
+                avoidLabelOverlap: false,
+                label: {
+                    show: false,
+                    position: 'center'
+                },
+                emphasis: {
+                    label: {
+                        show: true,
+                        fontSize: 40,
+                        fontWeight: 'bold'
+                    }
+                },
+                labelLine: {
+                    show: false
+                },
+                data: [
+                    { value: 1048, name: 'Search Engine' },
+                    { value: 735, name: 'Direct' },
+                    { value: 580, name: 'Email' },
+                    { value: 484, name: 'Union Ads' },
+                    { value: 300, name: 'Video Ads' }
+                ]
+            }
+        ]
+    };
 })
 
 
@@ -81,7 +120,7 @@ onMounted(function () {
             <el-card>
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="金币充值" name="recharge">
-                        <div id="main" style="width: 600px;height:400px;"></div>
+                        <div id="recharge" style="width: 600px;height:400px;"></div>
                     </el-tab-pane>
                     <el-tab-pane label="金币消费" name="consume">
                         <div>金币消费</div>
@@ -107,8 +146,9 @@ onMounted(function () {
                 <template #header>
                     <div class="card-header" style="display: flex;">
                         <span>金币消耗类别占比</span>
-                        <el-radio-group v-model="platform" fill="#ffffff" text-color="#409eff" size="small" style="margin-left: auto;">
-                            <el-radio-button  label="全部平台" value="all" />
+                        <el-radio-group v-model="platform" fill="#ffffff" text-color="#409eff" size="small"
+                            style="margin-left: auto;">
+                            <el-radio-button label="全部平台" value="all" />
                             <el-radio-button label="HC" value="hc" />
                             <el-radio-button label="Link" value="link" />
                         </el-radio-group>
@@ -121,11 +161,11 @@ onMounted(function () {
 </template>
 
 <style scoped>
-.el-row{
+.el-row {
     margin-bottom: 20px;
 }
 
-.el-radio-button{
+.el-radio-button {
     border: 1px solid grey;
 }
 </style>
\ No newline at end of file