Merge branch 'master' of http://39.101.133.168:8807/donghaolin/gold-system

vue/gold-system/src/views/audit/refundAudit.vue

@@ -17,8 +17,8 @@ const admin = ref({
 // 充值明细表格
 const tableData = ref([]);
 // 搜索======================================
-// 搜索consumeDetail
-const consumeDetail = ref({});
+// 搜索detail
+const detail = ref({});
 // 搜索对象
 const getObj = ref({
   pageNum: 1,
@@ -78,18 +78,18 @@ const get = async function (val) {
     // 搜索参数时间赋值
     if (getTime.value != null) {
       if (getTime.value.startDate != "" && getTime.value.endDate != "") {
-        consumeDetail.value.startDate = getTime.value[0];
-        consumeDetail.value.endDate = getTime.value[1];
+        detail.value.startDate = getTime.value[0];
+        detail.value.endDate = getTime.value[1];
       }
     } else {
-      consumeDetail.value.startDate = "";
-      consumeDetail.value.endDate = "";
+      detail.value.startDate = "";
+      detail.value.endDate = "";
     }
     console.log("搜索参数", getObj.value);
     // 发送POST请求
     const result = await API.post(
       "http://192.168.8.93:10010/audit/audit/refund",
-      { ...getObj.value, consumeDetail: { ...consumeDetail.value } }
+      { ...getObj.value, detail: { ...detail.value } }
     );
 
     // 将响应结果存储到响应式数据中
@@ -112,11 +112,11 @@ const search = function () {
 };
 // 重置
 const reset = function () {
-  consumeDetail.value.area = "";
-  consumeDetail.value.refundType = "";
-  consumeDetail.value.refundGoods = "";
-  consumeDetail.value.startDate = "";
-  consumeDetail.value.endDate = "";
+  detail.value.area = "";
+  detail.value.refundType = "";
+  detail.value.refundGoods = "";
+  detail.value.startDate = "";
+  detail.value.endDate = "";
   getTime.value = {};
 };
 // 今天
@@ -174,27 +174,27 @@ const get7Days = function () {
 //全部充值明细
 const adminAll = function () {
   console.log("adminAll");
-  consumeDetail.value.status = "";
+  detail.value.status = "";
   getObj.value.pageNum = 1;
   get();
 };
 //待审核充值明细
 const adminWait = function () {
-  consumeDetail.value.status = 0;
+  detail.value.status = 0;
   getObj.value.pageNum = 1;
   get();
   console.log("adminWait");
 };
 //已通过充值明细
 const adminPass = function () {
-  consumeDetail.value.status = 1;
+  detail.value.status = 1;
   getObj.value.pageNum = 1;
   get();
   console.log("adminPass");
 };
 //已驳回充值明细
 const adminReject = function () {
-  consumeDetail.value.status = 2;
+  detail.value.status = 2;
   getObj.value.pageNum = 1;
   get();
   console.log("adminReject");
@@ -392,7 +392,7 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">退款类型：</el-text>
               <el-select
-                v-model="consumeDetail.refundType"
+                v-model="detail.refundType"
                 placeholder="请选择退款类型"
                 size="large"
                 style="width: 240px"
@@ -411,7 +411,7 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">退款商品：</el-text>
               <el-select
-                v-model="consumeDetail.refundGoods"
+                v-model="detail.refundGoods"
                 placeholder="请选择退款商品"
                 size="large"
                 style="width: 240px"
@@ -430,7 +430,7 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1" size="large">所属地区：</el-text>
               <el-select
-                v-model="consumeDetail.area"
+                v-model="detail.area"
                 placeholder="请选择所属地区"
                 size="large"
                 style="width: 240px"
@@ -490,7 +490,7 @@ onMounted(async function () {
         </el-tabs>
         <div>
           <el-table :data="tableData" :height="tableHeight" style="width: 100%">
-            <el-table-column prop="user" label="姓名" width="100px" />
+            <el-table-column prop="userName" label="姓名" width="100px" />
             <el-table-column prop="jwcode" label="精网号" width="150px" />
             <el-table-column prop="area" label="所属地区" width="100px" />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
@@ -521,9 +521,8 @@ onMounted(async function () {
               width="200px"
               show-overflow-tooltip
             />
-            <el-table-column prop="name" label="提交人" width="100px" />
-            <el-table-column prop="auditStatus" label="审核状态" width="100px">
-              <!-- 模板内容 -->
+            <el-table-column prop="adminName" label="提交人" width="100px" />
+            <el-table-column prop="status" label="审核状态" width="100px">
               <template #default="scope">
                 <span v-if="scope.row.auditStatus == 1">
                   <div class="status">

vue/gold-system/src/views/workspace/index.vue

@@ -580,12 +580,12 @@ const getAreaRank = async function () {
     }));
   } else if (getAreaRankObj.value.type == "任务金币") {
     areaRank.value = getMediumArea.value.map((item) => ({
-      value:Math.abs(item.taskSumCoin).toFixed(2),
+      value: Math.abs(item.taskSumCoin).toFixed(2),
       name: item.area,
     }));
   } else {
     areaRank.value = getMediumArea.value.map((item) => ({
-      value:Math.abs(item.totalRechargeSum).toFixed(2),
+      value: Math.abs(item.totalRechargeSum).toFixed(2),
       name: item.area,
     }));
   }
@@ -693,7 +693,7 @@ const thisMonth = function () {
 const thisYear = function () {
   const current = new Date();
   const startDate = new Date(current.getFullYear(), 0, 1);
-  const endDate = new Date(current.getFullYear(), current.getMonth()+1, 0);
+  const endDate = new Date(current.getFullYear(), current.getMonth() + 1, 0);
   searchTime.value = [startDate, endDate];
   search();
   // console.log("searchTime", moment(searchTime.value[0]).format("YYYY-MM-DD") + "至" + moment(searchTime.value[1]).format("YYYY-MM-DD"))