From 361f2955fc2d73537e9c6ea27c8aaa13cfa2ac0f Mon Sep 17 00:00:00 2001
From: donghaolin <17667510818@163.com>
Date: Thu, 5 Dec 2024 13:54:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=99=E6=98=AF=E5=8A=A0=E4=BA=86token?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E8=BF=98=E6=9C=89=E9=80=9A=E8=BF=87token?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/util/http.js                   |   20 +-
 vue/gold-system/src/views/audit/rechargeAudit.vue  | 1020 ++++++++++++--------
 vue/gold-system/src/views/audit/refundAudit.vue    |  981 +++++++++++--------
 vue/gold-system/src/views/consume/addConsume.vue   |   39 +-
 vue/gold-system/src/views/consume/allConsume.vue   |   21 +-
 vue/gold-system/src/views/index.vue                |   30 +-
 vue/gold-system/src/views/login.vue                |    6 +-
 .../src/views/managerecharge/activity.vue          |  761 ++++++++-------
 vue/gold-system/src/views/managerecharge/rate.vue  |   52 +-
 vue/gold-system/src/views/recharge/addRecharge.vue |   33 +-
 .../src/views/recharge/adminRecharge.vue           |   17 +-
 vue/gold-system/src/views/recharge/allRecharge.vue |   15 +-
 vue/gold-system/src/views/refund/addRefund.vue     |   31 +-
 vue/gold-system/src/views/refund/allRefund.vue     |   27 +-
 vue/gold-system/src/views/usergold/index.vue       |  431 +++++----
 15 files changed, 2047 insertions(+), 1437 deletions(-)

diff --git a/vue/gold-system/src/util/http.js b/vue/gold-system/src/util/http.js
index 07c2402..2d4e309 100644
--- a/vue/gold-system/src/util/http.js
+++ b/vue/gold-system/src/util/http.js
@@ -3,10 +3,10 @@ import axios from 'axios';
 export default function (options) {
     //配置每次发送请求都从localStorage中获取名字叫token的数据,
     //添加到请求头部的Authorization属性中
-
+    const token = localStorage.getItem('token');
     //Object.assign用于合并对象的数据
     options.headers = Object.assign(
-        { Authorization: localStorage.getItem('token') },
+        { token: token },
         options.headers || {}
     );
     //axios()   返回一个promise对象，用于异步请求
@@ -22,11 +22,21 @@ export default function (options) {
             if (status == 200) {
                 return data;
             } else {
-                throw new Error(statusText);
+                throw new e(statusText);
             }
         })
        .catch(e=>{
+           // 检查是否是因为token过期导致的401错误
+           if (e.response && e.response.status === 401) {
+            // 清除localStorage中的token
+            localStorage.removeItem('token');
+            // 执行重新登录的逻辑，例如跳转到登录页面
+            window.location.href = '/login';
+            // 可以在这里返回一个特定的值或者对象，以便调用者知道需要重新登录
+            return { needsLogin: true };
+        } else {
+            // 其他类型的错误，直接抛出
             return Promise.reject(e);
-            //return Promise.reject(e.message);
-        });
+        }
+    });
 }
\ No newline at end of file
diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue
index 86ecc19..fd51ff2 100644
--- a/vue/gold-system/src/views/audit/rechargeAudit.vue
+++ b/vue/gold-system/src/views/audit/rechargeAudit.vue
@@ -1,17 +1,18 @@
 <script setup>
 import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from "element-plus";
 import { AiFillRead } from "vue-icons-plus/ai";
-import axios from 'axios';
-import moment from 'moment';
+import axios from "axios";
+import moment from "moment";
+import API from "../../api/index.js";
 // 变量
 // 用户对象假的
 const admin = ref({
-    adminId: 1,
-    name: '赵刚',
-    area: '中国'
-})
+  adminId: 1,
+  name: "赵刚",
+  area: "中国",
+});
 
 // 充值明细表格
 const tableData = ref([]);
@@ -20,8 +21,8 @@ const tableData = ref([]);
 const rechargeVo = ref({});
 // 搜索对象
 const getObj = ref({
-    pageNum: 1,
-    pageSize: 5,
+  pageNum: 1,
+  pageSize: 5,
 });
 //分页总条目
 const total = ref(100);
@@ -43,35 +44,35 @@ const rejectObj = ref({});
 const passObj = ref({});
 
 //标签页默认高亮选项
-const activeName = ref('all')
+const activeName = ref("all");
 
 // 支付方式选项
 const payWay = [
-    {
-        value: '微信',
-        label: '微信',
-    },
-    {
-        value: '支付宝',
-        label: '支付宝',
-    },
-    {
-        value: '银联',
-        label: '银联',
-    },
-    {
-        value: '信用卡',
-        label: '信用卡',
-    },
-    {
-        value: '借记卡',
-        label: '借记卡',
-    },
-]
+  {
+    value: "微信",
+    label: "微信",
+  },
+  {
+    value: "支付宝",
+    label: "支付宝",
+  },
+  {
+    value: "银联",
+    label: "银联",
+  },
+  {
+    value: "信用卡",
+    label: "信用卡",
+  },
+  {
+    value: "借记卡",
+    label: "借记卡",
+  },
+];
 
 //表格高度
 const tableHeight = computed(function () {
-    return (getObj.value.pageSize + 2) * 60 + 'px';
+  return (getObj.value.pageSize + 2) * 60 + "px";
 });
 
 // 表单验证ref
@@ -81,472 +82,635 @@ 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);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
+  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 API.post(
+      "http://192.168.8.93:10010/recharge/recharge",
+      { ...getObj.value, rechargeVo: { ...rechargeVo.value } }
+    );
+
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储表格数据
+    tableData.value = result.data.list;
+    console.log("tableData", tableData.value);
+    // 存储分页总数
+    total.value = result.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 = '';
-    getTime.value = {};
-}
+  rechargeVo.value.activityId = "";
+  rechargeVo.value.payWay = "";
+  rechargeVo.value.area = "";
+  rechargeVo.value.startDate = "";
+  rechargeVo.value.endDate = "";
+  getTime.value = {};
+};
 // 今天
 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 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();
-}
+  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 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();
-}
+  console.log("adminAll");
+  rechargeVo.value.status = "";
+  get();
+};
 //待审核充值明细
 const adminWait = function () {
-    rechargeVo.value.status = 0;
-    get();
-    console.log('adminWait');
-}
+  rechargeVo.value.status = 0;
+  get();
+  console.log("adminWait");
+};
 //已通过充值明细
 const adminPass = function () {
-    rechargeVo.value.status = 1;
-    get();
-    console.log('adminPass');
-}
+  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();
-    }
-}
+  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);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-}
+  try {
+    // 发送POST请求
+    const result = await API.post(
+      "http://192.168.8.93:10010/recharge/activity/select",
+      {}
+    );
+
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储表格数据
+    activity.value = result.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);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-
-}
+  try {
+    // 发送POST请求
+    const result = await API.post(
+      "http://192.168.8.93:10010/recharge/recharge",
+      {}
+    );
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储全部数据
+    allData.value = result.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: '请检查输入内容',
-            })
-        }
+  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: '请检查输入内容',
-        })
+      //提示
+      ElMessage({
+        type: "error",
+        message: "请检查输入内容",
+      });
     }
-}
+  } else {
+    //提示
+    ElMessage({
+      type: "error",
+      message: "请检查输入内容",
+    });
+  }
+};
 
 // 编辑====================================
 // 通过按钮
 const pass = function (row) {
-    // 通过初始化
-    passObj.value.adminId = admin.value.adminId;
-    passObj.value.auditId = row.auditId;
-    passObj.value.status = 1;
-    console.log('通过对象', passObj.value);
-}
+  // 通过初始化
+  passObj.value.adminId = admin.value.adminId;
+  passObj.value.auditId = row.auditId;
+  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);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-}
+  try {
+    console.log("通过对象", passObj.value);
+    // 发送POST请求
+    const result = await API.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;
-}
+  rejectVisible.value = true;
+};
 // 关闭驳回弹出框
 const closeRejectVisible = function () {
-    rejectVisible.value = false;
-}
+  rejectVisible.value = false;
+};
 // 驳回按钮
 const reject = function (row) {
-    // 驳回初始化
-    rejectObj.value.adminId = admin.value.adminId;
-    rejectObj.value.auditId = row.auditId;
-    rejectObj.value.status = 2;
-    rejectObj.value.reson = '';
-    console.log('驳回对象', rejectObj.value);
-    openRejectVisible();
-}
+  // 驳回初始化
+  rejectObj.value.adminId = admin.value.adminId;
+  rejectObj.value.auditId = row.auditId;
+  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: '请检查输入内容',
-            })
-        }
-
-    })
+  Ref.value.validate(async (valid) => {
+    if (valid) {
+      try {
+        console.log("驳回对象", rejectObj.value);
+        // 发送POST请求
+        const result = await API.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' },],
-})
+  reson: [{ required: true, message: "请输入驳回理由", trigger: "blur" }],
+});
 
 // 挂载
 onMounted(async function () {
-    await get();
-    getActivity();
-    await getArea();
-})
-
+  await get();
+  getActivity();
+  await getArea();
+});
 </script>
 
 <template>
