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

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

@@ -121,7 +121,9 @@ const add = () => {
 };
 
 // 编辑方法
-const rateEdit = ref({});
+const rateEdit = ref({
+  flag: 1,
+});
 //查询已有的数据
 const getEditData = async function (row) {
   try {

vue/gold-system/src/views/recharge/adminRecharge.vue

@@ -434,7 +434,12 @@ onMounted(async function () {
               label="活动名称"
               width="150px"
             />
-            <el-table-column prop="paidGold" label="充值金额" width="120px" />
+            <el-table-column
+              prop="paidGold"
+              label="充值金额"
+              width="120px"
+              sortable
+            />
             <el-table-column prop="paidGold" label="充值金币" width="100px" />
             <el-table-column prop="freeGold" label="免费金币" width="100px" />
             <el-table-column

vue/gold-system/src/views/recharge/allRecharge.vue

@@ -402,7 +402,12 @@ onMounted(async function () {
               label="活动名称"
               width="150px"
             />
-            <el-table-column prop="paidGold" label="充值金额" width="120px" />
+            <el-table-column
+              prop="paidGold"
+              label="充值金额"
+              width="120px"
+              sortable
+            />
             <el-table-column
               prop="rechargeWay"
               label="充值方式"

vue/gold-system/src/views/refund/allRefund.vue

@@ -21,8 +21,6 @@ const getObj = ref({
 const total = ref(100);
 // 搜索对象时间
 const getTime = ref([]);
-// 搜索活动列表
-const activity = ref([]);
 // 所有信息
 const allData = ref([]);
 // 搜索地区列表
@@ -193,25 +191,6 @@ const handleClick = function (tab, event) {
     adminReject();
   }
 };
-// 获取活动名称
-const getActivity = async function () {
-  try {
-    // 发送POST请求
-    const result = await API.post(
-      "http://192.168.8.93:10010/recharge/activity/select",
-      {}
-    );
-
-    // 将响应结果存储到响应式数据中
-    console.log("请求成功", result);
-    // 存储表格数据
-    activity.value = result.data;
-    console.log("activity", activity.value);
-  } catch (error) {
-    console.log("请求失败", error);
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-};
 // 获取地区
 const getArea = async function () {
   try {
@@ -236,7 +215,6 @@ const getArea = async function () {
 // 挂载
 onMounted(async function () {
   await get();
-  getActivity();
   await getArea();
 });
 //删除气泡
@@ -331,7 +309,6 @@ const checkNumber = function () {
               >
                 <el-option
                   v-for="item in consumeType"
-                  :key="item.activityId"
                   :label="item.label"
                   :value="item.value"
                 />
@@ -522,7 +499,8 @@ const checkNumber = function () {
         </div>
 
         <!-- 分页 -->
-        <div class="pagination">
+        <!-- 分页 -->
+        <div class="pagination" style="margin-top: 20px">
           <el-pagination
             background
             :page-size="getObj.pageSize"
@@ -547,11 +525,11 @@ const checkNumber = function () {
           </el-pagination>
           <el-pagination
             background
-            layout="prev, pager, next, slot"
+            layout="prev, pager, next,slot"
             :page-size="getObj.pageSize"
             :total="total"
             :current-page="getObj.pageNum"
-            @current-change="get()"
+            @current-change="get"
           >
             <div>跳至</div>
             <el-input