退款审核参数添加

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

@@ -471,7 +471,7 @@ onMounted(async function () {
               </template>
             </el-table-column>
             <el-table-column prop="name" label="提交人" width="100px" />
-            <el-table-column prop="status" label="状态" width="100px">
+            <el-table-column prop="status" label="审核状态" width="100px">
               <template #default="scope">
                 <span v-if="scope.row.status === 1">
                   <div class="status">

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

@@ -278,6 +278,7 @@ const pass = function (row) {
   passObj.value.adminId = admin.value.adminId;
   passObj.value.auditId = row.auditId;
   passObj.value.status = 1;
+  passObj.value.refundId=row.refundId;
   console.log("通过对象", passObj.value);
 };
 

vue/gold-system/src/views/managerecharge/activity.vue

@@ -119,7 +119,7 @@ const closeAddActivityVisible = function () {
 };
 //添加活动按钮
 const addActicity = function () {
-  console.log("Date",new Date());
+  console.log("Date", new Date());
   //添加对象初始化操作
   addObj.value = {};
   addObj.value.adminId = admin.value.adminId;
@@ -257,6 +257,7 @@ const checkNumber = function () {
       getObj.value.pageNum > 0 &&
       getObj.value.pageNum <= Math.ceil(total.value / getObj.value.pageSize)
     ) {
+      
       console.log("输入的数字合法");
       get();
     } else {
@@ -288,22 +289,12 @@ 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="activity.activityName"
-              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-date-picker
-              v-model="getTime"
-              type="datetimerange"
-              range-separator="至"
-              start-placeholder="起始时间"
-              end-placeholder="结束时间"
-            />
+            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
+              end-placeholder="结束时间" />
           </div>
           <div class="head-card-btn">
             <el-button @click="reset()">重置</el-button>
@@ -317,26 +308,21 @@ onMounted(async function () {
     <el-col>
       <el-card>
         <div>
-          <el-button
-            plain
-            @click="addActicity()"
-            style="color: #048efb; border: 1px solid #048efb"
-            >新增活动</el-button
-          >
+          <el-button plain @click="addActicity()" style="color: #048efb; border: 1px solid #048efb">新增活动</el-button>
         </div>
         <div>
           <el-table :data="tableData" :height="tableHeight" style="width: 100%">
             <el-table-column prop="activityName" label="活动名称" />
-            <el-table-column prop="startTime" label="开始时间" >
+            <el-table-column prop="startTime" label="开始时间">
               <template #default="scope">
                 {{ moment(scope.row.startTime).format("YYYY-MM-DD HH:mm:ss") }}
               </template>
-              </el-table-column>
-            <el-table-column prop="endTime" label="结束时间" >
+            </el-table-column>
+            <el-table-column prop="endTime" label="结束时间">
               <template #default="scope">
                 {{ moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") }}
               </template>
-              </el-table-column>
+            </el-table-column>
             <el-table-column prop="rechargeRatio" label="免费兑换比">
               <template #default="scope">
                 <span>{{ scope.row.rechargeRatio }}:1</span>
@@ -372,10 +358,7 @@ onMounted(async function () {
             </el-table-column>
             <el-table-column prop="operation" label="操作">
               <template #default="scope">
-                <el-popconfirm
-                  title="确定将此条活动删除吗？"
-                  @confirm="delConfirm"
-                >
+                <el-popconfirm title="确定将此条活动删除吗？" @confirm="delConfirm">
                   <template #reference>
                     <el-button type="primary" text @click="del(scope.row)">
                       删除
@@ -395,42 +378,17 @@ onMounted(async function () {
 
         <!-- 分页 -->
         <div class="pagination" style="margin-top: 20px">
-          <el-pagination
-            background
-            :page-size="getObj.pageSize"
-            layout="slot"
-            :total="total"
-          >
+          <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 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"
-          >
+          <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"
-            />
+            <el-input v-model="getObj.pageNum" style="width: 40px" @change="checkNumber" />
             <div>页</div>
           </el-pagination>
         </div>
@@ -438,62 +396,33 @@ onMounted(async function () {
     </el-col>
   </el-row>
 
-  <el-dialog
-    v-model="addActivityVisible"
-    title="新增活动"
-    width="500"
-    :before-close="closeAddActivityVisible"
-  >
+  <el-dialog v-model="addActivityVisible" title="新增活动" width="500" :before-close="closeAddActivityVisible">
     <template #footer>
-      <el-form
-        ref="Ref"
-        :model="addObj"
-        :rules="rules"
-        label-width="auto"
-        style="max-width: 600px"
-      >
+      <el-form ref="Ref" :model="addObj" :rules="rules" label-width="auto" style="max-width: 600px">
         <el-form-item prop="activityName" label="活动名称:">
-          <el-input
-            v-model="addObj.activityName"
-            placeholder="请输入活动名称"
-            style="width: 220px"
-          />
+          <el-input v-model="addObj.activityName" placeholder="请输入活动名称" style="width: 220px" />
         </el-form-item>
 
         <el-form-item prop="freeGold" label="免费金币:">
           <el-radio-group v-model="addObj.freeGold">
-            <el-radio value="0" @change="addObj.rechargeRatio = '0'"
-              >无赠送</el-radio
-            >
+            <el-radio value="0" @change="addObj.rechargeRatio = '0'">无赠送</el-radio>
             <el-radio value="1">有赠送</el-radio>
           </el-radio-group>
         </el-form-item>
 
         <el-form-item prop="rechargeRatio" label="免费金币兑换比:">
-          <el-input
-            v-model="addObj.rechargeRatio"
-            :disabled="addObj.freeGold === '0' ? true : false"
-            placeholder="请输入"
-            style="width: 80px"
-          />：1
+          <el-input v-model="addObj.rechargeRatio" :disabled="addObj.freeGold === '0' ? true : false" placeholder="请输入"
+            style="width: 80px" />：1
           <div style="color: grey">(提示：当前规则每10新币可兑换1免费金币)</div>
         </el-form-item>
 
         <el-form-item prop="startTime" label="开始时间:">
-          <el-date-picker
-            v-model="addObj.startTime"
-            type="datetime"
-            placeholder="请选择开始时间"
-            @change="handleStartTimeChange"
-          />
+          <el-date-picker v-model="addObj.startTime" type="datetime" placeholder="请选择开始时间"
+            @change="handleStartTimeChange" />
         </el-form-item>
 
         <el-form-item prop="endTime" label="结束时间:">
-          <el-date-picker
-            v-model="addObj.endTime"
-            type="datetime"
-            placeholder="请选择结束时间"
-          />
+          <el-date-picker v-model="addObj.endTime" type="datetime" placeholder="请选择结束时间" />
         </el-form-item>
 
         <el-form-item label="添加人:">

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

@@ -1,6 +1,7 @@
 <script setup>
 import { ref, onMounted, reactive, computed } from "vue";
 import ElementPlus from "element-plus";
+import { ElMessage, ElMessageBox } from "element-plus";
 import axios from "axios";
 import moment from "moment";
 import { ta } from "element-plus/es/locales.mjs";