-    <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="jwcode" 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>
+  <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>
-        </template>
-    </el-dialog>
-
+          </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="jwcode" 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;
+  display: flex;
 }
 
 .status {
-    display: flex;
+  display: flex;
 }
 
 .operation {
-    display: flex;
+  display: flex;
 }
 
 .head-card {
-    display: flex;
+  display: flex;
 }
 
 .head-card-element {
-    margin-right: 20px;
+  margin-right: 20px;
 }
 
 .head-card-btn {
-    margin-left: auto;
+  margin-left: auto;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue
index f460cea..78b03d5 100644
--- a/vue/gold-system/src/views/audit/refundAudit.vue
+++ b/vue/gold-system/src/views/audit/refundAudit.vue
@@ -1,17 +1,18 @@
 <script setup>
 import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from "element-plus";
 import { AiFillRead } from "vue-icons-plus/ai";
-import axios from 'axios';
-import moment from 'moment';
+import axios from "axios";
+import moment from "moment";
+import API from "../../api/index.js";
 // 变量
 // 用户对象假的
 const admin = ref({
-    adminId: 1,
-    name: '赵刚',
-    area: '中国'
-})
+  adminId: 1,
+  name: "赵刚",
+  area: "中国",
+});
 
 // 充值明细表格
 const tableData = ref([]);
@@ -20,8 +21,8 @@ const tableData = ref([]);
 const consumeDetail = ref({});
 // 搜索对象
 const getObj = ref({
-    pageNum: 1,
-    pageSize: 5,
+  pageNum: 1,
+  pageSize: 5,
 });
 //分页总条目
 const total = ref(100);
@@ -43,23 +44,23 @@ const rejectObj = ref({});
 const passObj = ref({});
 
 //标签页默认高亮选项
-const activeName = ref('all')
+const activeName = ref("all");
 
 // 退款类型选项
 const refundType = [
-    {
-        value: '退金币',
-        label: '退金币',
-    },
-    {
-        value: '退商品',
-        label: '退商品',
-    },
-]
+  {
+    value: "退金币",
+    label: "退金币",
+  },
+  {
+    value: "退商品",
+    label: "退商品",
+  },
+];
 
 //表格高度
 const tableHeight = computed(function () {
-    return (getObj.value.pageSize + 1) * 50 + 'px';
+  return (getObj.value.pageSize + 1) * 50 + "px";
 });
 
 // 表单验证ref
@@ -69,472 +70,620 @@ 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 != '') {
-                consumeDetail.value.startDate = getTime.value[0];
-                consumeDetail.value.endDate = getTime.value[1];
-            }
-        } else {
-            consumeDetail.value.startDate = '';
-            consumeDetail.value.endDate = '';
-        }
-        console.log('搜索参数', getObj.value);
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10030/audit/audit/refund', { ...getObj.value, consumeDetail: { ...consumeDetail.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);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
+  try {
+    // 搜索参数页码赋值
+    if (typeof val === "number") {
+      getObj.value.pageNum = val;
     }
-}
+    // 搜索参数时间赋值
+    if (getTime.value != null) {
+      if (getTime.value.startDate != "" && getTime.value.endDate != "") {
+        consumeDetail.value.startDate = getTime.value[0];
+        consumeDetail.value.endDate = getTime.value[1];
+      }
+    } else {
+      consumeDetail.value.startDate = "";
+      consumeDetail.value.endDate = "";
+    }
+    console.log("搜索参数", getObj.value);
+    // 发送POST请求
+    const result = await API.post(
+      "http://192.168.8.93:10030/audit/audit/refund",
+      { ...getObj.value, consumeDetail: { ...consumeDetail.value } }
+    );
+
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储表格数据
+    tableData.value = result.data.list;
+    console.log("tableData", tableData.value);
+    // 存储分页总数
+    total.value = result.data.total;
+    console.log("total", total.value);
+  } catch (error) {
+    console.log("请求失败", error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 // 重置
 const reset = function () {
-    consumeDetail.value.area = '';
-    consumeDetail.value.refundType='';
-    consumeDetail.value.refundGoods='';
-    consumeDetail.value.startDate = '';
-    consumeDetail.value.endDate = '';
-    getTime.value = {};
-}
+  consumeDetail.value.area = "";
+  consumeDetail.value.refundType = "";
+  consumeDetail.value.refundGoods = "";
+  consumeDetail.value.startDate = "";
+  consumeDetail.value.endDate = "";
+  getTime.value = {};
+};
 // 今天
 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 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();
-}
+  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 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');
-    consumeDetail.value.status = '';
-    get();
-}
+  console.log("adminAll");
+  consumeDetail.value.status = "";
+  get();
+};
 //待审核充值明细
 const adminWait = function () {
-    consumeDetail.value.status = 0;
-    get();
-    console.log('adminWait');
-}
+  consumeDetail.value.status = 0;
+  get();
+  console.log("adminWait");
+};
 //已通过充值明细
 const adminPass = function () {
-    consumeDetail.value.status = 1;
-    get();
-    console.log('adminPass');
-}
+  consumeDetail.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();
-    }
-}
+  if (tab.props.name === "all") {
+    adminAll();
+  } else if (tab.props.name === "wait") {
+    adminWait();
+  } else if (tab.props.name === "pass") {
+    adminPass();
+  }
+};
 // 获取活动名称
 const getProduct = async function () {
-    try {
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10020/product', {});
-
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        // 存储表格数据
-        product.value = result.data.data;
-        console.log('产品', product.value);
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-}
+  try {
+    // 发送POST请求
+    const result = await API.post("http://192.168.8.93:10020/product", {});
+
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储表格数据
+    product.value = result.data;
+    console.log("产品", product.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);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-
-}
+  try {
+    // 发送POST请求
+    const result = await API.post(
+      "http://192.168.8.93:10010/recharge/recharge",
+      {}
+    );
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储全部数据
+    allData.value = result.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: '请检查输入内容',
-            })
-        }
+  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: '请检查输入内容',
-        })
+      //提示
+      ElMessage({
+        type: "error",
+        message: "请检查输入内容",
+      });
     }
-}
+  } else {
+    //提示
+    ElMessage({
+      type: "error",
+      message: "请检查输入内容",
+    });
+  }
+};
 
 // 编辑====================================
 // 通过按钮
 const pass = function (row) {
-    // 通过初始化
-    passObj.value.adminId=admin.value.adminId;
-    passObj.value.auditId = row.auditId;
-    passObj.value.status = 1;
-    console.log('通过对象', passObj.value);
-}
+  // 通过初始化
+  passObj.value.adminId = admin.value.adminId;
+  passObj.value.auditId = row.auditId;
+  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);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-}
+  try {
+    console.log("通过对象", passObj.value);
+    // 发送POST请求
+    const result = await API.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;
-}
+  rejectVisible.value = true;
+};
 // 关闭驳回弹出框
 const closeRejectVisible = function () {
-    rejectVisible.value = false;
-}
+  rejectVisible.value = false;
+};
 // 驳回按钮
 const reject = function (row) {
-    // 驳回初始化
-    rejectObj.value.adminId=admin.value.adminId;
-    rejectObj.value.auditId = row.auditId;
-    rejectObj.value.status = 2;
-    rejectObj.value.reson = '';
-    console.log('驳回对象', rejectObj.value);
-    openRejectVisible();
-}
+  // 驳回初始化
+  rejectObj.value.adminId = admin.value.adminId;
+  rejectObj.value.auditId = row.auditId;
+  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: '请检查输入内容',
-            })
-        }
-
-    })
+  Ref.value.validate(async (valid) => {
+    if (valid) {
+      try {
+        console.log("驳回对象", rejectObj.value);
+        // 发送POST请求
+        const result = await API.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' },],
-})
+  reson: [{ required: true, message: "请输入驳回理由", trigger: "blur" }],
+});
 
 // 挂载
 onMounted(async function () {
-    await get();
-    getProduct();
-    await getArea();
-})
-
+  await get();
+  getProduct();
+  await getArea();
+});
 </script>
 
 <template>
