测试服务器地址，修改屏幕缩放比例

2 months ago · c5b854416d
13 changed files with 334 additions and 125 deletions
--- a/gold-system/README.md
+++ b/gold-system/README.md
@ -22,16 +22,17 @@ npm install echarts 安装 echarts 组件

 npm install moment 安装 moment 组件

-npm install mathjs  安装mathjs组件,解决数据计算问题
+npm install mathjs 安装 mathjs 组件,解决数据计算问题

-npm install xlsx  安装xlsx组件,解决excel文件读取问题
+npm install xlsx 安装 xlsx 组件,解决 excel 文件读取问题

 npm install vue-json-excel 安装导出 excel 组件

-npm install lodash 安装lodash组件,解决数据处理问题
+npm install lodash 安装 lodash 组件,解决数据处理问题

 npm install vite-plugin-lazy-import -D 安装按需加载组件

-npm install vxe-pc-ui@4.3.66 vxe-table@4.10.2 vxe-utils@4.1.11 安装vxe组件
+npm install vxe-pc-ui@4.3.66 vxe-table@4.10.2 vxe-utils@4.1.11 安装 vxe 组件

-npm install --save-dev @types/node 安装typescript声明文件
+npm install --save-dev @types/node 安装 typescript 声明文件
+npm install -g http-server 安装 http-server 组件，模拟服务器运行
--- a/gold-system/index.html
+++ b/gold-system/index.html
@ -1,20 +1,46 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=0.9, maximum-scale=0.9, minimum-scale=0.9"
+    />
    <title>财务金币管理系统</title>
+    <style>
+      html,
+      body,
+      #app {
+        height: 100%;
+
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+    <script>
+      window.onload = function () {
+        // 获取浏览器的缩放比例
+        const browserZoom =
+          (window.devicePixelRatio / window.screen.availWidth) *
+          window.innerWidth;
+        if (browserZoom !== 0.9) {
+          if (typeof document.documentElement.style.zoom === "string") {
+            // 支持 zoom 属性的浏览器（如 IE）
+            document.body.style.zoom = 0.9;
+          } else {
+            // 不支持 zoom 属性的浏览器，使用 transform
+            document.body.style.transform = "scale(0.9)";
+            document.body.style.transformOrigin = "top left";
+            document.body.style.width = "111.11%";
+            document.body.style.height = "111.11%";
+          }
+        }
+      };
+    </script>
  </head>
  <body>
    <div id="app"></div>
    <script type="module" src="/src/main.ts"></script>
  </body>
 </html>
