diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue
index 395b673..5b1119c 100644
--- a/vue/gold-system/src/views/consume/addConsume.vue
+++ b/vue/gold-system/src/views/consume/addConsume.vue
@@ -1,153 +1,162 @@
 <script setup>
-    import { reactive } from 'vue';
-    import { ref,computed,watch } from 'vue'
-    import { ElMessage } from 'element-plus'
-    import { Plus } from '@element-plus/icons-vue'
-    import axios from 'axios'
-    import { ElMessageBox } from 'element-plus'
-
-
-
-    
-
-
+import { reactive } from "vue";
+import { ref, computed, watch } from "vue";
+import { ElMessage } from "element-plus";
+import { Plus } from "@element-plus/icons-vue";
+import axios from "axios";
+import { ElMessageBox } from "element-plus";
 
 // 这是添加充值信息的表单
-const addConsume = ref({
-
- });
+const addConsume = ref({});
 // 这是添加充值信息的接口
 const add = async function () {
-    try {
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10010/recharge/recharge/add', addConsume.value);
-
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        // 存储表格数据
-        console.log('用户信息', user.value);
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-}
+  try {
+    // 发送POST请求
+    const result = await axios.post(
+      "http://192.168.8.93:10010/recharge/recharge/add",
+      addConsume.value
+    );
+
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储表格数据
+    console.log("用户信息", user.value);
+  } catch (error) {
+    console.log("请求失败", error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 const addBefore = () => {
   Ref.value.validate(async (valid) => {
     if (valid) {
-    ElMessageBox.confirm('确认添加？').then(() => {
-      add();
-      console.log('添加成功');
-      imageUrl.value = '';
-      addConsume.value = {};
-    }).catch(() => {
-      console.log('取消添加');
-    }) } else {
-            //提示
-            ElMessage({
-                type: 'error',
-                message: '请检查输入内容',
-            })
-        }
-    })
-  }
+      ElMessageBox.confirm("确认添加？")
+        .then(() => {
+          add();
+          console.log("添加成功");
+          imageUrl.value = "";
+          addConsume.value = {};
+        })
+        .catch(() => {
+          console.log("取消添加");
+        });
+    } else {
+      //提示
+      ElMessage({
+        type: "error",
+        message: "请检查输入内容",
+      });
+    }
+  });
+};
 
-  // 表单验证
+// 表单验证
 // 开始时间改变时，重新验证结束时间
 const Ref = ref(null);
 const checkEndTime = function (rule, value, callback) {
-    if (value <= new Date()) {
-        callback(new Error('付款时间不能小于当前时间'))
-    } 
-}
+  if (value <= new Date()) {
+    callback(new Error("付款时间不能小于当前时间"));
+  }
+};
 const rules = reactive({
-    homilyId: [{ required: true, message: '请输入精网号', trigger: 'blur' },],
-    refundGoods: [{ required: true, message: '请选择退款商品', trigger: 'blur' },],
-    taskCoin: [{ required: true, message: '请输入任务金币', trigger: 'blur' },],
-    freeCoin: [{ required: true, message: '请输入免费金币', trigger: 'blur' },],
-    rechargeCoin: [{ required: true, message: '请输入免费金币', trigger: 'blur' },],
-    allGold: [{ required: true, message: '请输入消费金币总数', trigger: 'blur' },],
-    
-   
-})
+  jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }],
+  refundGoods: [{ required: true, message: "请选择退款商品", trigger: "blur" }],
+  taskCoin: [{ required: true, message: "请输入任务金币", trigger: "blur" }],
+  freeCoin: [{ required: true, message: "请输入免费金币", trigger: "blur" }],
+  rechargeCoin: [
+    { required: true, message: "请输入免费金币", trigger: "blur" },
+  ],
+  allGold: [{ required: true, message: "请输入消费金币总数", trigger: "blur" }],
+});
 
 // 查找客户信息的方法
 const user = ref({});
