From cae92a342935df65fe728aa9a66911044062e43c Mon Sep 17 00:00:00 2001
From: hongxilin <17663930442@163.com>
Date: Fri, 29 Nov 2024 17:15:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=88=E6=9F=A5=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=EF=BC=8C=E5=A2=9E=E6=8E=A5=E5=8F=A3=EF=BC=89=EF=BC=8C?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E6=98=8E=E7=BB=86=E6=9F=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/gold-system/src/views/index.vue                |   9 +-
 .../src/views/managerecharge/activity.vue          | 259 +++++++++++++++++----
 .../src/views/recharge/adminRecharge.vue           | 196 +++++++---------
 vue/gold-system/src/views/recharge/allRecharge.vue | 218 +++++++----------
 4 files changed, 393 insertions(+), 289 deletions(-)

diff --git a/vue/gold-system/src/views/index.vue b/vue/gold-system/src/views/index.vue
index 15dd10d..937ac4e 100644
--- a/vue/gold-system/src/views/index.vue
+++ b/vue/gold-system/src/views/index.vue
@@ -6,7 +6,12 @@ import { VscGlobe } from 'vue-icons-plus/vsc'
 
 const router = useRouter();
 
-
+// 用户对象假的
+const admin = ref({
+    adminId: 1,
+    name:'客服A',
+    area:'新加坡'
+})
 
 </script>
 
@@ -99,7 +104,7 @@ const router = useRouter();
             <el-sub-menu index="1" class="admin">
               <template #title>
                 <img style="width: 30px;height: 30px; border-radius: 50%;" src="../assets/金币管理系统logo.png" alt="出错了" />
-                <span style="margin-left: 10px;">用户名</span>
+                <span style="margin-left: 10px;">{{ admin.name }}</span>
               </template>
               <el-menu-item index="1-1">查看个人信息</el-menu-item>
               <el-menu-item index="1-2">退出登录</el-menu-item>
diff --git a/vue/gold-system/src/views/managerecharge/activity.vue b/vue/gold-system/src/views/managerecharge/activity.vue
index e89fb31..616625b 100644
--- a/vue/gold-system/src/views/managerecharge/activity.vue
+++ b/vue/gold-system/src/views/managerecharge/activity.vue
@@ -1,39 +1,90 @@
 <script setup>
 import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
+import { ElMessage, ElMessageBox } from 'element-plus'
 import axios from 'axios';
 //变量
+// 用户对象假的
+const admin = ref({
+    adminId: 1,
+    name: '客服A',
+    area: '新加坡'
+})
 //活动表格数据
 const tableData = ref([]);
-
+//分页总条目
+const total = ref(100);
+// 搜索对象时间
+const getTime = ref([]);
+// 搜索对象活动
+const activity = ref({});
 //搜索对象
 const getObj = ref({
     pageNum: 1,
     pageSize: 5,
 })
-//分页总条目
-const total = ref(100)
+// 添加对象
+const addObj = ref({
+    add: '',
+})
+// 删除对象
+const delObj = ref({
+    del: '',
+});
+//表格高度
+const tableHeight = computed(function () {
+    return (getObj.value.pageSize + 1) * 50 + 'px';
+});
 
+// 表单验证ref
+const Ref = ref(null);
 
 //方法
 //搜索方法
-const get = async function () {
+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);
+        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);
-        // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
+        // 存储分页总条目
+        total.value = result.data.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 = {};
+    get();
+}
 //新增活动弹出框
 const addActivityVisible = ref(false)
 //打开新增活动弹出框
@@ -46,27 +97,124 @@ const closeAddActivityVisible = function () {
 }
 //添加活动按钮
 const addActicity = function () {
+    //添加对象初始化操作
+    addObj.value = {};
+    addObj.value.adminId = admin.value.adminId;
+    addObj.value.adminName = admin.value.name;
+    addObj.value.dept = admin.value.area;
+    addObj.value.freeGold = '0';
+    addObj.value.rechargeRatio = 0;
+    addObj.value.startTime = null;
+    addObj.value.endTime = null;
     openAddActivityVisible();
 }
 