-<style>
-  html,body,#app{
-    height:100%;
-    margin: 0px;
-    padding: 0px;
-  }
-</style>
--- a/gold-system/src/views/audit/rechargeAudit.vue
+++ b/gold-system/src/views/audit/rechargeAudit.vue
@ -97,9 +97,19 @@ const payWay = [
 const Ref = ref(null);

 // 方法
+// 合计数存储
+const totalData = ref({
+  totalno: 0,
+  totalcoin: 0,
+});
+const totalno = ref(0);
+const totalcoin = ref(0);
 // 搜索==============================================================
 // 搜索方法
 const get = async function (val) {
+  // 清空合计数
+  totalno.value = 0;
+  totalcoin.value = 0;
  try {
    // 地区赋值
    if (adminData.value.area != "总部") {
@ -128,6 +138,27 @@ const get = async function (val) {
        rechargeVo: { ...rechargeVo.value },
      }
    );
+    // 合计数的接口
+    // 创建一个新对象，复制 rechargeVo.value 的属性，但排除 status 字段
+    const { status, ...rechargeVoWithoutStatus } = rechargeVo.value;
+    const result2 = await API.post(
+      "http://54.251.137.151:10702/recharge/recharge/RechargeA",
+      {
+        ...rechargeVoWithoutStatus,
+      }
+    );
+    // 做一个判断，如果result2.data[i].flag="待审核"，那么 totalData.value = result2.data[i]，否则就赋值为0
+    for (let i = 0; i < result2.data.length; i++) {
+      if (result2.data[i].flag == "待审核") {
+        totalData.value = result2.data[i];
+        totalno.value = totalData.value.raudit;
+        totalcoin.value = totalData.value.sumRaudit;
+        break;
+      }
+    }
+
+    console.log("合计数", totalno.value);
+    console.log("合计数", totalData.value);

    // 将响应结果存储到响应式数据中
    console.log("请求成功", result);
@ -546,9 +577,11 @@ onMounted(async function () {
          <el-tab-pane label="待审核" name="wait"></el-tab-pane>
          <el-tab-pane label="已通过" name="pass"></el-tab-pane>
          <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
+
+          <div>待审核：{{ totalno }}条，待审核：{{ totalcoin }}金币</div>
        </el-tabs>
-        <div>
-          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+        <div style="height: 629px; overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="629px">
            <el-table-column
              type="index"
              label="序号"
--- a/gold-system/src/views/audit/refundAudit.vue
+++ b/gold-system/src/views/audit/refundAudit.vue
@ -81,7 +81,21 @@ const refundType = [
 const Ref = ref(null);

 // 方法
-// 搜索==============================================================
+// 统计合计数
+// 待审核条数
+const pendingCount = ref(0);
+// 待审核金币数
+const pendingGold = ref(0);
+// 已通过条数
+const approvedCount = ref(0);
+// 已通过金币数
+const approvedGold = ref(0);
+// 已驳回条数
+const rejectedCount = ref(0);
+// 已驳回金币数
+const rejectedGold = ref(0);
+
+// 搜索==================================================================
 // 搜索方法
 const get = async function (val) {
  try {
@ -112,6 +126,34 @@ const get = async function (val) {
        detail: { ...detail.value },
      }
    );
+    const result2 = await API.post(
+      "http://54.251.137.151:10702/refund/RefundA",
+      {
+        ...detail.value,
+      }
+    );
+
+    // 统计合计数
+    if (result2.data) {
+      result2.data.forEach((item) => {
+        switch (item.status) {
+          case "待审核":
+            // 若 item.raudit 为空则赋值为 0
+            pendingCount.value = item.raudit || 0;
+            // 若 item.sumRaudit 为空则赋值为 0
+            pendingGold.value = item.sumRaudit || 0;
+            break;
+          case "已通过":
+            approvedCount.value = item.raudit || 0;
+            approvedGold.value = item.sumRaudit || 0;
+            break;
+          case "已驳回":
+            rejectedCount.value = item.raudit || 0;
+            rejectedGold.value = item.sumRaudit || 0;
+            break;
+        }
+      });
+    }

    // 将响应结果存储到响应式数据中
    console.log("请求成功", result);
@ -524,10 +566,19 @@ onMounted(async function () {
          <el-tab-pane label="待审核" name="wait"></el-tab-pane>
          <el-tab-pane label="已通过" name="pass"></el-tab-pane>
          <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
+          <div>
+            待审核：{{ pendingCount }}条，待审核：{{
+              pendingGold
+            }}金币，已通过：{{ approvedCount }}条，已通过：{{
+              approvedGold
+            }}金币，已驳回：{{ rejectedCount }}条，已驳回：{{
+              rejectedGold
+            }}金币
+          </div>
        </el-tabs>
        <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 630px; overflow-y: auto">
-          <el-table :data="tableData" style="width: 100%" height="630px">
+        <div style="height: 629px; overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="629px">
            <el-table-column
              type="index"
              label="序号"
--- a/gold-system/src/views/consume/allConsume.vue
+++ b/gold-system/src/views/consume/allConsume.vue
@ -76,7 +76,13 @@ const consumeType = [
 //   return (getObj.value.pageSize + 1) * 41 + "px";
 // });
 // 方法
-// 搜索==============================================================
+// 合计数的显示数据
+const tableDataTotal = ref({});
+const rechargeCoin = ref(0);
+const freeCoin = ref(0);
+const taskCoin = ref(0);
+const totalCoin = ref(0);
+// 搜索=========================================================================================================================================================
 // 搜索方法
 const get = async function (val) {
  try {
@ -107,11 +113,45 @@ const get = async function (val) {
        consumeDetail: { ...detailVo.value },
      }
    );
+    // 合计数的接口
+    const result2 = await API.post(
+      "http://54.251.137.151:10702/consume/SumConsume",
+      {
+        ...detailVo.value,
+      }
+    );

    // 将响应结果存储到响应式数据中
    console.log("请求成功", result);
+    console.log("请求成功2", result2);
    // 存储表格数据
    tableData.value = result.data.list;
+    tableDataTotal.value = result2.data;
+    if (result2.data == null) {
+      console.log("请求成功2", result2);
+      tableDataTotal.value = {
+        sumRcion: 0,
+        sumFcion: 0,
+        sumTcion: 0,
+        sumcion: 0,
+      };
+    }
+
+    console.log("tableDataT", tableDataTotal);
+
+    // 修改为保留两位小数
+    rechargeCoin.value = parseFloat(
+      (tableDataTotal.value.sumRcion / 100).toFixed(2)
+    );
+    freeCoin.value = parseFloat(
+      (tableDataTotal.value.sumFcion / 100).toFixed(2)
+    );
+    taskCoin.value = parseFloat(
+      (tableDataTotal.value.sumTcion / 100).toFixed(2)
+    );
+    totalCoin.value = parseFloat(
+      (tableDataTotal.value.sumcion / 100).toFixed(2)
+    );
    console.log("tableData", tableData.value);
    // 存储分页总数
    total.value = result.data.total;
@ -350,9 +390,16 @@ getGoods();
  <el-row>
    <el-col>
      <el-card>
+        <div>
+          消费金币总数：{{ Math.abs(totalCoin) }}，永久金币：{{
+            Math.abs(rechargeCoin)
+          }}，免费金币：{{ Math.abs(freeCoin) }}，任务金币：{{
+            Math.abs(taskCoin)
+          }}
+        </div>
        <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 680px; overflow-y: auto">
-          <el-table :data="tableData" style="width: 100%" height="680px">
+        <div style="height: 665px; overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="665px">
            <el-table-column
              type="index"
              label="序号"
@ -379,7 +426,7 @@ getGoods();
              width="120px"
              fixed="left"
            />
-            <el-table-column prop="uarea" label="所属地区" width="120px" />
+            <el-table-column prop="area" label="所属地区" width="120px" />
            <el-table-column prop="productName" label="商品" width="200px" />
            <el-table-column
              prop="consumePlatform"
@ -405,9 +452,10 @@ getGoods();
                }}
              </template>
            </el-table-column>
-            <el-table-column prop="taskCoin" label="任务金币" width="120px">
+
+            <el-table-column prop="rechargeCoin" label="永久金币" width="120px">
              <template #default="scope">
-                {{ (scope.row.taskCoin * -1) / 100 }}
+                {{ (scope.row.rechargeCoin * -1) / 100 }}
              </template>
            </el-table-column>
            <el-table-column prop="freeCoin" label="免费金币" width="120px">
@ -415,12 +463,12 @@ getGoods();
                {{ (scope.row.freeCoin * -1) / 100 }}
              </template>
            </el-table-column>
-
-            <el-table-column prop="rechargeCoin" label="永久金币" width="120px">
+            <el-table-column prop="taskCoin" label="任务金币" width="120px">
              <template #default="scope">
-                {{ (scope.row.rechargeCoin * -1) / 100 }}
+                {{ (scope.row.taskCoin * -1) / 100 }}
              </template>
            </el-table-column>
+
            <el-table-column
              prop="remark"
              label="备注"
--- a/gold-system/src/views/index.vue
+++ b/gold-system/src/views/index.vue
@ -68,7 +68,7 @@ onMounted(async function () {
          position: fixed;
          top: 0;
          left: 0;
-          height: 100vh;
+          height: 2000vh;
        "
      >
        <div class="logo">
@ -107,7 +107,7 @@ onMounted(async function () {
            index="2"
            v-if="
              adminData.permission == 1 ||
-              adminData.permission == 2 ||
+              adminData.permission == 3 ||
              adminData.permission == 5
            "
          >
@ -125,7 +125,7 @@ onMounted(async function () {
            index="3"
            v-if="
              adminData.permission == 1 ||
-              adminData.permission == 2 ||
+              adminData.permission == 3 ||
              adminData.permission == 5
            "
          >
@ -143,7 +143,7 @@ onMounted(async function () {
            index="4"
            v-if="
              adminData.permission == 1 ||
-              adminData.permission == 3 ||
+              adminData.permission == 2 ||
              adminData.permission == 5
            "
          >
@ -162,7 +162,7 @@ onMounted(async function () {
            index="5"
            v-if="
              adminData.permission == 1 ||
-              adminData.permission == 3 ||
+              adminData.permission == 2 ||
              adminData.permission == 5
            "
          >
@ -180,7 +180,7 @@ onMounted(async function () {
            index="6"
            v-if="
              adminData.permission == 1 ||
-              adminData.permission == 3 ||
+              adminData.permission == 2 ||
              adminData.permission == 5
            "
          >
@ -214,7 +214,8 @@ onMounted(async function () {
            v-if="
              adminData.permission == 1 ||
              adminData.permission == 2 ||
-              adminData.permission == 3
+              adminData.permission == 3 ||
+              adminData.permission == 5
            "
          >
            <el-icon>
@ -233,7 +234,9 @@ onMounted(async function () {
      </el-aside>
      <el-container style="margin-left: 15%; min-width: 180px">
        <!-- 修改 el-header 样式 -->
-        <el-header style="position: fixed; top: 0; left: 15%; right: 0; z-index: 101;">
+        <el-header
+          style="position: fixed; top: 0; left: 15%; right: 0; z-index: 101"
+        >
          <el-menu
            :default-active="activeIndex"
            class="el-menu-demo"
@ -259,7 +262,8 @@ onMounted(async function () {
          </el-menu>
        </el-header>
        <!-- 修改 el-main 样式 -->
-        <el-main style="margin-top: 60px;"> <!-- 60px 是 el-header 的大致高度，可根据实际情况调整 -->
+        <el-main style="margin-top: 60px">
+          <!-- 60px 是 el-header 的大致高度，可根据实际情况调整 -->
          <router-view></router-view>
        </el-main>
      </el-container>
--- a/gold-system/src/views/login.vue
+++ b/gold-system/src/views/login.vue
@ -40,6 +40,7 @@ const login = async function () {
      localStorage.setItem("token", result.data.msg);
      localStorage.setItem("permission", result.data.data.permission);
      if (
+        result.data.data.permission == "5" ||
        result.data.data.permission == "1" ||
        result.data.data.permission == "2" ||
        result.data.data.permission == "3"
@ -110,7 +111,7 @@ const login = async function () {
 <style scoped>
 .bg {
  border-radius: 0 20px 20px 0;
-  height: 100vh;
+  height: 110vh;
  width: 50%;
  object-fit: cover;
 }
--- a/gold-system/src/views/permissions/index.vue
+++ b/gold-system/src/views/permissions/index.vue
@ -585,6 +585,7 @@ onMounted(async function () {
      >
      <el-radio-group v-model="permissionAddObj.permission">
        <el-radio value="1" border>总部管理员</el-radio>
+        <el-radio value="5" border>分部经理</el-radio>
        <el-radio value="2" border>分部财务</el-radio>
        <el-radio value="3" border>分部客服</el-radio>
      </el-radio-group>
--- a/gold-system/src/views/recharge/allRecharge.vue
+++ b/gold-system/src/views/recharge/allRecharge.vue
@ -46,33 +46,22 @@ const area = ref([]);
 //标签页默认高亮选项
 const activeName = ref("all");

-// 支付方式选项
-const payWay = [
-  {
-    value: "微信",
-    label: "微信",
-  },
-  {
-    value: "支付宝",
-    label: "支付宝",
-  },
-  {
-    value: "银联",
-    label: "银联",
-  },
-  {
-    value: "信用卡",
-    label: "信用卡",
-  },
-  {
-    value: "借记卡",
-    label: "借记卡",
-  },
-  {
-    value: "现金充值",
-    label: "现金充值",
-  },
-];
+// 充值方式选项
+const rechargeWay = ref([]);
+// 获取充值方式的数据的接口
+const getPayWay = async function () {
+  try {
+    const result = await API.post(
+      "http://54.251.137.151:10702/recharge/recharge/getWay",
+      {}
+    );
+    rechargeWay.value = result.data.filter((item) => item);
+    console.log("请求成功", result);
+    console.log("充值方式", rechargeWay.value);
+  } catch (error) {
+    console.log("请求失败", error);
+  }
+};

 // //表格高度
 // const tableHeight = computed(function () {
@ -80,6 +69,15 @@ const payWay = [
 // });

 // 方法
+// 合计数存储
+const totalData = ref({
+  totalmoney: 0,
+  totalRcoin: 0,
+  totalFcoin: 0,
+});
+const totalmoney = ref(0);
+const totalRcoin = ref(0);
+const totalFcoin = ref(0);
 // 搜索==============================================================
 // 搜索方法
 const get = async function (val) {
@ -111,6 +109,24 @@ const get = async function (val) {
        rechargeVo: { ...rechargeVo.value },
      }
    );
+    // 创建一个新对象，复制 rechargeVo.value 的属性，但排除 status 字段
+    const { status, ...rechargeVoWithoutStatus } = rechargeVo.value;
+    const result2 = await API.post(
+      "http://54.251.137.151:10702/recharge/recharge/RechargeA",
+      {
+        ...rechargeVoWithoutStatus,
+      }
+    );
+    // 做一个判断，如果result2.data[i].flag="待审核"，那么 totalData.value = result2.data[i]，否则就赋值为0
+    for (let i = 0; i < result2.data.length; i++) {
+      if (result2.data[i].flag == "已通过") {
+        totalData.value = result2.data[i];
+        totalmoney.value = totalData.value.sumRaudit1;
+        totalRcoin.value = totalData.value.sumRaudit1;
+        totalFcoin.value = totalData.value.sumRaudit2;
+        break;
+      }
+    }

    // 将响应结果存储到响应式数据中
    console.log("请求成功", result);
@ -133,7 +149,7 @@ const search = function () {
 // 重置
 const reset = function () {
  rechargeVo.value.activityId = "";
-  rechargeVo.value.payWay = "";
+  rechargeVo.value.rechargeWay = "";
  rechargeVo.value.area = "";
  rechargeVo.value.startDate = "";
  rechargeVo.value.endDate = "";
@ -259,6 +275,7 @@ const getArea = async function () {
      "http://54.251.137.151:10702/recharge/user/search",
      {}
    );
+
    // 将响应结果存储到响应式数据中
    console.log("请求成功", result);
    // 存储地区信息
@ -305,6 +322,7 @@ onMounted(async function () {
  await get();
  await getActivity();
  await getArea();
+  await getPayWay();
 });
 </script>

@ -334,19 +352,19 @@ onMounted(async function () {
          </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="请选择支付方式"
+                v-model="rechargeVo.rechargeWay"
+                placeholder="请选择充值方式"
                size="large"
                style="width: 240px"
                clearable
              >
                <el-option
-                  v-for="item in payWay"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  v-for="item in rechargeWay"
+                  :key="item"
+                  :label="item"
+                  :value="item"
                />
              </el-select>
            </div>
@ -412,10 +430,15 @@ onMounted(async function () {
          <el-tab-pane label="待审核" name="wait"></el-tab-pane>
          <el-tab-pane label="已通过" name="pass"></el-tab-pane>
          <el-tab-pane label="已驳回" name="reject"></el-tab-pane>
+          <div>
+            充值金额：{{ totalmoney / 100 }}新币，永久金币：{{
+              totalRcoin / 100
+            }}金币，免费金币：{{ totalFcoin / 100 }}金币
+          </div>
        </el-tabs>
        <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 630px; overflow-y: auto">
-          <el-table :data="tableData" style="width: 100%" height="630px">
+        <div style="height: 609px; overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="609px">
            <el-table-column
              type="index"
              label="序号"
--- a/gold-system/src/views/usergold/index.vue
+++ b/gold-system/src/views/usergold/index.vue
@ -49,22 +49,14 @@ const getObj = ref({
 const getPutEX = ref(false);

 // 支付方式选项
-const updateType = [
-  {
-    value: "0",
-    label: "充值",
-  },
+const num = [
  {
    value: "1",
-    label: "消费",
+    label: "增加",
  },
  {
    value: "2",
-    label: "退款",
-  },
-  {
-    value: "3",
-    label: "其他",
+    label: "减少",
  },
 ];

@ -118,10 +110,10 @@ const get = async function (val) {
    total.value = result.data.total;
    console.log("total", total.value);
    // 计算各金币总数并除以100
-    // 下列各数除以100
-    rechargeCoin.value = tableAllData.value.sumR / 100;
-    freeCoin.value = tableAllData.value.sumF / 100;
-    taskCoin.value = tableAllData.value.sumT / 100;
+    // 下列各数除以100，并最多显示两位小数
+    rechargeCoin.value = parseFloat((tableAllData.value.sumR / 100).toFixed(2));
+    freeCoin.value = parseFloat((tableAllData.value.sumF / 100).toFixed(2));
+    taskCoin.value = parseFloat((tableAllData.value.sumT / 100).toFixed(2));
    // for (let i = 0; i < tableAllData.value.length; i++) {
    //   rechargeCoin.value += tableAllData.value[i].rechargeCoin;
    //   freeCoin.value += tableAllData.value[i].freeCoin;
@ -146,7 +138,7 @@ const search = function () {
 // 重置
 const reset = function () {
  detailY.value.jwcode = "";
-  detailY.value.updateType = "";
+  detailY.value.num = "";
  detailY.value.startDate = "";
  detailY.value.endDate = "";
  getTime.value = {};
@ -535,7 +527,7 @@ const get30 = function () {
    <el-col>
      <el-card style="margin-bottom: 20px">
        <el-row style="margin-bottom: 10px">
-          <el-col :span="8">
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">精网号：</el-text>
              <el-input
@ -546,7 +538,7 @@ const get30 = function () {
              />
            </div>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">平台信息：</el-text>
              <el-select
@ -564,17 +556,35 @@ const get30 = function () {
              </el-select>
            </div>
          </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
            <div class="head-card-element">
              <el-text class="mx-1" size="large">更新类型：</el-text>
              <el-select
-                v-model="detailY.updateType"
+                v-model="detailY.num"
                placeholder="请选择更新类型"
                style="width: 200px"
                clearable
              >
                <el-option
-                  v-for="item in updateType"
+                  v-for="item in num"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </div>
+          </el-col>
+          <el-col :span="6">
+            <div class="head-card-element">
+              <el-text class="mx-1" size="large">所属地区：</el-text>
+              <el-select
+                v-model="detailY.area"
+                placeholder="请选择所属地区"
+                style="width: 200px"
+                clearable
+              >
+                <el-option
+                  v-for="item in area"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
@ -583,6 +593,7 @@ const get30 = function () {
            </div>
          </el-col>
        </el-row>
+
        <div class="head-card-element">
          <el-text class="mx-1" size="large">更新时间：</el-text>
          <el-date-picker
@ -606,13 +617,13 @@ const get30 = function () {
    <el-col>
      <el-card>
        <div>
-          现有金币：免费金币：{{ Math.abs(freeCoin) }}，永久金币：{{
-            Math.abs(rechargeCoin)
+          现有金币：永久金币：{{ Math.abs(rechargeCoin) }}，免费金币：{{
+            Math.abs(freeCoin)
          }}，任务金币：{{ Math.abs(taskCoin) }}
        </div>
        <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 670px; overflow-y: auto">
-          <el-table :data="tableData" style="width: 100%" height="670px">
+        <div style="height: 673px; overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="673px">
            <el-table-column
              type="index"
              label="序号"
@ -671,16 +682,17 @@ const get30 = function () {
                </span>
              </template>
            </el-table-column>
-            <el-table-column prop="freeCoin" label="免费金币" width="130">
+            <el-table-column prop="rechargeCoin" label="永久金币" width="150">
              <template #default="scope">
-                <span>{{ scope.row.freeCoin / 100 }}</span>
+                <span>{{ scope.row.rechargeCoin / 100 }}</span>
              </template>
            </el-table-column>
-            <el-table-column prop="rechargeCoin" label="永久金币" width="150">
+            <el-table-column prop="freeCoin" label="免费金币" width="130">
              <template #default="scope">
-                <span>{{ scope.row.rechargeCoin / 100 }}</span>
+                <span>{{ scope.row.freeCoin / 100 }}</span>
              </template>
            </el-table-column>
+
            <el-table-column prop="taskCoin" label="任务金币" width="130">
              <template #default="scope">
                <span>{{ scope.row.taskCoin / 100 }}</span>
--- a/gold-system/src/views/usergoldInfo/index.vue
+++ b/gold-system/src/views/usergoldInfo/index.vue
@ -27,7 +27,7 @@ const getAdminData = async function () {
 const tableData = ref([]);
 // 计算用户各金币总数的不分页对象
 const tableAllData = ref([]);
-// 各金币总数
+// 各金币总数 合计数
 const rechargeCoin = ref(0);
 const freeCoin = ref(0);
 const taskCoin = ref(0);
@ -99,17 +99,24 @@ const get = async function (val) {
        detailYgold: { ...detailY.value },
      }
    );
-    // const result2 = await API.post("http://54.251.137.151:10702/detailY/select", {
-    //   ...getAllObj.value,
-    //   detailY: { ...detailY.value },
-    // });
+    // 获取合计数
+    const result2 = await API.post("http://54.251.137.151:10702/detailY", {
+      ...getAllObj.value,
+      detailY: { ...detailY.value },
+    });
    // 将响应结果存储到响应式数据中
    console.log("请求成功", result);
    // console.log("请求成功2", result2);
    // 存储表格数据
    tableData.value = result.data.list;
    console.log("tableData", tableData.value);
-    // tableAllData.value = result2.data;
+    tableAllData.value = result2.data;
+    // 下列各数除以100
+
+    // 修改为保留两位小数
+    rechargeCoin.value = parseFloat((tableAllData.value.sumR / 100).toFixed(2));
+    freeCoin.value = parseFloat((tableAllData.value.sumF / 100).toFixed(2));
+    taskCoin.value = parseFloat((tableAllData.value.sumT / 100).toFixed(2));
    // console.log("tableAllData", tableAllData.value);
    // 存储分页总数
    total.value = result.data.total;
@ -239,9 +246,14 @@ onMounted(async function () {
  <el-row>
    <el-col>
      <el-card>
+        <div>
+          现有金币：永久金币：{{ Math.abs(rechargeCoin) }}，免费金币：{{
+            Math.abs(freeCoin)
+          }}，任务金币：{{ Math.abs(taskCoin) }}
+        </div>
        <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 750px; overflow-y: auto">
-          <el-table :data="tableData" style="width: 100%" height="750px">
+        <div style="height: 715px; overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="715px">
            <el-table-column
              type="index"
              label="序号"
--- a/gold-system/src/views/workspace/index.vue
+++ b/gold-system/src/views/workspace/index.vue
@ -879,21 +879,18 @@ const changePlatform = function () {
 };

 // 计算属性
-// 格式化数字
-// const formatNum = function (val) {
-//   // console.log(val);
-//   if (val === undefined) {
-//     return ""; // 或者返回其他合适的默认值，避免调用toString报错
-//   } else {
-//     return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-//   }
-// };
+// 格式化数字   这是一个方法
 const formatNum = function (val) {
  if (val === undefined) {
    return "";
+  }
+  const num = parseFloat(val);
+  // 判断是否为整数
+  if (Number.isInteger(num)) {
+    return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
  } else {
    // 四舍五入保留两位小数
-    const roundedVal = parseFloat(val).toFixed(2);
+    const roundedVal = num.toFixed(2);
    return roundedVal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
  }
 };
--- a/gold-system/vite.config.ts
+++ b/gold-system/vite.config.ts
@ -29,9 +29,9 @@ export default defineConfig({
  server: {
    proxy: {
      '/hwjb': {
-        // target: 'http://39.99.159.73:20090',
-        // target: 'http://192.168.8.93:10010',
-        target: 'http://54.251.137.151:10702',
+        // target: 'http://54.251.137.151:10704',
+        target: 'http://192.168.8.93:10702',
+        // target: 'http://54.251.137.151:10702',
        changeOrigin: true,
        rewrite: (path) => path.replace(/^\/hwjb/, ''),
      },