-const getUser = async function (homilyId) {
-    try {
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.93:10020/recharge/user', {homilyId: homilyId});
-
-        // 将响应结果存储到响应式数据中
-        console.log('请求成功', result);
-        // 存储表格数据
-        user.value = result.data.data[0];
-        console.log('用户信息', user.value);
- 
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
+const getUser = async function (jwcode) {
+  try {
+    // 发送POST请求
+    const result = await axios.post("http://192.168.8.93:10020/recharge/user", {
+      jwcode: jwcode,
+    });
+
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 存储表格数据
+    user.value = result.data.data[0];
+    console.log("用户信息", user.value);
+    if (result.data.code === 0) {
+      ElMessage.error(result.data.msg);
+    } else {
+      ElMessage.success(result.data.msg);
     }
-}
+  } catch (error) {
+    console.log("请求失败", error);
+    ElMessage.error("查询失败，请检查精网号是否正确");
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 
 // 这是查询活动的接口
-const activity = ref([]); 
+const activity = ref([]);
 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.value);
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-}
+  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.value);
+  } catch (error) {
+    console.log("请求失败", error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 getActivity();
 
 // 这是查询货币的接口
-const currency = ref([]); 
+const currency = ref([]);
 const getCurrency = async function () {
-    try {
-
-        // 发送POST请求
-        const result = await axios.post('http://192.168.8.174:10010/rates/search',{});
-
-        // 将响应结果存储到响应式数据中
-        console.log('货币请求成功', result);
-        // 存储表格数据
-        currency.value = result.data.data;
-        console.log('tableData', currency.value);
-        // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
-        
-    } catch (error) {
-        console.log('请求失败', error);
-        // 在这里可以处理错误逻辑，比如显示错误提示等
-    }
-}
+  try {
+    // 发送POST请求
+    const result = await axios.post(
+      "http://192.168.8.174:10010/rates/search",
+      {}
+    );
+
+    // 将响应结果存储到响应式数据中
+    console.log("货币请求成功", result);
+    // 存储表格数据
+    currency.value = result.data.data;
+    console.log("tableData", currency.value);
+    // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
+  } catch (error) {
+    console.log("请求失败", error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 getCurrency();
 
-
 // 这是添加上传图片的接口
-const imageUrl = ref('')
+const imageUrl = ref("");
 
 // 上传图片成功的回调函数
 const handleAvatarSuccess = (response, uploadFile) => {
   imageUrl.value = URL.createObjectURL(uploadFile.raw);
-  console.log('图片上传成功', response, uploadFile);
-  addConsume.value.rechargeVoucher = 'http://192.168.8.93:10010/upload/' + response.data;
-  console.log('图片名称', addConsume.value.rechargeVoucher);
+  console.log("图片上传成功", response, uploadFile);
+  addConsume.value.rechargeVoucher =
+    "http://192.168.8.93:10010/upload/" + response.data;
+  console.log("图片名称", addConsume.value.rechargeVoucher);
 };
 // 上传图片之前的校验函数
 const beforeAvatarUpload = (rawFile) => {
-  if (rawFile.type !== 'image/jpeg') {
-    ElMessage.error('Avatar picture must be JPG format!');
+  if (rawFile.type !== "image/jpeg") {
+    ElMessage.error("Avatar picture must be JPG format!");
     return false;
   } else if (rawFile.size / 1024 / 1024 > 2) {
-    ElMessage.error('Avatar picture size can not exceed 2MB!');
+    ElMessage.error("Avatar picture size can not exceed 2MB!");
     return false;
   }
   return true;
@@ -156,19 +165,18 @@ const beforeAvatarUpload = (rawFile) => {
 //充值方式条目
 const options = [
   {
-    value: '现金充值',
-    label: '现金充值',
+    value: "现金充值",
+    label: "现金充值",
   },
   {
-    value: '龙鳞卡',
-    label: '龙鳞卡',
+    value: "龙鳞卡",
+    label: "龙鳞卡",
   },
   {
-    value: '弘粉卡',
-    label: '弘粉卡',
+    value: "弘粉卡",
+    label: "弘粉卡",
   },
-  
-]
+];
 
 const calculatedFreeGold = computed(() => {
   return addConsume.value.paidGold * addConsume.value.activityId;
@@ -180,122 +188,155 @@ watch(calculatedFreeGold, (newVal) => {
 </script>
 
 <template>
-  <div style="margin-bottom: 20px;">
-    新增消费
-  </div>
-
-  <el-form :model="addConsume" ref="Ref" :rules="rules" label-width="auto" style="max-width: 750px">
-    <el-form-item prop="homilyId" label="精网号">
-      <el-input v-model="addConsume.homilyId" style="width: 220px;" />
-      <el-button type="primary" @click="getUser(addConsume.homilyId)" style="margin-left: 20px;">查询</el-button>
+  <div style="margin-bottom: 20px">新增消费</div>
+
+  <el-form
+    :model="addConsume"
+    ref="Ref"
+    :rules="rules"
+    label-width="auto"
+    style="max-width: 750px"
+  >
+    <el-form-item prop="jwcode" label="精网号">
+      <el-input v-model="addConsume.jwcode" style="width: 220px" />
+      <el-button
+        type="primary"
+        @click="getUser(addConsume.jwcode)"
+        style="margin-left: 20px"
+        >查询</el-button
+      >
     </el-form-item>
     <el-form-item prop="goods" label="商品名称">
-      <el-select v-model="addConsume.goods" placeholder="请选择" style="width: 300px">
+      <el-select
+        v-model="addConsume.goods"
+        placeholder="请选择"
+        style="width: 300px"
+      >
         <el-option
-        v-for="item in activity"
-        :key="item.value"
-        :label="item.activityName"
-        :value="item.rechargeRatio"
+          v-for="item in activity"
+          :key="item.value"
+          :label="item.activityName"
+          :value="item.rechargeRatio"
         />
       </el-select>
     </el-form-item>
     <el-form-item prop="allGold" label="消费金币总数">
-        <el-input v-model="addConsume.paidGold" style="width: 100px;"/>
+      <el-input v-model="addConsume.paidGold" style="width: 100px" />
+    </el-form-item>
+    <el-form-item prop="taskCoin" label="任务金币" style="float: left">
+      <el-input
+        disabled
+        v-model="addConsume.taskCoin"
+        style="width: 100px; margin-left: -5px"
+      />
+      <p style="margin-right: 0px">个</p>
+    </el-form-item>
+    <el-form-item
+      prop="freeCoin"
+      label="免费金币"
+      style="float: left; margin-left: -10px; margin-right: -10px"
+    >
+      <el-input
+        disabled
+        v-model="addConsume.freeCoin"
+        style="width: 100px; margin-left: -5px"
+      />
+      <p style="margin-right: 0px">个</p>
+    </el-form-item>
+    <el-form-item
+      prop="rechargeCoin"
+      label="充值金币"
+      style="margin-left: -20px"
+    >
+      <el-input
+        disabled
+        v-model="addConsume.rechargeCoin"
+        style="width: 100px; margin-left: -5px"
+      />
+      <p style="margin-right: 20px">个</p>
     </el-form-item>
-    <el-form-item prop="taskCoin" label="任务金币" style="float: left; ">
-        <el-input disabled v-model="addConsume.taskCoin" style="width: 100px;margin-left: -5px;"/>
-        <p style="margin-right: 0px;">个</p>
-      </el-form-item>
-      <el-form-item prop="freeCoin" label="免费金币" style="float: left;margin-left: -10px;margin-right: -10px;">
-          <el-input disabled v-model="addConsume.freeCoin" style="width: 100px;margin-left: -5px;"/>
-          <p style="margin-right: 0px;">个</p>
-      </el-form-item>
-      <el-form-item prop="rechargeCoin" label="充值金币" style="margin-left: -20px;">
-          <el-input disabled v-model="addConsume.rechargeCoin" style="width: 100px;margin-left: -5px;"/>
-          <p style="margin-right: 20px;">个</p>
-      </el-form-item>
     <el-form-item prop="remark" label="备注">
       <el-input
-    v-model="addConsume.remark"
-    style="width: 300px"
-    :rows="2"
-    maxlength="100"
-    show-word-limit
-    type="textarea"
-  />
+        v-model="addConsume.remark"
+        style="width: 300px"
+        :rows="2"
+        maxlength="100"
+        show-word-limit
+        type="textarea"
+      />
     </el-form-item>
     <el-form-item prop="commitName" label="提交人">
-      <el-input style="width: 300px" value="张三" disabled placeholder="提交人姓名"/>
+      <el-input
+        style="width: 300px"
+        value="张三"
+        disabled
+        placeholder="提交人姓名"
+      />
     </el-form-item>
   </el-form>
-  
-    <el-button @click="closeAddActivityVisible" style="margin-left: 280px;">取消</el-button>
-    <el-button type="primary" @click="addBefore">
-        提交
-    </el-button>
 
-   <!-- 客户信息栏 -->
-   <el-card style="width: 700px;float: right;margin-top: -330px;margin-right: 100px;">
-    <el-form :model="user" label-width="auto" style="max-width: 600px" label-position="left">
-     <el-text size="large" style="margin-left: 20px;">客户信息</el-text>
-      <el-row style="margin-top: 20px;">
+  <el-button @click="closeAddActivityVisible" style="margin-left: 280px"
+    >取消</el-button
+  >
+  <el-button type="primary" @click="addBefore"> 提交 </el-button>
+
+  <!-- 客户信息栏 -->
+  <el-card
+    style="width: 700px; float: right; margin-top: -330px; margin-right: 100px"
+  >
+    <el-form
+      :model="user"
+      label-width="auto"
+      style="max-width: 600px"
+      label-position="left"
+    >
+      <el-text size="large" style="margin-left: 20px">客户信息</el-text>
+      <el-row style="margin-top: 20px">
+        <el-col :span="12">
+          <el-form-item label="姓名:">
+            <p>{{ user.name }}</p>
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
-      <el-form-item label="姓名:" >
-          <p>{{user.name}}</p>
-      </el-form-item>
+          <el-form-item label="历史金币总数"> </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="历史金币总数" >
+          <el-form-item label="精网号">
+            <p>{{ user.jwcode }}</p>
           </el-form-item>
-            </el-col>
+        </el-col>
         <el-col :span="12">
-      <el-form-item label="精网号" >
-        <p>{{user.homilyId}}</p>
-      </el-form-item>
-    </el-col>
-    <el-col :span="12">
-      <el-form-item label="当前金币总数" >
-      </el-form-item>
+          <el-form-item label="当前金币总数"> </el-form-item>
         </el-col>
-    <el-col :span="12">
-      <el-form-item label="首次充值日期">
-      </el-form-item>
-    </el-col>
-    <el-col :span="12">
-      <el-form-item label="充值次数" >
-      </el-form-item>
+        <el-col :span="12">
+          <el-form-item label="首次充值日期"> </el-form-item>
         </el-col>
-    <el-col :span="12">
-      <el-form-item label="负责客服" >
-      </el-form-item>
-    </el-col>
-    <el-col :span="12">
-      <el-form-item label="消费次数" >
-      </el-form-item>
+        <el-col :span="12">
+          <el-form-item label="充值次数"> </el-form-item>
         </el-col>
-    <el-col :span="12">
-      <el-form-item label="所属门店" >
-      </el-form-item>
-    </el-col>
-    <el-col :span="12">
-      <el-form-item label="待审核" >
-      </el-form-item>
+        <el-col :span="12">
+          <el-form-item label="负责客服"> </el-form-item>
         </el-col>
-    </el-row>
-
-     
-
+        <el-col :span="12">
+          <el-form-item label="消费次数"> </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="所属门店"> </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="待审核"> </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
   </el-card>
 </template>
 
 <style scoped>
-  p{
-    margin: 0px;
-  }
-  .el-form-item {
+p {
+  margin: 0px;
+}
+.el-form-item {
   margin-left: 50px;
-
 }
 
 /* 上传图片的格式 */
@@ -307,25 +348,24 @@ watch(calculatedFreeGold, (newVal) => {
 </style>
 
 <style>
-  .avatar-uploader .el-upload {
-    border: 1px dashed var(--el-border-color);
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-    transition: var(--el-transition-duration-fast);
-  }
-  
-  .avatar-uploader .el-upload:hover {
-    border-color: var(--el-color-primary);
-  }
-  
-  .el-icon.avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 50px;
-    height: 50px;
-    text-align: center;
+.avatar-uploader .el-upload {
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  transition: var(--el-transition-duration-fast);
+}
 
-  }
-  </style>
\ No newline at end of file
+.avatar-uploader .el-upload:hover {
+  border-color: var(--el-color-primary);
+}
+
+.el-icon.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 50px;
+  height: 50px;
+  text-align: center;
+}
+</style>
diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue
index bb8f51a..aacd1a4 100644
--- a/vue/gold-system/src/views/consume/allConsume.vue
+++ b/vue/gold-system/src/views/consume/allConsume.vue
@@ -12,7 +12,7 @@ const detailVo = ref({});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
-  pageSize: 5,
+  pageSize: 10,
 });
 //分页总条目
 const total = ref(100);
@@ -28,35 +28,36 @@ const area = ref([]);
 //标签页默认高亮选项
 const activeName = ref("all");
 
-// 支付方式选项
-const payWay = [
+// 消费平台选项
+const consumePlatform = [
   {
-    value: "微信",
-    label: "微信",
+    value: "HomilyLink",
+    label: "HomilyLink",
   },
   {
-    value: "支付宝",
-    label: "支付宝",
+    value: "金币系统",
+    label: "金币系统",
   },
   {
-    value: "银联",
-    label: "银联",
+    value: "ERP系统",
+    label: "ERP系统",
   },
   {
-    value: "信用卡",
-    label: "信用卡",
+    value: "金币系统",
+    label: "金币系统",
   },
+];
+const consumeType = [
   {
-    value: "借记卡",
-    label: "借记卡",
+    value: "购买商品",
+    label: "购买商品",
   },
 ];
 
 //表格高度
 const tableHeight = computed(function () {
-  return (getObj.value.pageSize + 2) * 60 + "px";
+  return (getObj.value.pageSize + 1) * 41 + "px";
 });
-
 // 方法
 // 搜索==============================================================
 // 搜索方法
@@ -98,12 +99,11 @@ const get = async function (val) {
 };
 // 重置
 const reset = function () {
-  detailVo.value.activityId = "";
-  detailVo.value.payWay = "";
-  detailVo.value.area = "";
+  detailVo.value.goods = "";
+  detailVo.value.consumePlatform = "";
+  detailVo.value.consumeType = "";
   detailVo.value.startDate = "";
   detailVo.value.endDate = "";
-  get();
 };
 // 今天
 const getToday = function () {
@@ -157,30 +157,6 @@ const get7Days = function () {
   console.log("getTime", getTime.value);
   get();
 };
-//全部充值明细
-const adminAll = function () {
-  console.log("adminAll");
-  detailVo.value.status = "";
-  get();
-};
-//待审核充值明细
-const adminWait = function () {
-  detailVo.value.status = 0;
-  get();
-  console.log("adminWait");
-};
-//已通过充值明细
-const adminPass = function () {
-  detailVo.value.status = 1;
-  get();
-  console.log("adminPass");
-};
-//已驳回充值明细
-const adminReject = function () {
-  detailVo.value.status = 2;
-  get();
-  console.log("adminReject");
-};
 //点击标签页
 const handleClick = function (tab, event) {
   if (tab.props.name === "all") {
@@ -193,52 +169,41 @@ const handleClick = function (tab, event) {
     adminReject();
   }
 };
-// 获取活动名称
-const getActivity = async function () {
-  try {
-    // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.93:10010/recharge/activity/select",
-      {}
-    );
 
-    // 将响应结果存储到响应式数据中
-    console.log("请求成功", result);
-    // 存储表格数据
-    activity.value = result.data.data;
-    console.log("activity", activity.value);
-  } catch (error) {
-    console.log("请求失败", error);
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-};
-// 获取地区
-const getArea = async function () {
-  try {
-    // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.93:10010/recharge/recharge",
-      {}
-    );
-    // 将响应结果存储到响应式数据中
-    console.log("请求成功", result);
-    // 存储全部数据
-    allData.value = result.data.data;
-    console.log("allData", allData.value);
-    // 分离并去重地区列表
-    area.value = [...new Set(allData.value.map((item) => item.area))];
-    console.log("地区", area.value);
-  } catch (error) {
-    console.log("请求失败", error);
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-};
 // 挂载
 onMounted(async function () {
   await get();
   getActivity();
   await getArea();
 });
+
+// 验证跳转输入框的数字是否合法
+const checkNumber = function () {
+  if (typeof parseInt(getObj.value.pageNum) === "number") {
+    console.log(
+      "总共有多少页" + Math.ceil(total.value / getObj.value.pageSize)
+    );
+    if (
+      getObj.value.pageNum > 0 &&
+      getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
+    ) {
+      console.log("输入的数字合法");
+      get();
+    } else {
+      //提示
+      ElMessage({
+        type: "error",
+        message: "请检查输入内容",
+      });
+    }
+  } else {
+    //提示
+    ElMessage({
+      type: "error",
+      message: "请检查输入内容",
+    });
+  }
+};
 </script>
 
 <template>
@@ -250,7 +215,7 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">商品名称：</el-text>
               <el-select
-                v-model="detailVo.activityId"
+                v-model="detailVo.goods"
                 placeholder="请选择活动名称"
                 size="large"
                 style="width: 240px"
@@ -268,13 +233,13 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">消费平台：</el-text>
               <el-select
-                v-model="detailVo.payWay"
+                v-model="detailVo.consumePlatform"
                 placeholder="请选择支付方式"
                 size="large"
                 style="width: 240px"
               >
                 <el-option
-                  v-for="item in payWay"
+                  v-for="item in consumePlatform"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -286,16 +251,16 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">消费类型：</el-text>
               <el-select
-                v-model="detailVo.area"
-                placeholder="请选择所属地区"
+                v-model="detailVo.consumeType"
+                placeholder="请选择消费类型"
                 size="large"
                 style="width: 240px"
               >
                 <el-option
-                  v-for="item in area"
+                  v-for="item in consumeType"
                   :key="item"
-                  :label="item"
-                  :value="item"
+                  :label="item.label"
+                  :value="item.value"
                 />
               </el-select>
             </div>
@@ -304,7 +269,7 @@ onMounted(async function () {
         <el-row>
           <el-col :span="21">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">充值时间：</el-text>
+              <el-text class="mx-1" size="large">消费时间：</el-text>
               <el-date-picker
                 v-model="getTime"
                 type="datetimerange"
@@ -334,12 +299,16 @@ onMounted(async function () {
       <el-card>
         <div>
           <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-            <el-table-column prop="username" label="姓名" width="80px" />
-            <el-table-column prop="homilyId" label="精网号" width="180px" />
+            <el-table-column prop="userName" label="姓名" width="80px" />
+            <el-table-column prop="jwcode" label="精网号" width="180px" />
             <el-table-column prop="area" label="所属地区" width="120px" />
-            <el-table-column prop="goods" label="商品名称" width="200px" />
             <el-table-column
-              prop="consumPlatform"
+              prop="productName"
+              label="商品名称"
+              width="200px"
+            />
+            <el-table-column
+              prop="consumePlatform"
               label="消费平台"
               width="120px"
             />
@@ -352,7 +321,15 @@ onMounted(async function () {
               prop="rechargeTotal"
               label="消费金币总数"
               width="180px"
-            />
+            >
+              <template #default="scope">
+                {{
+                  scope.row.taskCoin +
+                  scope.row.freeCoin +
+                  scope.row.rechargeCoin
+                }}
+              </template>
+            </el-table-column>
             <el-table-column prop="taskCoin" label="任务金币" width="120px" />
             <el-table-column prop="freeCoin" label="免费金币" width="120px" />
             <el-table-column
@@ -366,40 +343,52 @@ onMounted(async function () {
               width="200px"
               show-overflow-tooltip
             />
-            <el-table-column prop="conmmitName" label="提交人" width="120px" />
+            <el-table-column prop="adminName" label="提交人" width="120px" />
             <el-table-column prop="createTime" label="消费时间" width="180px" />
-            <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>
 
         <!-- 分页 -->
-        <el-pagination
-          background
-          layout="prev, pager, next"
-          :total="total"
-          :page-size="getObj.pageSize"
-          :current-page="getObj.pageNum"
-          @current-change="get"
-        />
+        <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>
@@ -421,4 +410,9 @@ onMounted(async function () {
 .head-card-btn {
   margin-left: auto;
 }
+.pagination {
+  display: flex;
+  margin-top: 20px;
+  margin-left: 33%;
+}
 </style>
diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue
index c537a39..692bc06 100644
--- a/vue/gold-system/src/views/managerecharge/rate.vue
+++ b/vue/gold-system/src/views/managerecharge/rate.vue
@@ -3,6 +3,7 @@ import { ref, onMounted, computed, reactive } from "vue";
 import { ElMessageBox } from "element-plus";
 import axios from "axios";
 import { createApp } from "vue";
+import moment from "moment";
 
 const regeAdd = ref(false);
 const regeEdit = ref(false);
@@ -14,9 +15,15 @@ const getObj = ref({
   pageNum: 1,
   pageSize: 5,
 });
+const total = ref(0);
 //分页总条目
-const get = async function () {
+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.174:10010/rates/search", {
@@ -30,9 +37,9 @@ const get = async function () {
     tableData.value = result.data.data.list;
     console.log("tableData", tableData.value);
     // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
-    getObj.value.pageNum = result.data.data.pageNum;
-    getObj.value.pageSize = result.data.data.pageSize;
-    getObj.value.total = result.data.data.total;
+    // 存储分页总条目
+    total.value = result.data.data.total;
+    console.log("total", total.value);
   } catch (error) {
     console.log("请求失败", error);
     // 在这里可以处理错误逻辑，比如显示错误提示等
@@ -40,7 +47,9 @@ const get = async function () {
 };
 
 // 添加方法
-const rateAdd = ref({});
+const rateAdd = ref({
+  adminId: "1",
+});
 const addRate = async function () {
   try {
     console.log("搜索参数", getObj.value);
@@ -245,6 +254,34 @@ const rules = reactive({
     { 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: "请检查输入内容",
+      });
+    }
+  } else {
+    //提示
+    ElMessage({
+      type: "error",
+      message: "请检查输入内容",
+    });
+  }
+};
 </script>
 
 <template>
@@ -304,7 +341,11 @@ const rules = reactive({
             style="width: 100%"
           >
             <el-table-column prop="currency" label="货币名称" :span="3" />
-            <el-table-column prop="exchangeRate" label="汇率" :span="3" />
+            <el-table-column prop="exchangeRate" label="汇率" :span="3">
+              <template #default="scope">
+                <p>{{ scope.row.exchangeRate }} ：1新币</p>
+              </template>
+            </el-table-column>
 
             <el-table-column prop="createTime" label="添加时间" :span="5">
               <template #default="scope">
@@ -338,12 +379,42 @@ const rules = reactive({
         <div class="pagination">
           <el-pagination
             background
-            layout="prev, pager, next"
-            v-model:current-page="getObj.pageNum"
-            v-model:page-size="getObj.pageSize"
-            :total="getObj.total"
-            @change="handlePageChange"
-          />
+            :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>
@@ -549,4 +620,7 @@ p {
 .el-card {
   padding: 0px;
 }
+.pagination {
+  display: flex;
+}
 </style>
diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue
index 8cf7fa7..ed43145 100644
--- a/vue/gold-system/src/views/recharge/addRecharge.vue
+++ b/vue/gold-system/src/views/recharge/addRecharge.vue
@@ -10,6 +10,7 @@ import { ElMessageBox } from "element-plus";
 const addRecharge = ref({
   rechargeVoucher: "",
   rechargeWay: "客服充值",
+  adminId: "1",
 });
 // 这是添加充值信息的接口
 const add = async function () {
@@ -61,7 +62,7 @@ const checkEndTime = function (rule, value, callback) {
   }
 };
 const rules = reactive({
-  homilyId: [{ required: true, message: "请输入精网号", trigger: "blur" }],
+  jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }],
   activityId: [{ required: true, message: "请选择活动名称", trigger: "blur" }],
   paidGold: [{ required: true, message: "请输入充值金币", trigger: "blur" }],
   rechargeGold: [
@@ -76,11 +77,11 @@ const rules = reactive({
 
 // 查找客户信息的方法
 const user = ref({});
-const getUser = async function (homilyId) {
+const getUser = async function (jwcode) {
   try {
     // 发送POST请求
     const result = await axios.post("http://192.168.8.93:10020/recharge/user", {
-      homilyId: homilyId,
+      jwcode: jwcode,
     });
 
     // 将响应结果存储到响应式数据中
@@ -88,8 +89,14 @@ const getUser = async function (homilyId) {
     // 存储表格数据
     user.value = result.data.data[0];
     console.log("用户信息", user.value);
+    if (result.data.code === 0) {
+      ElMessage.error(result.data.msg);
+    } else {
+      ElMessage.success(result.data.msg);
+    }
   } catch (error) {
     console.log("请求失败", error);
+    ElMessage.error("查询失败，请检查精网号是否正确");
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 };
@@ -200,11 +207,11 @@ watch(calculatedFreeGold, calculatedRechargeGold, (newVal) => {
     label-width="auto"
     style="max-width: 600px"
   >
-    <el-form-item prop="homilyId" label="精网号">
-      <el-input v-model="addRecharge.homilyId" style="width: 220px" />
+    <el-form-item prop="jwcode" label="精网号">
+      <el-input v-model="addRecharge.jwcode" style="width: 220px" />
       <el-button
         type="primary"
-        @click="getUser(addRecharge.homilyId)"
+        @click="getUser(addRecharge.jwcode)"
         style="margin-left: 20px"
         >查询</el-button
       >
@@ -342,7 +349,7 @@ watch(calculatedFreeGold, calculatedRechargeGold, (newVal) => {
         </el-col>
         <el-col :span="12">
           <el-form-item label="精网号">
-            <p>{{ user.homilyId }}</p>
+            <p>{{ user.jwcode }}</p>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/vue/gold-system/src/views/refund/addRefund.vue b/vue/gold-system/src/views/refund/addRefund.vue
index 91eb28c..f3bff30 100644
--- a/vue/gold-system/src/views/refund/addRefund.vue
+++ b/vue/gold-system/src/views/refund/addRefund.vue
@@ -7,13 +7,15 @@ import axios from "axios";
 import { ElMessageBox } from "element-plus";
 
 // 这是添加充值信息的表单
-const addRefund = ref({});
+const addRefund = ref({
+  adminId: "1",
+});
 // 这是添加充值信息的接口
 const add = async function () {
   try {
     // 发送POST请求
     const result = await axios.post(
-      "http://192.168.8.93:10010/recharge/recharge/add",
+      "http://192.168.8.174:10040/refund/add",
       addRefund.value
     );
 
@@ -33,7 +35,6 @@ const addBefore = () => {
         .then(() => {
           add();
           console.log("添加成功");
-          imageUrl.value = "";
           addRefund.value = {};
         })
         .catch(() => {
@@ -58,7 +59,7 @@ const checkEndTime = function (rule, value, callback) {
   }
 };
 const rules = reactive({
-  homilyId: [{ required: true, message: "请输入精网号", trigger: "blur" }],
+  jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }],
   refundType: [{ required: true, message: "请选择退款类型", trigger: "blur" }],
   refundGoods: [{ required: true, message: "请选择退款商品", trigger: "blur" }],
   taskCoin: [{ required: true, message: "请输入任务金币", trigger: "blur" }],
@@ -71,11 +72,11 @@ const rules = reactive({
 
 // 查找客户信息的方法
 const user = ref({});
-const getUser = async function (homilyId) {
+const getUser = async function (jwcode) {
   try {
     // 发送POST请求
     const result = await axios.post("http://192.168.8.93:10020/recharge/user", {
-      homilyId: homilyId,
+      jwcode: jwcode,
     });
 
     // 将响应结果存储到响应式数据中
@@ -83,42 +84,46 @@ const getUser = async function (homilyId) {
     // 存储表格数据
     user.value = result.data.data[0];
     console.log("用户信息", user.value);
+    if (result.data.code === 0) {
+      ElMessage.error(result.data.msg);
+    } else {
+      ElMessage.success(result.data.msg);
+    }
   } catch (error) {
     console.log("请求失败", error);
+    ElMessage.error("查询失败，请检查精网号是否正确");
     // 在这里可以处理错误逻辑，比如显示错误提示等
   }
 };
+const calculatedAllGold = computed(() => {
+  return (
+    addRefund.value.freeCoin +
+    addRefund.value.rechargeCoin +
+    addRefund.value.taskCoin
+  );
+});
 
-// 这是查询货币的接口
-const currency = ref([]);
-const getCurrency = async function () {
-  try {
-    // 发送POST请求
-    const result = await axios.post(
-      "http://192.168.8.174:10010/rates/search",
-      {}
-    );
-
-    // 将响应结果存储到响应式数据中
-    console.log("货币请求成功", result);
-    // 存储表格数据
-    currency.value = result.data.data;
-    console.log("tableData", currency.value);
-    // 在这里可以根据需求进一步处理成功后的逻辑，比如更新UI显示成功消息等
-  } catch (error) {
-    console.log("请求失败", error);
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-};
-getCurrency();
-
-const calculatedFreeGold = computed(() => {
-  return addRefund.value.paidGold * addRefund.value.activityId;
+watch(calculatedAllGold, (newVal) => {
+  addRefund.value.allCoin = newVal;
 });
 
-watch(calculatedFreeGold, (newVal) => {
-  addRefund.value.freeGold = newVal;
+const AAA = computed(() => {
+  return addRefund.value.jwcode;
 });
+
+watch(AAA, (newVal) => {});
+
+// 退款类型选项
+const refundType = [
+  {
+    value: "退款商品",
+    label: "退款商品",
+  },
+  {
+    value: "退款金币",
+    label: "退款金币",
+  },
+];
 </script>
 
 <template>
@@ -131,11 +136,11 @@ watch(calculatedFreeGold, (newVal) => {
     label-width="auto"
     style="max-width: 750px"
   >
-    <el-form-item prop="homilyId" label="精网号">
-      <el-input v-model="addRefund.homilyId" style="width: 220px" />
+    <el-form-item prop="jwcode" label="精网号">
+      <el-input v-model="addRefund.jwcode" style="width: 220px" />
       <el-button
         type="primary"
-        @click="getUser(addRefund.homilyId)"
+        @click="getUser(addRefund.jwcode)"
         style="margin-left: 20px"
         >查询</el-button
       >
@@ -147,10 +152,10 @@ watch(calculatedFreeGold, (newVal) => {
         style="width: 300px"
       >
         <el-option
-          v-for="item in activity"
+          v-for="item in refundType"
           :key="item.value"
-          :label="item.activityName"
-          :value="item.rechargeRatio"
+          :label="item.label"
+          :value="item.value"
         />
       </el-select>
     </el-form-item>
@@ -198,7 +203,10 @@ watch(calculatedFreeGold, (newVal) => {
       <p style="margin-right: 20px">个</p>
     </el-form-item>
     <el-form-item prop="allCoin" label="退款金币总数">
-      <el-input disabled v-model="addRefund.allCoin" style="width: 100px" />
+      <el-input disabled v-model="addRefund.allCoin" style="width: 100px">
+        <template #default="scope">
+        <template #s> {{ taskCoin + freeCoin + rechargeCoin }} </template>
+      </el-input>
     </el-form-item>
     <el-form-item prop="remark" label="备注">
       <el-input
@@ -247,7 +255,7 @@ watch(calculatedFreeGold, (newVal) => {
         </el-col>
         <el-col :span="12">
           <el-form-item label="精网号">
-            <p>{{ user.homilyId }}</p>
+            <p>{{ user.jwcode }}</p>
           </el-form-item>
         </el-col>
         <el-col :span="12">
diff --git a/vue/gold-system/src/views/refund/allRefund.vue b/vue/gold-system/src/views/refund/allRefund.vue
index 3a504ba..67fea13 100644
--- a/vue/gold-system/src/views/refund/allRefund.vue
+++ b/vue/gold-system/src/views/refund/allRefund.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 moment from "moment";
 // 变量
 // 充值明细表格
 const tableData = ref([]);
@@ -28,27 +29,15 @@ const area = ref([]);
 //标签页默认高亮选项
 const activeName = ref("all");
 
-// 支付方式选项
-const payWay = [
+// 退款类型
+const consumeType = [
   {
-    value: "微信",
-    label: "微信",
+    value: "退商品",
+    label: "退商品",
   },
   {
-    value: "支付宝",
-    label: "支付宝",
-  },
-  {
-    value: "银联",
-    label: "银联",
-  },
-  {
-    value: "信用卡",
-    label: "信用卡",
-  },
-  {
-    value: "借记卡",
-    label: "借记卡",
+    value: "退金币",
+    label: "退金币",
   },
 ];
 
@@ -98,8 +87,8 @@ const get = async function (val) {
 };
 // 重置
 const reset = function () {
-  rechargeVo.value.activityId = "";
-  rechargeVo.value.payWay = "";
+  rechargeVo.value.goods = "";
+  rechargeVo.value.consumeType = "";
   rechargeVo.value.area = "";
   rechargeVo.value.startDate = "";
   rechargeVo.value.endDate = "";
@@ -239,6 +228,30 @@ onMounted(async function () {
   getActivity();
   await getArea();
 });
+//删除气泡
+const delObj = ref({});
+const del = function (row) {
+  delObj.value.detailId = row.detailId;
+  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.174:10040/refund/softDelete",
+      delObj.value
+    );
+    // 将响应结果存储到响应式数据中
+    console.log("请求成功", result);
+    // 刷新表格数据
+    get();
+  } catch (error) {
+    console.log("请求失败", error);
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+};
 </script>
 
 <template>
@@ -248,25 +261,25 @@ onMounted(async function () {
         <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-text class="mx-1" size="large">退款类型：</el-text>
               <el-select
-                v-model="rechargeVo.activityId"
-                placeholder="请选择活动名称"
+                v-model="rechargeVo.consumeType"
+                placeholder="请选择退款类型"
                 size="large"
                 style="width: 240px"
               >
                 <el-option
-                  v-for="item in activity"
+                  v-for="item in consumeType"
                   :key="item.activityId"
-                  :label="item.activityName"
-                  :value="item.activityId"
+                  :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-text class="mx-1" size="large">退款商品：</el-text>
               <el-select
                 v-model="rechargeVo.payWay"
                 placeholder="请选择支付方式"
@@ -344,9 +357,14 @@ onMounted(async function () {
           <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
         </el-tabs>
         <div>
-          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-            <el-table-column prop="name" label="姓名" width="80px" />
-            <el-table-column prop="homilyId" label="精网号" width="180px" />
+          <el-table
+            :data="tableData"
+            v-if="(tableData.detailFlag = 1)"
+            :height="tableHeight"
+            style="width: 100%"
+          >
+            <el-table-column prop="user" label="姓名" width="80px" />
+            <el-table-column prop="jwcode" label="精网号" width="180px" />
             <el-table-column prop="area" label="所属地区" width="120px" />
             <el-table-column prop="refundType" label="退款类型" width="180px" />
             <el-table-column
@@ -377,7 +395,7 @@ onMounted(async function () {
               width="200px"
               show-overflow-tooltip
             />
-            <el-table-column prop="adminName" label="提交人" width="100px" />
+            <el-table-column prop="name" label="提交人" width="100px" />
             <el-table-column prop="status" label="审核状态" width="120px">
               <!-- 模板内容 -->
               <template #default="scope">
@@ -407,7 +425,11 @@ onMounted(async function () {
               width="200px"
               show-overflow-tooltip
             />
-            <el-table-column prop="createTime" label="提交时间" width="180px" />
+            <el-table-column prop="createTime" label="提交时间" width="180px">
+              <template #default="scope">
+                {{ moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") }}
+              </template>
+            </el-table-column>
             <el-table-column
               prop="operation"
               label="操作"
@@ -426,7 +448,7 @@ onMounted(async function () {
                   </template>
                   <template #actions="{ confirm, cancel }">
                     <el-button size="small" @click="cancel">取消</el-button>
-                    <el-button type="primary" size="small" @click="confirm">
+                    <el-button type="primary" size="small" @click="delConfirm">
                       确定
                     </el-button>
                   </template>