-    <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="consumeDetail.refundType" placeholder="请选择退款类型" size="large"
-                                style="width: 240px">
-                                <el-option v-for="item in refundType" :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="consumeDetail.refundGoods" placeholder="请选择退款商品" size="large"
-                                style="width: 240px">
-                                <el-option v-for="item in product" :key="item.name" :label="item.name"
-                                    :value="item.name" />
-                            </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="consumeDetail.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="user" label="姓名" width="100px" />
-                        <el-table-column prop="jwcode" label="精网号" width="150px" />
-                        <el-table-column prop="area" label="所属地区" width="100px" />
-                        <el-table-column prop="refundType" label="退款类型" width="150px" />
-                        <el-table-column prop="refundGoods" 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="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="createTime" label="提交时间" width="200px">
-                            <template #default="scope">
-                                {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
-                            </template>
-                        </el-table-column>
-                        <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>
+  <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="consumeDetail.refundType"
+                placeholder="请选择退款类型"
+                size="large"
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="item in refundType"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </div>
-        </template>
-    </el-dialog>
-
+          </el-col>
+          <el-col :span="8">
+            <div class="head-card-element">
+              <el-text class="mx-1" size="large">退款商品：</el-text>
+              <el-select
+                v-model="consumeDetail.refundGoods"
+                placeholder="请选择退款商品"
+                size="large"
+                style="width: 240px"
+              >
+                <el-option
+                  v-for="item in product"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.name"
+                />
+              </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="consumeDetail.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="user" label="姓名" width="100px" />
+            <el-table-column prop="jwcode" label="精网号" width="150px" />
+            <el-table-column prop="area" label="所属地区" width="100px" />
+            <el-table-column prop="refundType" label="退款类型" width="150px" />
+            <el-table-column
+              prop="refundGoods"
+              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="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="createTime" label="提交时间" width="200px">
+              <template #default="scope">
+                {{ moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") }}
+              </template>
+            </el-table-column>
+            <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;
+  display: flex;
 }
 
 .status {
-    display: flex;
+  display: flex;
 }
 
 .operation {
-    display: flex;
+  display: flex;
 }
 
 .head-card {
-    display: flex;
+  display: flex;
 }
 
 .head-card-element {
-    margin-right: 20px;
+  margin-right: 20px;
 }
 
 .head-card-btn {
-    margin-left: auto;
+  margin-left: auto;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue
index 637222b..459a929 100644
--- a/vue/gold-system/src/views/consume/addConsume.vue
+++ b/vue/gold-system/src/views/consume/addConsume.vue
@@ -5,6 +5,25 @@ import { ElMessage } from "element-plus";
 import { Plus } from "@element-plus/icons-vue";
 import axios from "axios";
 import { ElMessageBox } from "element-plus";
+import API from "../../api/index.js";
+
+//这是获取用户信息的接口
+const adminData = ref({});
+const getAdminData = async function () {
+  try {
+    const result = await API.post(
+      "http://192.168.8.93:10070/admin/userinfo",
+      {}
+    );
+    adminData.value = result;
+    addConsume.value.adminId = adminData.value.adminId;
+    console.log("请求成功", result);
+    console.log("用户信息", adminData.value);
+  } catch (error) {
+    console.log("请求失败", error);
+  }
+};
+getAdminData();
 
 // 这是添加消费信息的表单
 const addConsume = ref({
@@ -17,7 +36,7 @@ const addConsume = ref({
 const add = async function () {
   try {
     // 发送POST请求
-    const result = await axios.post(
+    const result = await API.post(
       "http://192.168.8.147:10030/consume/add",
       addConsume.value
     );
@@ -64,7 +83,7 @@ const checkEndTime = function (rule, value, callback) {
 };
 const rules = reactive({
   jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }],
-  goods: [{ required: true, message: "请选择消费商品", trigger: "blur" }],
+  productId: [{ required: true, message: "请选择消费商品", trigger: "blur" }],
   taskCoin: [{ required: true, message: "请输入任务金币", trigger: "blur" }],
   freeCoin: [{ required: true, message: "请输入免费金币", trigger: "blur" }],
   rechargeCoin: [
@@ -78,14 +97,14 @@ const user = ref({});
 const getUser = async function (jwcode) {
   try {
     // 发送POST请求
-    const result = await axios.post("http://192.168.8.93:10020/recharge/user", {
+    const result = await API.post("http://192.168.8.93:10020/recharge/user", {
       jwcode: jwcode,
     });
 
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    user.value = result.data.data[0];
+    user.value = result.data[0];
     console.log("用户信息", user.value);
     if (result.data.code === 0) {
       ElMessage.error(result.data.msg);
@@ -104,11 +123,11 @@ const goods = ref([]);
 const getGoods = async function () {
   try {
     // 发送POST请求
-    const result = await axios.post("http://192.168.8.93:10020/product", {});
+    const result = await API.post("http://192.168.8.93:10020/product", {});
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储全部数据
-    goods.value = result.data.data;
+    goods.value = result.data;
     console.log("allData", allData.value);
     console.log("地区", area.value);
   } catch (error) {
@@ -122,12 +141,12 @@ getGoods();
 const userGold = ref({});
 const getUserGold = async function (jwcode) {
   try {
-    const result = await axios.post(
+    const result = await API.post(
       "http://192.168.8.147:10070/statistics/getMess/" + jwcode
     );
     console.log("请求成功", result);
     // 存储全部数据
-    userGold.value = result.data.data;
+    userGold.value = result.data;
     console.log("userGold", userGold.value);
   } catch (error) {
     console.log("请求失败", error);
@@ -189,7 +208,7 @@ function calculateCoins() {
         >查询</el-button
       >
     </el-form-item>
-    <el-form-item prop="goods" label="商品名称">
+    <el-form-item prop="productId" label="商品名称">
       <el-select
         v-model="addConsume.productId"
         placeholder="请选择"
@@ -257,7 +276,7 @@ function calculateCoins() {
     <el-form-item prop="commitName" label="提交人">
       <el-input
         style="width: 300px"
-        value="张三"
+        :value="adminData.name"
         disabled
         placeholder="提交人姓名"
       />
diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue
index 48d14c0..d6e20b0 100644
--- a/vue/gold-system/src/views/consume/allConsume.vue
+++ b/vue/gold-system/src/views/consume/allConsume.vue
@@ -3,6 +3,7 @@ import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
 import { AiFillRead } from "vue-icons-plus/ai";
 import axios from "axios";
+import API from "../../api/index.js";
 // 变量
 // 充值明细表格
 const tableData = ref([]);
@@ -79,18 +80,18 @@ const get = async function (val) {
     }
     console.log("搜索参数", getObj.value);
     // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.147:10030/consume/select",
-      { ...getObj.value, detailVo: { ...detailVo.value } }
-    );
+    const result = await API.post("http://192.168.8.93:10050/consume/select", {
+      ...getObj.value,
+      detailVo: { ...detailVo.value },
+    });
 
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    tableData.value = result.data.data.list;
+    tableData.value = result.data.list;
     console.log("tableData", tableData.value);
     // 存储分页总数
-    total.value = result.data.data.total;
+    total.value = result.data.total;
     console.log("total", total.value);
   } catch (error) {
     console.log("请求失败", error);
@@ -173,8 +174,8 @@ const handleClick = function (tab, event) {
 // 挂载
 onMounted(async function () {
   await get();
-  getActivity();
-  await getArea();
+  // getActivity();
+  // await getArea();
 });
 
 // 验证跳转输入框的数字是否合法
@@ -209,11 +210,11 @@ const goods = ref([]);
 const getGoods = async function () {
   try {
     // 发送POST请求
-    const result = await axios.post("http://192.168.8.93:10020/product", {});
+    const result = await API.post("http://192.168.8.93:10020/product", {});
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储全部数据
-    goods.value = result.data.data;
+    goods.value = result.data;
     console.log("allData", allData.value);
     console.log("地区", area.value);
   } catch (error) {
diff --git a/vue/gold-system/src/views/index.vue b/vue/gold-system/src/views/index.vue
index 181207d..e21308f 100644
--- a/vue/gold-system/src/views/index.vue
+++ b/vue/gold-system/src/views/index.vue
@@ -4,6 +4,28 @@ import { useRouter } from "vue-router";
 import ElementPlus from "element-plus";
 import { VscGlobe } from "vue-icons-plus/vsc";
 import { ElMessage } from "element-plus";
+import axios from "axios";
+import { ElMessageBox } from "element-plus";
+import API from "../api/index.js";
+
+//这是获取用户信息的接口
+const adminData = ref({
+  name: "",
+});
+const getAdminData = async function () {
+  try {
+    const result = await API.post(
+      "http://192.168.8.93:10070/admin/userinfo",
+      {}
+    );
+    adminData.value = result;
+    console.log("请求成功", result);
+    console.log("用户信息", adminData.value);
+  } catch (error) {
+    console.log("请求失败", error);
+  }
+};
+getAdminData();
 
 const router = useRouter();
 
@@ -19,6 +41,12 @@ function logout() {
   router.push("/login");
   ElMessage.success("退出成功");
 }
+
+// 挂载
+onMounted(async function () {
+  // 获取用户信息
+  getAdminData();
+});
 </script>
 
 <template>
@@ -130,7 +158,7 @@ function logout() {
                   src="../assets/金币管理系统logo.png"
                   alt="出错了"
                 />
-                <span style="margin-left: 10px">{{ admin.name }}</span>
+                <span style="margin-left: 10px">{{ adminData.name }}</span>
               </template>
               <el-menu-item index="1-1">查看个人信息</el-menu-item>
               <el-menu-item index="1-2" @click="logout">退出登录</el-menu-item>
diff --git a/vue/gold-system/src/views/login.vue b/vue/gold-system/src/views/login.vue
index c87cb0d..56c978d 100644
--- a/vue/gold-system/src/views/login.vue
+++ b/vue/gold-system/src/views/login.vue
@@ -64,11 +64,7 @@ const login = async function () {
             placeholder="请输入密码"
           />
         </el-form-item>
-        <el-form-item class="flex">
-          <div class="flex">
-            <el-checkbox>记住我</el-checkbox>
-          </div>
-        </el-form-item>
+        <el-form-item class="flex"> </el-form-item>
         <!-- 登录按钮 -->
         <el-form-item>
           <el-button
diff --git a/vue/gold-system/src/views/managerecharge/activity.vue b/vue/gold-system/src/views/managerecharge/activity.vue
index e09cdb1..2c93888 100644
--- a/vue/gold-system/src/views/managerecharge/activity.vue
+++ b/vue/gold-system/src/views/managerecharge/activity.vue
@@ -1,16 +1,36 @@
 <script setup>
 import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
-import { ElMessage, ElMessageBox } from 'element-plus'
-import axios from 'axios';
-import moment from 'moment';
+import { ElMessage, ElMessageBox } from "element-plus";
+import axios from "axios";
+import moment from "moment";
+import API from "../../api/index.js";
+
+//这是获取用户信息的接口
+const adminData = ref({});
+const getAdminData = async function () {
+  try {
+    const result = await API.post(
+      "http://192.168.8.93:10070/admin/userinfo",
+      {}
+    );
+    adminData.value = result;
+    addActicity.value.adminId = adminData.value.adminId;
+    console.log("请求成功", result);
+    console.log("用户信息", user.value);
+  } catch (error) {
+    console.log("请求失败", error);
+  }
+};
+getAdminData();
+
 //变量
 // 用户对象假的
 const admin = ref({
-    adminId: 1,
-    name: '赵刚',
-    area: '中国'
-})
+  adminId: 1,
+  name: "赵刚",
+  area: "中国",
+});
 //活动表格数据
 const tableData = ref([]);
 //分页总条目
@@ -21,19 +41,19 @@ const getTime = ref([]);
 const activity = ref({});
 //搜索对象
 const getObj = ref({
-    pageNum: 1,
-    pageSize: 5,
-})
+  pageNum: 1,
+  pageSize: 5,
+});
 // 添加对象
 const addObj = ref({
-    add:''
+  add: "",
 });
 // 删除
 // 删除对象
 const delObj = ref({});
 //表格高度
 const tableHeight = computed(function () {
-    return (getObj.value.pageSize + 1) * 50 + 'px';
+  return (getObj.value.pageSize + 1) * 50 + "px";
 });
 
 // 表单验证ref
@@ -42,383 +62,462 @@ 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 != '') {
-                activity.value.startDate = getTime.value[0];
-                activity.value.endDate = getTime.value[1];
-            }
-        } else {
-            activity.value.startDate = '';
-            activity.value.endDate = '';
-        }
-
-        console.log('搜索参数', getObj.value);
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/activity/select', { ...getObj.value, activity: { ...activity.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);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
+  try {
+    // 搜索参数页码赋值
+    if (typeof val === "number") {
+      getObj.value.pageNum = val;
+    }
+    // 搜索参数时间赋值
+    if (getTime.value != null) {
+      if (getTime.value.startDate != "" && getTime.value.endDate != "") {
+        activity.value.startDate = getTime.value[0];
+        activity.value.endDate = getTime.value[1];
+      }
+    } else {
+      activity.value.startDate = "";
+      activity.value.endDate = "";
     }
-}
+
+    console.log("搜索参数", getObj.value);
+    // 发送POST请求
+    const result = await API.post(
+      "http://192.168.8.93:10010/recharge/activity/select",
+      { ...getObj.value, activity: { ...activity.value } }
+    );
+
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储表格数据
+    tableData.value = result.data.list;
+    console.log("tableData", tableData.value);
+    // 存储分页总条目
+    total.value = result.data.total;
+    console.log("total", total.value);
+  } catch (error) {
+    console.log("请求失败", error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 
 // 重置
 const reset = function () {
-    getObj.value = {};
-    getObj.value.pageNum = 1;
-    getObj.value.pageSize = 5;
-    getTime.value = {};
-    activity.value = {};
-}
+  getObj.value = {};
+  getObj.value.pageNum = 1;
+  getObj.value.pageSize = 5;
+  getTime.value = {};
+  activity.value = {};
+};
 //新增活动弹出框
-const addActivityVisible = ref(false)
+const addActivityVisible = ref(false);
 //打开新增活动弹出框
 const openAddActivityVisible = function () {
-    addActivityVisible.value = true
-}
+  addActivityVisible.value = true;
+};
 //关闭新增窗口弹出框
 const closeAddActivityVisible = function () {
-    addActivityVisible.value = false
-}
+  addActivityVisible.value = false;
+};
 //添加活动按钮
 const addActicity = function () {
-    //添加对象初始化操作
-    addObj.value = {};
-    addObj.value.adminId = admin.value.adminId;
-    addObj.value.adminName = admin.value.name;
-    addObj.value.freeGold = '0';
-    addObj.value.rechargeRatio = 0;
-    addObj.value.startTime = null;
-    addObj.value.endTime = null;
-    openAddActivityVisible();
-}
+  //添加对象初始化操作
+  addObj.value = {};
+  addObj.value.adminId = admin.value.adminId;
+  addObj.value.adminName = admin.value.name;
+  addObj.value.freeGold = "0";
+  addObj.value.rechargeRatio = 0;
+  addObj.value.startTime = null;
+  addObj.value.endTime = null;
+  openAddActivityVisible();
+};
 
 // 添加确认
 const add = async function () {
-    Ref.value.validate(async (valid) => {
-        console.log('valid', valid);
-        if (valid) {
-            try {
-                console.log('添加对象', addObj.value);
-                // 发送POST请求
-                const result = await axios.post('http://192.168.8.93:10010/recharge/activity/add', addObj.value);
-
-                // 将响应结果存储到响应式数据中
-                console.log('请求成功', result);
-                // 刷新表格数据
-                get();
-                // 关闭弹出框
-                closeAddActivityVisible();
-                //提示
-                ElMessage({
-                    type: 'success',
-                    message: '活动添加成功！',
-                })
-            } catch (error) {
-                console.log('请求失败', error);
-                // 在这里可以处理错误逻辑，比如显示错误提示等
-            }
-        } else {
-            //提示
-            ElMessage({
-                type: 'error',
-                message: '请检查输入内容',
-            })
-        }
-
-    })
-}
-// 删除=========================================================
-// 删除按钮
-const del = function (row) {
-    delObj.value.activityId = row.activityId;
-    console.log('delObj', delObj.value);
-}
-// 删除按钮的气泡弹出框确认按钮
-const delConfirm = async function () {
-    try {
-        console.log('delObj', delObj.value);
+  Ref.value.validate(async (valid) => {
+    console.log("valid", valid);
+    if (valid) {
+      try {
+        console.log("添加对象", addObj.value);
         // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/activity/edit', delObj.value);
+        const result = await API.post(
+          "http://192.168.8.93:10010/recharge/activity/add",
+          addObj.value
+        );
+
         // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
+        console.log("请求成功", result);
         // 刷新表格数据
         get();
-    } catch (error) {
-        console.log('请求失败', error);
+        // 关闭弹出框
+        closeAddActivityVisible();
+        //提示
+        ElMessage({
+          type: "success",
+          message: "活动添加成功！",
+        });
+      } catch (error) {
+        console.log("请求失败", error);
         // 在这里可以处理错误逻辑，比如显示错误提示等
+      }
+    } else {
+      //提示
+      ElMessage({
+        type: "error",
+        message: "请检查输入内容",
+      });
     }
-}
+  });
+};
+// 删除=========================================================
+// 删除按钮
+const del = function (row) {
+  delObj.value.activityId = row.activityId;
+  console.log("delObj", delObj.value);
+};
+// 删除按钮的气泡弹出框确认按钮
+const delConfirm = async function () {
+  try {
+    console.log("delObj", delObj.value);
+    // 发送POST请求
+    const result = await API.post(
+      "http://192.168.8.93:10010/recharge/activity/edit",
+      delObj.value
+    );
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 刷新表格数据
+    get();
+  } catch (error) {
+    console.log("请求失败", error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 
 // 表单验证
 // 开始时间改变时，重新验证结束时间
 const handleStartTimeChange = () => {
-    Ref.value.validateField('endTime');
+  Ref.value.validateField("endTime");
 };
 const checkFreeGoldRadio = function (rule, value, callback) {
-    if (addObj.value.freeGold == 1) {
-        if (value == '0' || value == null || value == '') {
-            callback(new Error('请输入免费金币兑换比'))
-        }else if(value<0||isNaN(value)) {
-            callback(new Error('请输入正确的格式'));
-        }else{
-            callback();
-        }
+  if (addObj.value.freeGold == 1) {
+    if (value == "0" || value == null || value == "") {
+      callback(new Error("请输入免费金币兑换比"));
+    } else if (value < 0 || isNaN(value)) {
+      callback(new Error("请输入正确的格式"));
     } else {
-        callback()
+      callback();
     }
-}
+  } else {
+    callback();
+  }
+};
 
 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({
-    activityName: [{ required: true, message: '请输入活动名称', trigger: 'blur' },],
-    freeGold: [{ required: true, message: '请选择是否赠送免费金币', trigger: 'blur' },],
-    rechargeRatio: [{ validator: checkFreeGoldRadio, trigger: 'blur' },],
-    startTime: [
-        { required: true, message: '请选择开始时间', trigger: 'blur' },
-        { validator: checkStartTime, trigger: 'blur' },
-    ],
-    endTime: [
-        { required: true, message: '请选择结束时间', trigger: 'blur' },
-        { validator: checkEndTime, trigger: 'blur' },
-    ],
-})
+  activityName: [
+    { required: true, message: "请输入活动名称", trigger: "blur" },
+  ],
+  freeGold: [
+    { required: true, message: "请选择是否赠送免费金币", trigger: "blur" },
+  ],
+  rechargeRatio: [{ validator: checkFreeGoldRadio, trigger: "blur" }],
+  startTime: [
+    { required: true, message: "请选择开始时间", trigger: "blur" },
+    { validator: checkStartTime, trigger: "blur" },
+  ],
+  endTime: [
+    { required: true, message: "请选择结束时间", trigger: "blur" },
+    { validator: checkEndTime, trigger: "blur" },
+  ],
+});
 
 // 验证跳转输入框的数字是否合法
 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: '请检查输入内容',
-            })
-        }
+  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: '请检查输入内容',
-        })
+      //提示
+      ElMessage({
+        type: "error",
+        message: "请检查输入内容",
+      });
     }
-}
+  } else {
+    //提示
+    ElMessage({
+      type: "error",
+      message: "请检查输入内容",
+    });
+  }
+};
 
 // 挂载
 onMounted(async function () {
-    get();
-})
-
+  get();
+});
 </script>
 
 <template>
-    <el-row>
-        <el-col>
-            <el-card style="margin-bottom: 20px">
-                <div class="head-card">
-                    <div class="head-card-element">
-                        <el-text class="mx-1" size="large">活动名称：</el-text>
-                        <el-input v-model="activity.activityName" style="width: 240px" placeholder="请输入活动名称"
-                            clearable />
-                    </div>
-                    <div class="head-card-element">
-                        <el-text class="mx-1" size="large">添加时间：</el-text>
-                        <el-date-picker v-model="getTime" type="daterange" range-separator="至" start-placeholder="起始时间"
-                            end-placeholder="结束时间" />
-                    </div>
-                    <div class="head-card-btn">
-                        <el-button @click="reset()">重置</el-button>
-                        <el-button type="primary" @click="get()">查询</el-button>
-                    </div>
-                </div>
-            </el-card>
-        </el-col>
-    </el-row>
-    <el-row>
-        <el-col>
-            <el-card>
-                <div>
-                    <el-button plain @click="addActicity()"
-                        style="color: #048EFB; border:1px solid #048EFB">新增活动</el-button>
-                </div>
-                <div>
-                    <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-                        <el-table-column prop="activityName" label="活动名称" />
-                        <el-table-column prop="startTime" label="开始时间" />
-                        <el-table-column prop="endTime" label="结束时间" />
-                        <el-table-column prop="rechargeRatio" label="免费兑换比">
-                            <template #default="scope">
-                                <span>{{ scope.row.rechargeRatio }}:1</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="status" label="状态">
-                            <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="red-dot"></span>
-                                        <span>未开始</span>
-                                    </div>
-                                </span>
-                                <span v-if="scope.row.status === 2">
-                                    <div class="status">
-                                        <span class="grey-dot"></span>
-                                        <span>已结束</span>
-                                    </div>
-                                </span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="name" label="添加人" />
-                        <el-table-column prop="createTime" label="添加时间">
-                            <template #default="scope">
-                                {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="operation" label="操作">
-                            <template #default="scope">
-                                <el-popconfirm title="确定将此条活动删除吗？" @confirm="delConfirm">
-                                    <template #reference>
-                                        <el-button type="primary" text @click="del(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>
-                            </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="addActivityVisible" title="新增活动" width="500" :before-close="closeAddActivityVisible">
-        <template #footer>
-
-            <el-form  ref="Ref" :model="addObj" :rules="rules" label-width="auto" style="max-width: 600px">
-
-                <el-form-item prop="activityName" label="活动名称:">
-                    <el-input v-model="addObj.activityName" placeholder="请输入活动名称" style="width: 220px;" />
-                </el-form-item>
-
-                <el-form-item prop="freeGold" label="免费金币:">
-                    <el-radio-group v-model="addObj.freeGold">
-                        <el-radio value="0" @change="addObj.rechargeRatio = '0'">无赠送</el-radio>
-                        <el-radio value="1">有赠送</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-
-                <el-form-item prop="rechargeRatio" label="免费金币兑换比:">
-                    <el-input v-model="addObj.rechargeRatio" :disabled="addObj.freeGold === '0' ? true : false"
-                        placeholder="请输入" style="width: 80px;" />：1
-                    <div style="color: grey;">(提示：当前规则每10新币可兑换1免费金币)</div>
-                </el-form-item>
-
-                <el-form-item prop="startTime" label="开始时间:">
-                    <el-date-picker v-model="addObj.startTime" type="date" placeholder="请选择开始时间"
-                        @change="handleStartTimeChange" />
-                </el-form-item>
-
-                <el-form-item prop="endTime" label="结束时间:">
-                    <el-date-picker v-model="addObj.endTime" type="date" placeholder="请选择结束时间" />
-                </el-form-item>
-
-                <el-form-item label="添加人:">
-                    <el-input v-model="addObj.adminName" disabled style="width: 220px;" />
-                </el-form-item>
-
-            </el-form>
-
-            <div class="dialog-footer">
-                <el-button @click="closeAddActivityVisible">取消</el-button>
-                <el-button type="primary" @click="add()">
-                    提交
-                </el-button>
-            </div>
-        </template>
-    </el-dialog>
+  <el-row>
+    <el-col>
+      <el-card style="margin-bottom: 20px">
+        <div class="head-card">
+          <div class="head-card-element">
+            <el-text class="mx-1" size="large">活动名称：</el-text>
+            <el-input
+              v-model="activity.activityName"
+              style="width: 240px"
+              placeholder="请输入活动名称"
+              clearable
+            />
+          </div>
+          <div class="head-card-element">
+            <el-text class="mx-1" size="large">添加时间：</el-text>
+            <el-date-picker
+              v-model="getTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="起始时间"
+              end-placeholder="结束时间"
+            />
+          </div>
+          <div class="head-card-btn">
+            <el-button @click="reset()">重置</el-button>
+            <el-button type="primary" @click="get()">查询</el-button>
+          </div>
+        </div>
+      </el-card>
+    </el-col>
+  </el-row>
+  <el-row>
+    <el-col>
+      <el-card>
+        <div>
+          <el-button
+            plain
+            @click="addActicity()"
+            style="color: #048efb; border: 1px solid #048efb"
+            >新增活动</el-button
+          >
+        </div>
+        <div>
+          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+            <el-table-column prop="activityName" label="活动名称" />
+            <el-table-column prop="startTime" label="开始时间" />
+            <el-table-column prop="endTime" label="结束时间" />
+            <el-table-column prop="rechargeRatio" label="免费兑换比">
+              <template #default="scope">
+                <span>{{ scope.row.rechargeRatio }}:1</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="status" label="状态">
+              <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="red-dot"></span>
+                    <span>未开始</span>
+                  </div>
+                </span>
+                <span v-if="scope.row.status === 2">
+                  <div class="status">
+                    <span class="grey-dot"></span>
+                    <span>已结束</span>
+                  </div>
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="添加人" />
+            <el-table-column prop="createTime" label="添加时间">
+              <template #default="scope">
+                {{ moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="operation" label="操作">
+              <template #default="scope">
+                <el-popconfirm
+                  title="确定将此条活动删除吗？"
+                  @confirm="delConfirm"
+                >
+                  <template #reference>
+                    <el-button type="primary" text @click="del(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>
+              </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="addActivityVisible"
+    title="新增活动"
+    width="500"
+    :before-close="closeAddActivityVisible"
+  >
+    <template #footer>
+      <el-form
+        ref="Ref"
+        :model="addObj"
+        :rules="rules"
+        label-width="auto"
+        style="max-width: 600px"
+      >
+        <el-form-item prop="activityName" label="活动名称:">
+          <el-input
+            v-model="addObj.activityName"
+            placeholder="请输入活动名称"
+            style="width: 220px"
+          />
+        </el-form-item>
+
+        <el-form-item prop="freeGold" label="免费金币:">
+          <el-radio-group v-model="addObj.freeGold">
+            <el-radio value="0" @change="addObj.rechargeRatio = '0'"
+              >无赠送</el-radio
+            >
+            <el-radio value="1">有赠送</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item prop="rechargeRatio" label="免费金币兑换比:">
+          <el-input
+            v-model="addObj.rechargeRatio"
+            :disabled="addObj.freeGold === '0' ? true : false"
+            placeholder="请输入"
+            style="width: 80px"
+          />：1
+          <div style="color: grey">(提示：当前规则每10新币可兑换1免费金币)</div>
+        </el-form-item>
+
+        <el-form-item prop="startTime" label="开始时间:">
+          <el-date-picker
+            v-model="addObj.startTime"
+            type="date"
+            placeholder="请选择开始时间"
+            @change="handleStartTimeChange"
+          />
+        </el-form-item>
+
+        <el-form-item prop="endTime" label="结束时间:">
+          <el-date-picker
+            v-model="addObj.endTime"
+            type="date"
+            placeholder="请选择结束时间"
+          />
+        </el-form-item>
+
+        <el-form-item label="添加人:">
+          <el-input v-model="adminData.name" disabled style="width: 220px" />
+        </el-form-item>
+      </el-form>
+
+      <div class="dialog-footer">
+        <el-button @click="closeAddActivityVisible">取消</el-button>
+        <el-button type="primary" @click="add()"> 提交 </el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <style scoped>
 .pagination {
-    display: flex;
+  display: flex;
 }
 
 .status {
-    display: flex;
+  display: flex;
 }
 
 .head-card {
-    display: flex;
+  display: flex;
 }
 
 .head-card-element {
-    margin-right: 20px;
+  margin-right: 20px;
 }
 
 .head-card-btn {
-    margin-left: auto;
+  margin-left: auto;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index 5ed2446..573f2ab 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -4,6 +4,28 @@ import { ElMessageBox } from "element-plus";
 import axios from "axios";
 import { createApp } from "vue";
 import moment from "moment";
+import API from "../../api/index.js";
+
+// 查询用户接口
+const adminData = ref({
+  name: "",
+});
+const getAdminData = async function () {
+  try {
+    const result = await API.post(
+      "http://192.168.8.93:10070/admin/userinfo",
+      {}
+    );
+    adminData.value = result;
+    addRate.value.adminId = adminData.value.adminId;
+    editRate.value.adminId = adminData.value.adminId;
+    console.log("请求成功", result);
+    console.log("用户信息", user.value);
+  } catch (error) {
+    console.log("请求失败", error);
+  }
+};
+getAdminData();
 
 const regeAdd = ref(false);
 const regeEdit = ref(false);
@@ -26,7 +48,7 @@ const get = async function (val) {
 
     console.log("搜索参数", getObj.value);
     // 发送POST请求
-    const result = await axios.post("http://192.168.8.174:10010/rates/search", {
+    const result = await API.post("http://192.168.8.93:10010/rates/search", {
       ...getObj.value,
       rate: { ...value1.value },
     });
@@ -34,11 +56,11 @@ const get = async function (val) {
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    tableData.value = result.data.data.list;
+    tableData.value = result.data.list;
     console.log("tableData", tableData.value);
     // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
     // 存储分页总条目
-    total.value = result.data.data.total;
+    total.value = result.data.total;
     console.log("total", total.value);
   } catch (error) {
     console.log("请求失败", error);
@@ -54,8 +76,8 @@ const addRate = async function () {
   try {
     console.log("搜索参数", getObj.value);
     // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.174:10010/rates/add",
+    const result = await API.post(
+      "http://192.168.8.93:10010/rates/add",
       rateAdd.value
     );
 
@@ -101,14 +123,14 @@ const getEditData = async function (row) {
   try {
     console.log("搜索参数", getObj.value);
     // 发送POST请求
-    const result = await axios.post("http://192.168.8.174:10010/rates/search", {
+    const result = await API.post("http://192.168.8.93:10010/rates/search", {
       rate: { rateId: row.rateId },
     });
 
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    rateEdit.value = result.data.data[0];
+    rateEdit.value = result.data[0];
   } catch (error) {
     console.log("请求失败", error);
     // 在这里可以处理错误逻辑，比如显示错误提示等
@@ -118,8 +140,8 @@ const editRate = async function () {
   try {
     console.log("搜索参数", rateEdit.value);
     // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.174:10010/rates/update",
+    const result = await API.post(
+      "http://192.168.8.93:10010/rates/update",
       rateEdit.value
     );
     // 将响应结果存储到响应式数据中
@@ -145,8 +167,8 @@ const edit = () => {
 const deleteRate = async function (row) {
   try {
     // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.174:10010/rates/delete/ " + row.rateId
+    const result = await API.post(
+      "http://192.168.8.93:10010/rates/delete/ " + row.rateId
     );
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
@@ -453,7 +475,7 @@ const checkNumber = function () {
           <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
         </el-form-item>
         <el-form-item prop="updateName" label="提交人:">
-          <el-input v-model="rateAdd.updateName" style="width: 240px" />
+          <el-input :value="adminData.name" disabled style="width: 240px" />
         </el-form-item>
         <el-form-item prop="startTime" label="开始时间:">
           <el-date-picker
@@ -517,11 +539,7 @@ const checkNumber = function () {
           <p>(提示：当前规则每 5 元人民币可兑换 1 新币)</p>
         </el-form-item>
         <el-form-item label="提交人:">
-          <el-input
-            disabled
-            v-model="rateEdit.updateName"
-            style="width: 240px"
-          />
+          <el-input disabled :value="adminData.name" style="width: 240px" />
         </el-form-item>
         <el-form-item>
           <div class="dialog-footer">
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 5a4a127..e5f935c 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -7,6 +7,23 @@ import axios from "axios";
 import { ElMessageBox } from "element-plus";
 import API from "../../api/index.js";
 
+const adminData = ref({});
+const getAdminData = async function () {
+  try {
+    const result = await API.post(
+      "http://192.168.8.93:10070/admin/userinfo",
+      {}
+    );
+    adminData.value = result;
+    addRecharge.value.adminId = adminData.value.adminId;
+    console.log("请求成功", result);
+    console.log("用户信息", user.value);
+  } catch (error) {
+    console.log("请求失败", error);
+  }
+};
+getAdminData();
+
 // 这是添加充值信息的表单
 const addRecharge = ref({
   rechargeVoucher: "",
@@ -93,7 +110,7 @@ const getUser = async function (jwcode) {
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    user.value = result.data.data[0];
+    user.value = result.data[0];
     console.log("用户信息", user.value);
     if (result.data.code === 0) {
       ElMessage.error(result.data.msg);
@@ -120,7 +137,7 @@ const getActivity = async function () {
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    activity.value = result.data.data;
+    activity.value = result.data;
     console.log("活动信息", activity.value);
   } catch (error) {
     console.log("请求失败", error);
@@ -134,15 +151,12 @@ const currency = ref([]);
 const getCurrency = async function () {
   try {
     // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.174:10010/rates/search",
-      {}
-    );
+    const result = await API.post("http://192.168.8.93:10010/rates/search", {});
 
     // 将响应结果存储到响应式数据中
     console.log("货币请求成功", result);
     // 存储表格数据
-    currency.value = result.data.data;
+    currency.value = result.data;
     console.log("tableData", currency.value);
     // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
   } catch (error) {
@@ -159,8 +173,7 @@ const imageUrl = ref("");
 const handleAvatarSuccess = (response, uploadFile) => {
   imageUrl.value = URL.createObjectURL(uploadFile.raw);
   console.log("图片上传成功", response, uploadFile);
-  addRecharge.value.rechargeVoucher =
-    "http://192.168.8.93:10010/upload/" + response.data;
+  addRecharge.value.rechargeVoucher = `http://192.168.8.93:10010/upload/${response.data}`;
   console.log("图片名称", addRecharge.value.rechargeVoucher);
 };
 // 上传图片之前的校验函数
@@ -319,7 +332,7 @@ watch(calculatedRechargeGold, (newVal) => {
     <el-form-item prop="submitter" label="提交人">
       <el-input
         style="width: 300px"
-        value="张三"
+        :value="adminData.name"
         disabled
         placeholder="提交人姓名"
       />
diff --git a/vue/gold-system/src/views/recharge/adminRecharge.vue b/vue/gold-system/src/views/recharge/adminRecharge.vue
index 4e3bd32..36411aa 100644
--- a/vue/gold-system/src/views/recharge/adminRecharge.vue
+++ b/vue/gold-system/src/views/recharge/adminRecharge.vue
@@ -5,6 +5,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { AiFillRead } from "vue-icons-plus/ai";
 import axios from 'axios';
 import moment from 'moment';
+import API from "../../api/index.js";
 // 变量
 // 用户对象假的
 const admin = ref({
@@ -94,15 +95,15 @@ const get = async function (val) {
         }
         console.log('搜索参数', getObj.value);
         // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', { ...getObj.value, rechargeVo: { ...rechargeVo.value } });
+        const result = await API.post('http://192.168.8.93:10010/recharge/recharge', { ...getObj.value, rechargeVo: { ...rechargeVo.value } });
 
         // 将响应结果存储到响应式数据中
         console.log('请求成功', result);
         // 存储表格数据
-        tableData.value = result.data.data.list;
+        tableData.value = result.data.list;
         console.log('tableData', tableData.value);
         // 存储分页总数
-        total.value = result.data.data.total;
+        total.value = result.data.total;
         console.log('total', total.value);
     } catch (error) {
         console.log('请求失败', error);
@@ -187,12 +188,12 @@ const handleClick = function (tab, event) {
 const getActivity = async function () {
     try {
         // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/activity/select', {});
+        const result = await API.post('http://192.168.8.93:10010/recharge/activity/select', {});
 
         // 将响应结果存储到响应式数据中
         console.log('请求成功', result);
         // 存储表格数据
-        activity.value = result.data.data;
+        activity.value = result.data;
         console.log('activity', activity.value);
     } catch (error) {
         console.log('请求失败', error);
@@ -203,11 +204,11 @@ const getActivity = async function () {
 const getArea = async function () {
     try {
         // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', {});
+        const result = await API.post('http://192.168.8.93:10010/recharge/recharge', {});
         // 将响应结果存储到响应式数据中
         console.log('请求成功', result);
         // 存储全部数据
-        allData.value = result.data.data;
+        allData.value = result.data;
         console.log('allData', allData.value);
         // 分离并去重地区列表
         area.value = [...new Set(allData.value.map(item => item.area))]
@@ -228,7 +229,7 @@ const del = function (row) {
 const delConfirm = async function () {
     try {
         console.log('delObj2', delObj.value);
-        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge/edit', delObj.value);
+        const result = await API.post('http://192.168.8.93:10010/recharge/recharge/edit', delObj.value);
         console.log('删除成功', result);
         // 刷新表格数据
         get();
diff --git a/vue/gold-system/src/views/recharge/allRecharge.vue b/vue/gold-system/src/views/recharge/allRecharge.vue
index ee3e3f1..a7a971b 100644
--- a/vue/gold-system/src/views/recharge/allRecharge.vue
+++ b/vue/gold-system/src/views/recharge/allRecharge.vue
@@ -5,6 +5,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { AiFillRead } from "vue-icons-plus/ai";
 import axios from 'axios';
 import moment from 'moment';
+import API from "../../api/index.js";
 // 变量
 // 充值明细表格
 const tableData = ref([]);
@@ -85,15 +86,15 @@ const get = async function (val) {
         }
         console.log('搜索参数', getObj.value);
         // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', { ...getObj.value, rechargeVo: { ...rechargeVo.value } });
+        const result = await API.post('http://192.168.8.93:10010/recharge/recharge', { ...getObj.value, rechargeVo: { ...rechargeVo.value } });
 
         // 将响应结果存储到响应式数据中
         console.log('请求成功', result);
         // 存储表格数据
-        tableData.value = result.data.data.list;
+        tableData.value = result.data.list;
         console.log('tableData', tableData.value);
         // 存储分页总数
-        total.value = result.data.data.total;
+        total.value = result.data.total;
         console.log('total', total.value);
     } catch (error) {
         console.log('请求失败', error);
@@ -177,12 +178,12 @@ const handleClick = function (tab, event) {
 const getActivity = async function () {
     try {
         // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/activity/select', {});
+        const result = await API.post('http://192.168.8.93:10010/recharge/activity/select', {});
 
         // 将响应结果存储到响应式数据中
         console.log('请求成功', result);
         // 存储表格数据
-        activity.value = result.data.data;
+        activity.value = result.data;
         console.log('activity', activity.value);
     } catch (error) {
         console.log('请求失败', error);
@@ -193,11 +194,11 @@ const getActivity = async function () {
 const getArea = async function () {
     try {
         // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', {});
+        const result = await API.post('http://192.168.8.93:10010/recharge/recharge', {});
         // 将响应结果存储到响应式数据中
         console.log('请求成功', result);
         // 存储全部数据
-        allData.value = result.data.data;
+        allData.value = result.data;
         console.log('allData', allData.value);
         // 分离并去重地区列表
         area.value = [...new Set(allData.value.map(item => item.area))]
diff --git a/vue/gold-system/src/views/refund/addRefund.vue b/vue/gold-system/src/views/refund/addRefund.vue
index 2333413..1e6ed53 100644
--- a/vue/gold-system/src/views/refund/addRefund.vue
+++ b/vue/gold-system/src/views/refund/addRefund.vue
@@ -5,6 +5,25 @@ import { ElMessage } from "element-plus";
 import { Plus } from "@element-plus/icons-vue";
 import axios from "axios";
 import { ElMessageBox } from "element-plus";
+import API from "../../api/index.js";
+
+//这是获取用户信息的接口
+const adminData = ref({});
+const getAdminData = async function () {
+  try {
+    const result = await API.post(
+      "http://192.168.8.93:10070/admin/userinfo",
+      {}
+    );
+    adminData.value = result;
+    addRefund.value.adminId = adminData.value.adminId;
+    console.log("请求成功", result);
+    console.log("用户信息", user.value);
+  } catch (error) {
+    console.log("请求失败", error);
+  }
+};
+getAdminData();
 
 // 这是添加充值信息的表单
 const addRefund = ref({
@@ -21,7 +40,7 @@ const addRefund = ref({
 const add = async function () {
   try {
     // 发送POST请求
-    const result = await axios.post(
+    const result = await API.post(
       "http://192.168.8.174:10040/refund/add",
       addRefund.value
     );
@@ -89,14 +108,14 @@ const user = ref({});
 const getUser = async function (jwcode) {
   try {
     // 发送POST请求
-    const result = await axios.post("http://192.168.8.93:10020/recharge/user", {
+    const result = await API.post("http://192.168.8.93:10020/recharge/user", {
       jwcode: jwcode,
     });
 
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    user.value = result.data.data[0];
+    user.value = result.data[0];
     console.log("用户信息", user.value);
     if (result.data.code === 0) {
       ElMessage.error(result.data.msg);
@@ -144,14 +163,14 @@ const goods = ref([]);
 const getGoods = async function (jwcode) {
   try {
     // 发送POST请求
-    const result = await axios.post(
+    const result = await API.post(
       "http://192.168.8.147:10030/consume/getDeatil/" + addRefund.value.jwcode
     );
 
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    goods.value = result.data.data;
+    goods.value = result.data;
     console.log("用户信息", goods.value);
   } catch (error) {
     console.log("请求失败", error);
@@ -285,7 +304,7 @@ const handleSelectionChange = (value) => {
     <el-form-item prop="commitName" label="提交人">
       <el-input
         style="width: 300px"
-        value="张三"
+        :value="adminData.name"
         disabled
         placeholder="提交人姓名"
       />
diff --git a/vue/gold-system/src/views/refund/allRefund.vue b/vue/gold-system/src/views/refund/allRefund.vue
index c787d18..650b378 100644
--- a/vue/gold-system/src/views/refund/allRefund.vue
+++ b/vue/gold-system/src/views/refund/allRefund.vue
@@ -4,6 +4,7 @@ import ElementPlus from "element-plus";
 import { AiFillRead } from "vue-icons-plus/ai";
 import axios from "axios";
 import moment from "moment";
+import API from "../../api/index.js";
 // 变量
 // 充值明细表格
 const tableData = ref([]);
@@ -67,18 +68,18 @@ const get = async function (val) {
     }
     console.log("搜索参数", getObj.value);
     // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.174:10040/refund/search",
-      { ...getObj.value, detail: { ...detail.value } }
-    );
+    const result = await API.post("http://192.168.8.174:10040/refund/search", {
+      ...getObj.value,
+      detail: { ...detail.value },
+    });
 
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    tableData.value = result.data.data.list;
+    tableData.value = result.data.list;
     console.log("tableData", tableData.value);
     // 存储分页总数
-    total.value = result.data.data.total;
+    total.value = result.data.total;
     console.log("total", total.value);
   } catch (error) {
     console.log("请求失败", error);
@@ -186,7 +187,7 @@ const handleClick = function (tab, event) {
 const getActivity = async function () {
   try {
     // 发送POST请求
-    const result = await axios.post(
+    const result = await API.post(
       "http://192.168.8.93:10010/recharge/activity/select",
       {}
     );
@@ -194,7 +195,7 @@ const getActivity = async function () {
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储表格数据
-    activity.value = result.data.data;
+    activity.value = result.data;
     console.log("activity", activity.value);
   } catch (error) {
     console.log("请求失败", error);
@@ -205,14 +206,14 @@ const getActivity = async function () {
 const getArea = async function () {
   try {
     // 发送POST请求
-    const result = await axios.post(
+    const result = await API.post(
       "http://192.168.8.93:10010/recharge/recharge",
       {}
     );
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储全部数据
-    allData.value = result.data.data;
+    allData.value = result.data;
     console.log("allData", allData.value);
     // 分离并去重地区列表
     area.value = [...new Set(allData.value.map((item) => item.area))];
@@ -239,7 +240,7 @@ const delConfirm = async function () {
   try {
     console.log("delObj", delObj.value);
     // 发送POST请求
-    const result = await axios.post(
+    const result = await API.post(
       "http://192.168.8.174:10040/refund/softDelete?detailId=" +
         delObj.value.detailId
     );
@@ -258,11 +259,11 @@ const goods = ref([]);
 const getGoods = async function () {
   try {
     // 发送POST请求
-    const result = await axios.post("http://192.168.8.93:10020/product", {});
+    const result = await API.post("http://192.168.8.93:10020/product", {});
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
     // 存储全部数据
-    goods.value = result.data.data;
+    goods.value = result.data;
     console.log("allData", allData.value);
     console.log("地区", area.value);
   } catch (error) {
diff --git a/vue/gold-system/src/views/usergold/index.vue b/vue/gold-system/src/views/usergold/index.vue
index 5d00d38..33e7b16 100644
--- a/vue/gold-system/src/views/usergold/index.vue
+++ b/vue/gold-system/src/views/usergold/index.vue
@@ -1,13 +1,14 @@
 <script setup>
 import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
-import axios from 'axios';
+import axios from "axios";
 import { ta } from "element-plus/es/locales.mjs";
+import API from "../../api/index.js";
 
 // 充值明细表格
 const tableData = ref([]);
 // 计算用户各金币总数的不分页对象
-const tableAllData=ref([]);
+const tableAllData = ref([]);
 // 各金币总数
 const rechargeCoin = ref(0);
 const freeCoin = ref(0);
@@ -20,219 +21,309 @@ const getTime = ref([]);
 // 搜索detail
 const detail = ref({});
 // 不分页的搜索对象
-const getAllObj =ref({});
+const getAllObj = ref({});
 // 搜索对象
 const getObj = ref({
-    pageNum: 1,
-    pageSize: 5,
+  pageNum: 1,
+  pageSize: 5,
 });
 
 // 支付方式选项
 const updateType = [
-    {
-        value: '充值',
-        label: '充值',
-    },
-    {
-        value: '消费',
-        label: '消费',
-    },
-    {
-        value: '退款',
-        label: '退款',
-    },
-]
+  {
+    value: "充值",
+    label: "充值",
+  },
+  {
+    value: "消费",
+    label: "消费",
+  },
+  {
+    value: "退款",
+    label: "退款",
+  },
+];
 
 //表格高度
 const tableHeight = computed(function () {
-    return (getObj.value.pageSize ) * 50 + 'px';
+  return getObj.value.pageSize * 50 + "px";
 });
 
 // 方法
 // 搜索===========================================================================
 // 搜索方法
 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 != '') {
-                detail.value.startDate = getTime.value[0];
-                detail.value.endDate = getTime.value[1];
-            }
-        } else {
-            detail.value.startDate = '';
-            detail.value.endDate = '';
-        }
-        console.log('搜索参数', getObj.value);
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10040/detail', { ...getObj.value, detail: { ...detail.value } });
-        const result2 = await axios.post('http://192.168.8.93:10040/detail', { ...getAllObj.value, detail: { ...detail.value } });
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        console.log('请求成功2', result2);
-        // 存储表格数据
-        tableData.value = result.data.data.list;
-        console.log('tableData', tableData.value);
-        tableAllData.value = result2.data.data;
-        console.log('tableAllData', tableAllData.value);
-        // 存储分页总数
-        total.value = result.data.data.total;
-        console.log('total', total.value);
-        // 计算各金币总数
-        rechargeCoin.value=tableAllData.value.reduce((pre, cur) => pre + cur.rechargeCoin, 0);
-        freeCoin.value=tableAllData.value.reduce((pre, cur) => pre + cur.freeCoin, 0);
-        taskCoin.value=tableAllData.value.reduce((pre, cur) => pre + cur.taskCoin, 0);
-        console.log('各金币总数', rechargeCoin.value, freeCoin.value, taskCoin.value);
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
+  try {
+    // 搜索参数页码赋值
+    if (typeof val === "number") {
+      getObj.value.pageNum = val;
     }
-}
+    // 搜索参数时间赋值
+    if (getTime.value != null) {
+      if (getTime.value.startDate != "" && getTime.value.endDate != "") {
+        detail.value.startDate = getTime.value[0];
+        detail.value.endDate = getTime.value[1];
+      }
+    } else {
+      detail.value.startDate = "";
+      detail.value.endDate = "";
+    }
+    console.log("搜索参数", getObj.value);
+    // 发送POST请求
+    const result = await API.post("http://192.168.8.93:10040/detail", {
+      ...getObj.value,
+      detail: { ...detail.value },
+    });
+    const result2 = await API.post("http://192.168.8.93:10040/detail", {
+      ...getAllObj.value,
+      detail: { ...detail.value },
+    });
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    console.log("请求成功2", result2);
+    // 存储表格数据
+    tableData.value = result.data.list;
+    console.log("tableData", tableData.value);
+    tableAllData.value = result2.data;
+    console.log("tableAllData", tableAllData.value);
+    // 存储分页总数
+    total.value = result.data.total;
+    console.log("total", total.value);
+    // 计算各金币总数
+    rechargeCoin.value = tableAllData.value.reduce(
+      (pre, cur) => pre + cur.rechargeCoin,
+      0
+    );
+    freeCoin.value = tableAllData.value.reduce(
+      (pre, cur) => pre + cur.freeCoin,
+      0
+    );
+    taskCoin.value = tableAllData.value.reduce(
+      (pre, cur) => pre + cur.taskCoin,
+      0
+    );
+    console.log(
+      "各金币总数",
+      rechargeCoin.value,
+      freeCoin.value,
+      taskCoin.value
+    );
+  } catch (error) {
+    console.log("请求失败", error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 
 // 重置
 const reset = function () {
-    detail.value.jwcode = '';
-    detail.value.updateType = '';
-    detail.value.startDate = '';
-    detail.value.endDate = '';
-    getTime.value = {};
-}
+  detail.value.jwcode = "";
+  detail.value.updateType = "";
+  detail.value.startDate = "";
+  detail.value.endDate = "";
+  getTime.value = {};
+};
 // 今天
 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 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();
-}
+  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 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();
+};
 
 // 挂载
 onMounted(async function () {
-    await get();
-})
-
+  await get();
+});
 </script>
 
 <template>
-    <el-row>
-        <el-col>
-            <el-card style="margin-bottom: 20px">
-                <div class="head-card">
-                    <div class="head-card-element">
-                        <el-text class="mx-1" size="large">精网号：</el-text>
-                        <el-input v-model="detail.jwcode" style="width: 240px" placeholder="请输入精网号" clearable />
-                    </div>
-                    <div class="head-card-element">
-                        <el-text class="mx-1" size="large">更新类型：</el-text>
-                        <el-select v-model="detail.updateType" placeholder="请选择更新类型" size="large" style="width: 240px">
-                            <el-option v-for="item in updateType" :key="item.value" :label="item.label"
-                                :value="item.value" />
-                        </el-select>
-                    </div>
-                    <div class="head-card-element">
-                        <el-text class="mx-1" size="large">更新时间：</el-text>
-                        <el-date-picker v-model="getTime" type="daterange" range-separator="至" start-placeholder="起始时间"
-                            end-placeholder="结束时间" />
-                    </div>
-                    <div class="head-card-btn">
-                        <el-button @click="reset()">重置</el-button>
-                        <el-button type="primary" @click="get()">查询</el-button>
-                    </div>
-                </div>
-            </el-card>
-        </el-col>
-    </el-row>
-    <el-row>
-        <el-col>
-            <el-card>
-                <div>
-                    现有金币：免费金币：{{freeCoin}}，充值金币：{{rechargeCoin}}，任务金币：{{taskCoin}}
-                </div>
-                <div>
-                    <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-                        <el-table-column prop="uname" label="姓名" />
-                        <el-table-column prop="jwcode" label="精网号" />
-                        <el-table-column prop="area" label="所属地区" />
-                        <el-table-column prop="gold" label="更新数量">
-                            <template #default="scope">
-                                <span>{{ scope.row.rechargeCoin + scope.row.freeCoin + scope.row.taskCoin }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="updateType" label="更新类型" />
-                        <el-table-column prop="freeCoin" label="免费金币" />
-                        <el-table-column prop="rechargeCoin" label="充值金币" />
-                        <el-table-column prop="taskCoin" label="任务金币" />
-                        <el-table-column prop="name" label="提交人" />
-                        <el-table-column prop="createTime" label="更新时间" />
-                    </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-row>
+    <el-col>
+      <el-card style="margin-bottom: 20px">
+        <div class="head-card">
+          <div class="head-card-element">
+            <el-text class="mx-1" size="large">精网号：</el-text>
+            <el-input
+              v-model="detail.jwcode"
+              style="width: 240px"
+              placeholder="请输入精网号"
+              clearable
+            />
+          </div>
+          <div class="head-card-element">
+            <el-text class="mx-1" size="large">更新类型：</el-text>
+            <el-select
+              v-model="detail.updateType"
+              placeholder="请选择更新类型"
+              size="large"
+              style="width: 240px"
+            >
+              <el-option
+                v-for="item in updateType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </div>
+          <div class="head-card-element">
+            <el-text class="mx-1" size="large">更新时间：</el-text>
+            <el-date-picker
+              v-model="getTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="起始时间"
+              end-placeholder="结束时间"
+            />
+          </div>
+          <div class="head-card-btn">
+            <el-button @click="reset()">重置</el-button>
+            <el-button type="primary" @click="get()">查询</el-button>
+          </div>
+        </div>
+      </el-card>
+    </el-col>
+  </el-row>
+  <el-row>
+    <el-col>
+      <el-card>
+        <div>
+          现有金币：免费金币：{{ freeCoin }}，充值金币：{{
+            rechargeCoin
+          }}，任务金币：{{ taskCoin }}
+        </div>
+        <div>
+          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+            <el-table-column prop="uname" label="姓名" />
+            <el-table-column prop="jwcode" label="精网号" />
+            <el-table-column prop="area" label="所属地区" />
+            <el-table-column prop="gold" label="更新数量">
+              <template #default="scope">
+                <span>{{
+                  scope.row.rechargeCoin +
+                  scope.row.freeCoin +
+                  scope.row.taskCoin
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="updateType" label="更新类型" />
+            <el-table-column prop="freeCoin" label="免费金币" />
+            <el-table-column prop="rechargeCoin" label="充值金币" />
+            <el-table-column prop="taskCoin" label="任务金币" />
+            <el-table-column prop="name" label="提交人" />
+            <el-table-column prop="createTime" label="更新时间" />
+          </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>
 </template>
 
 <style scoped>
 .pagination {
-    display: flex;
+  display: flex;
 }
 .status {
-    display: flex;
+  display: flex;
 }
 
 .head-card {
-    display: flex;
+  display: flex;
 }
 
 .head-card-element {
-    margin-right: 20px;
+  margin-right: 20px;
 }
 
 .head-card-btn {
-    margin-left: auto;
+  margin-left: auto;
 }
-</style>
\ No newline at end of file
+</style>