-// 添加对象
-const addObj = reactive({
-    activityName: '',
-    freeGold: '',
-    rechargeRatio: '',
-    startTime: '',
-    endTime: '',
-    adminName: '',
-})
+// 添加确认
+const add = async function () {
+    Ref.value.validate(async (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 Delete = function (index, row) {
-    console.log(index, row)
 }
 
+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 axios.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');
+};
+const checkFreeGoldRadio = function (rule, value, callback) {
+    if (addObj.value.freeGold == 1) {
+        if (value == '0' || value == null || value == '') {
+            callback(new Error('请输入免费金币兑换比'))
+        } else {
+            callback();
+        }
+    } else {
+        callback()
+    }
+}
+
+const checkStartTime = function (rule, value, 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()
+    }
+}
+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' },
+    ],
+})
 
 // 挂载
-onMounted(async function(){
+onMounted(async function () {
     get();
 })
 
@@ -79,16 +227,17 @@ onMounted(async function(){
                 <div class="head-card">
                     <div class="head-card-element">
                         <el-text class="mx-1" size="large">活动名称：</el-text>
-                        <el-input v-model="input" style="width: 240px" placeholder="请输入活动名称" clearable />
+                        <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-time-picker v-model="value1" is-range range-separator="至" start-placeholder="起始时间"
+                        <el-date-picker v-model="getTime" type="daterange" range-separator="至" start-placeholder="起始时间"
                             end-placeholder="结束时间" />
                     </div>
                     <div class="head-card-btn">
-                        <el-button>重置</el-button>
-                        <el-button type="primary">查询</el-button>
+                        <el-button @click="reset()">重置</el-button>
+                        <el-button type="primary" @click="get()">查询</el-button>
                     </div>
                 </div>
             </el-card>
@@ -102,34 +251,44 @@ onMounted(async function(){
                         style="color: #048EFB; border:1px solid #048EFB">新增活动</el-button>
                 </div>
                 <div>
-                    <el-table :data="tableData" style="width: 100%">
+                    <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="免费兑换比" />
+                        <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">
-                                <div class="status">
-                                    <span v-if="scope.row.status === '进行中'">
+                                <span v-if="scope.row.status === 1">
+                                    <div class="status">
                                         <span class="green-dot"></span>
-                                    </span>
-                                    <span v-if="scope.row.status === '未开始'">
+                                        <span>进行中</span>
+                                    </div>
+                                </span>
+                                <span v-if="scope.row.status === 0">
+                                    <div class="status">
                                         <span class="red-dot"></span>
-                                    </span>
-                                    <span v-if="scope.row.status === '已结束'">
+                                        <span>未开始</span>
+                                    </div>
+                                </span>
+                                <span v-if="scope.row.status === 2">
+                                    <div class="status">
                                         <span class="grey-dot"></span>
-                                    </span>
-                                    <span>{{ scope.row.status }}</span>
-                                </div>
+                                        <span>已结束</span>
+                                    </div>
+                                </span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="adminName" label="添加人" />
+                        <el-table-column prop="name" label="添加人" />
                         <el-table-column prop="createTime" label="添加时间" />
                         <el-table-column prop="operation" label="操作">
                             <template #default="scope">
-                                <el-popconfirm title="确定将此条活动删除吗？">
+                                <el-popconfirm title="确定将此条活动删除吗？" @confirm="delConfirm">
                                     <template #reference>
-                                        <el-button type="primary" text @click="Delete(scope.$index, scope.row)">
+                                        <el-button type="primary" text @click="del(scope.row)">
                                             删除
                                         </el-button>
                                     </template>
@@ -148,7 +307,7 @@ onMounted(async function(){
 
                 <!-- 分页 -->
                 <el-pagination background layout="prev, pager, next" :total="total" :page-size="getObj.pageSize"
-                    :current-page="getObj.pageNum" />
+                    :current-page="getObj.pageNum" @current-change="get" />
 
             </el-card>
         </el-col>
@@ -157,33 +316,35 @@ onMounted(async function(){
     <el-dialog v-model="addActivityVisible" title="新增活动" width="500" :before-close="closeAddActivityVisible">
         <template #footer>
 
-            <el-form :model="addObj" label-width="auto" style="max-width: 600px">
+            <el-form :model="addObj" ref="Ref" :rules="rules" label-width="auto" style="max-width: 600px">
 
-                <el-form-item label="活动名称:">
+                <el-form-item prop="activityName" label="活动名称:">
                     <el-input v-model="addObj.activityName" placeholder="请输入活动名称" style="width: 220px;" />
                 </el-form-item>
 
-                <el-form-item label="免费金币:">
+                <el-form-item prop="freeGold" label="免费金币:">
                     <el-radio-group v-model="addObj.freeGold">
-                        <el-radio value="0">无赠送</el-radio>
+                        <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 label="免费金币兑换比:">
-                    <el-input v-model="addObj.rechargeRatio" placeholder="请输入" style="width: 80px;" />：1
+                <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 label="开始时间:">
-                    <el-time-picker v-model="addObj.startTime" />
+                <el-form-item prop="startTime" label="开始时间:">
+                    <el-date-picker v-model="addObj.startTime" type="date" placeholder="请选择开始时间"
+                        @change="handleStartTimeChange" />
                 </el-form-item>
 
-                <el-form-item label="结束时间:">
-                    <el-time-picker v-model="addObj.endTime" />
+                <el-form-item prop="endTime" label="结束时间:">
+                    <el-date-picker v-model="addObj.endTime" type="date" placeholder="请选择结束时间" />
                 </el-form-item>
 
-                <el-form-item label="添加人:">
+                <el-form-item prop="adminName" label="添加人:">
                     <el-input v-model="addObj.adminName" disabled style="width: 220px;" />
                 </el-form-item>
 
@@ -191,7 +352,7 @@ onMounted(async function(){
 
             <div class="dialog-footer">
                 <el-button @click="closeAddActivityVisible">取消</el-button>
-                <el-button type="primary" @click="closeAddActivityVisible">
+                <el-button type="primary" @click="add()">
                     提交
                 </el-button>
             </div>
diff --git a/vue/gold-system/src/views/recharge/adminRecharge.vue b/vue/gold-system/src/views/recharge/adminRecharge.vue
index 36753ba..ea27184 100644
--- a/vue/gold-system/src/views/recharge/adminRecharge.vue
+++ b/vue/gold-system/src/views/recharge/adminRecharge.vue
@@ -3,94 +3,35 @@ import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
 import { AiFillRead } from "vue-icons-plus/ai";
 
-const tableData = [
-    {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    },
-    {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    }, {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    }, {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    }, {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    },
+// 变量
+// 用户对象假的
+const admin = ref({
+    adminId: 1,
+    name: '客服A',
+    area: '新加坡'
+})
 
-]
+// 充值明细表格
+const tableData = ref([]);
+
+// 搜索recharge
+const rechargeVo = ref({
+    name: admin.value.name,
+    area: admin.value.area,
+    adminId: admin.value.adminId,
+});
 
+// 搜索对象
+const getObj = ref({
+    pageNum: 1,
+    pageSize: 5,
+});
+//分页总条目
+const total = ref(100)
 //下拉框
 const value = ref('')
+//默认高亮选项
+const activeName = ref('all')
 const options = [
     {
         value: 'Option1',
@@ -114,30 +55,60 @@ const options = [
     },
 ]
 
-//分页对象
-const getObj = ref({
-    page: 1,
-    size: 10,
-})
-//分页总条目
-const total = ref(100)
-//默认高亮选项
-const activeName = ref('all')
+//表格高度
+const tableHeight = computed(function () {
+    return (getObj.value.pageSize + 2) * 60 + 'px';
+});
+
+// 方法
+// 搜索方法
+const get = async function (val) {
+    try {
+        // 搜索参数页码赋值 
+        if (typeof val === 'number') {
+            getObj.value.pageNum = val;
+        }
+        console.log('搜索参数', getObj.value);
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', {...getObj.value,rechargeVo:{...rechargeVo.value}});
+
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 存储表格数据
+        tableData.value = result.data.data.list;
+        console.log('tableData', tableData.value);
+        // 存储分页总数
+        total.value = result.data.data.total;
+        console.log('total', total.value);
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+}
+
 
 //全部充值明细
 const adminAll = function () {
     console.log('adminAll');
+    rechargeVo.value.status='';
+    get();
 }
 //待审核充值明细
 const adminWait = function () {
+    rechargeVo.value.status=0;
+    get();
     console.log('adminWait');
 }
 //已通过充值明细
 const adminPass = function () {
+    rechargeVo.value.status=1;
+    get();
     console.log('adminPass');
 }
 //已驳回充值明细
 const adminReject = function () {
+    rechargeVo.value.status=2;
+    get();
     console.log('adminReject');
 }
 //点击标签页
@@ -198,8 +169,8 @@ const Delete = function (index, row) {
                     <el-col :span="21">
                         <div class="head-card-element">
                             <el-text class="mx-1" size="large">充值时间：</el-text>
-                            <el-time-picker v-model="value1" is-range range-separator="至" start-placeholder="起始时间"
-                                end-placeholder="结束时间" />
+                            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
+                                start-placeholder="起始时间" end-placeholder="结束时间" />
                             <el-button style="margin-left: 10px;">今</el-button>
                             <el-button>昨</el-button>
                             <el-button>近7天</el-button>
@@ -225,7 +196,7 @@ const Delete = function (index, row) {
                     <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
                 </el-tabs>
                 <div>
-                    <el-table :data="tableData" style="width: 100%">
+                    <el-table :data="tableData" :height="tableHeight" style="width: 100%">
                         <el-table-column prop="name" label="姓名" width="100px" />
                         <el-table-column prop="homilyId" label="精网号" width="150px" />
                         <el-table-column prop="area" label="所属地区" width="100px" />
@@ -239,18 +210,24 @@ const Delete = function (index, row) {
                         <el-table-column prop="adminName" label="提交人" width="100px" />
                         <el-table-column prop="status" label="状态" width="100px">
                             <template #default="scope">
-                                <div class="status">
-                                    <span v-if="scope.row.status === '进行中'">
+                                <span v-if="scope.row.status === 1">
+                                    <div class="status">
                                         <span class="green-dot"></span>
-                                    </span>
-                                    <span v-if="scope.row.status === '未开始'">
-                                        <span class="red-dot"></span>
-                                    </span>
-                                    <span v-if="scope.row.status === '已结束'">
+                                        <span>已通过</span>
+                                    </div>
+                                </span>
+                                <span v-if="scope.row.status === 0">
+                                    <div class="status">
                                         <span class="grey-dot"></span>
-                                    </span>
-                                    <span>{{ scope.row.status }}</span>
-                                </div>
+                                        <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="reason" label="驳回理由" width="200px" show-overflow-tooltip />
@@ -278,7 +255,8 @@ const Delete = function (index, row) {
                 </div>
 
                 <!-- 分页 -->
-                <el-pagination background layout="prev, pager, next" :total="total" />
+                <el-pagination background layout="prev, pager, next" :total="total" :page-size="getObj.pageSize"
+                    :current-page="getObj.pageNum" @current-change="get" />
 
             </el-card>
         </el-col>
@@ -291,7 +269,7 @@ const Delete = function (index, row) {
             <el-form :model="editObj" label-width="auto" style="max-width: 600px">
 
                 <el-form-item label="活动名称:">
-                    <el-input v-model="addObj.activityName" placeholder="请输入活动名称" style="width: 220px;"/>
+                    <el-input v-model="addObj.activityName" placeholder="请输入活动名称" style="width: 220px;" />
                 </el-form-item>
 
                 <el-form-item label="免费金币:">
@@ -315,7 +293,7 @@ const Delete = function (index, row) {
                 </el-form-item>
 
                 <el-form-item label="添加人:">
-                    <el-input v-model="addObj.adminName" disabled style="width: 220px;"/>
+                    <el-input v-model="addObj.adminName" disabled style="width: 220px;" />
                 </el-form-item>
 
             </el-form>
diff --git a/vue/gold-system/src/views/recharge/allRecharge.vue b/vue/gold-system/src/views/recharge/allRecharge.vue
index f789890..b43a184 100644
--- a/vue/gold-system/src/views/recharge/allRecharge.vue
+++ b/vue/gold-system/src/views/recharge/allRecharge.vue
@@ -2,94 +2,24 @@
 import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
 import { AiFillRead } from "vue-icons-plus/ai";
+import axios from 'axios';
+// 变量
+// 充值明细表格
+const tableData = ref([]);
 
-const tableData = [
-    {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由驳回理由',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    },
-    {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    }, {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    }, {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    }, {
-        name: '梁凡',
-        homilyId: '123456',
-        area: '北京',
-        activityName: '这是活动名称',
-        rechargeGold: '1000',
-        paidGold: '500',
-        freeGold: '500',
-        remark: '这是备注',
-        rechargeWay: '微信',
-        rechargeVoucher: '123456789',
-        adminName: '张三',
-        status: '进行中',
-        reason: '原因',
-        rechargeTime: '2023-12-22 00:00:00',
-        createTime: '2023-01-01 00:00:00',
-    },
-
-]
-
+// 搜索recharge
+const rechargeVo = ref({});
+// 搜索对象
+const getObj = ref({
+    pageNum: 1,
+    pageSize: 5,
+});
+//分页总条目
+const total = ref(100);
+//下拉框选值
 const value = ref('')
+//默认高亮选项
+const activeName = ref('all')
 const options = [
     {
         value: 'Option1',
@@ -113,30 +43,61 @@ const options = [
     },
 ]
 
-//分页对象
-const getObj = ref({
-    page: 1,
-    size: 10,
-})
-//分页总条目
-const total = ref(100)
-//默认高亮选项
-const activeName = ref('all')
+//表格高度
+const tableHeight = computed(function () {
+    return (getObj.value.pageSize + 2) * 60 + 'px';
+});
+
+
+// 方法
+// 搜索方法
+const get = async function (val) {
+    try {
+        // 搜索参数页码赋值 
+        if (typeof val === 'number') {
+            getObj.value.pageNum = val;
+        }
+        console.log('搜索参数', getObj.value);
+        // 发送POST请求
+        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge', {...getObj.value,rechargeVo:{...rechargeVo.value}});
+
+        // 将响应结果存储到响应式数据中
+        console.log('请求成功', result);
+        // 存储表格数据
+        tableData.value = result.data.data.list;
+        console.log('tableData', tableData.value);
+        // 存储分页总数
+        total.value = result.data.data.total;
+        console.log('total', total.value);
+    } catch (error) {
+        console.log('请求失败', error);
+        // 在这里可以处理错误逻辑，比如显示错误提示等
+    }
+}
+
 
 //全部充值明细
 const adminAll = function () {
     console.log('adminAll');
+    rechargeVo.value.status='';
+    get();
 }
 //待审核充值明细
 const adminWait = function () {
+    rechargeVo.value.status=0;
+    get();
     console.log('adminWait');
 }
 //已通过充值明细
 const adminPass = function () {
+    rechargeVo.value.status=1;
+    get();
     console.log('adminPass');
 }
 //已驳回充值明细
 const adminReject = function () {
+    rechargeVo.value.status=2;
+    get();
     console.log('adminReject');
 }
 //点击标签页
@@ -157,6 +118,11 @@ const Delete = function (index, row) {
     console.log(index, row)
 }
 
+// 挂载
+onMounted(async function () {
+    get();
+})
+
 </script>
 
 <template>
@@ -197,8 +163,8 @@ const Delete = function (index, row) {
                     <el-col :span="21">
                         <div class="head-card-element">
                             <el-text class="mx-1" size="large">充值时间：</el-text>
-                            <el-time-picker v-model="value1" is-range range-separator="至" start-placeholder="起始时间"
-                                end-placeholder="结束时间" />
+                            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至"
+                                start-placeholder="起始时间" end-placeholder="结束时间" />
                             <el-button style="margin-left: 10px;">今</el-button>
                             <el-button>昨</el-button>
                             <el-button>近7天</el-button>
@@ -224,8 +190,8 @@ const Delete = function (index, row) {
                     <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
                 </el-tabs>
                 <div>
-                    <el-table :data="tableData" style="width: 100%">
-                        <el-table-column prop="name" label="姓名" width="100px" />
+                    <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+                        <el-table-column prop="username" label="姓名" width="100px" />
                         <el-table-column prop="homilyId" label="精网号" width="150px" />
                         <el-table-column prop="area" label="所属地区" width="100px" />
                         <el-table-column prop="activityName" label="活动名称" width="150px" />
@@ -234,50 +200,44 @@ const Delete = function (index, row) {
                         <el-table-column prop="freeGold" label="免费金币" width="100px" />
                         <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
                         <el-table-column prop="rechargeWay" label="支付方式" width="100px" />
-                        <el-table-column prop="rechargeVoucher" label="支付凭证" width="150px" />
+                        <el-table-column prop="rechargeVoucher" label="支付凭证" width="150px">
+                            <template #default="scope">
+                                <el-image :src="scope.row.rechargeVoucher" alt="凭证"
+                                    style="width: 50px; height: 50px" />
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="adminName" label="提交人" width="100px" />
                         <el-table-column prop="status" label="状态" width="100px">
                             <template #default="scope">
-                                <div class="status">
-                                    <span v-if="scope.row.status === '进行中'">
+                                <span v-if="scope.row.status === 1">
+                                    <div class="status">
                                         <span class="green-dot"></span>
-                                    </span>
-                                    <span v-if="scope.row.status === '未开始'">
-                                        <span class="red-dot"></span>
-                                    </span>
-                                    <span v-if="scope.row.status === '已结束'">
+                                        <span>已通过</span>
+                                    </div>
+                                </span>
+                                <span v-if="scope.row.status === 0">
+                                    <div class="status">
                                         <span class="grey-dot"></span>
-                                    </span>
-                                    <span>{{ scope.row.status }}</span>
-                                </div>
+                                        <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="reason" label="驳回理由" width="200px" show-overflow-tooltip />
                         <el-table-column prop="rechargeTime" label="交款时间" width="200px" />
                         <el-table-column prop="createTime" label="提交时间" width="200px" />
-                        <el-table-column fixed="right" prop="operation" label="操作" width="150px">
-                            <template #default="scope">
-                                <el-popconfirm title="确定将此条活动删除吗？">
-                                    <template #reference>
-                                        <el-button type="primary" text @click="Delete(scope.$index, 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>
 
                 <!-- 分页 -->
-                <el-pagination background layout="prev, pager, next" :total="total" />
+                <el-pagination background layout="prev, pager, next" :total="total" :page-size="getObj.pageSize"
+                    :current-page="getObj.pageNum" @current-change="get" />
 
             </el-card>
         </el-col>