活动页数100删除，工作台

gold-system/.env.development

@@ -1,5 +1,5 @@
-#VITE_API_BASE='http://54.251.137.151:10704/'
+# VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.94:8080/'
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
 # VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.232:8080/'
+# VITE_API_BASE='http://192.168.8.220:8080/'

gold-system/.env.production

@@ -1,2 +1,3 @@
 # VITE_API_BASE='http://54.251.137.151:10702/'
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
+VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
+# VITE_API_BASE='http://192.168.8.220:8080/'

gold-system/.env.test

@@ -1,5 +1,5 @@
-#VITE_API_BASE='http://54.251.137.151:10704/'
+# VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.94:8080/'
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
+VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
 # VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.232:8080/'
+# VITE_API_BASE='http://192.168.8.220:8080/'

gold-system/src/views/login.vue

@@ -49,7 +49,7 @@ const login = async function () {
         result.data.permission == '2' ||
         result.data.permission == '3'
       ) {
-        router.push('/usergold')
+        router.push('/workspace')
       } else if (result.data.permission == '4') {
         router.push('/noPermission')
       }

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

@@ -61,22 +61,26 @@ const get = async function (val) {
       activity.value.endDate = null
     }
 
-    console.log('搜索参数', getObj.value)
+    const requestData = {
+      pageNum: getObj.value.pageNum,
+      pageSize: getObj.value.pageSize,
+      activity: { 
+        ...activity.value,
+        activityName: activity.value.activityName,
+        status: activity.value.status
+      }
+    };
+    console.log('搜索参数', requestData)
     // 发送POST请求
     const result = await request({
       url: '/recharge/activity/select',
       method: 'post',
-      data: {
-        pageNum: getObj.value.pageNum,
-        pageSize: getObj.value.pageSize,
-        activity: { 
-          ...activity.value,
-          activityName: activity.value.activityName,
-          status: activity.value.status
-        }
-      }
+      data: requestData
     })
 
+    // 打印响应数据
+    console.log('响应数据', result);
+
     // 将响应结果存储到响应式数据中
     console.log('请求成功', result)
     // 存储表格数据
@@ -87,7 +91,7 @@ const get = async function (val) {
     console.log('total', total.value)
   } catch (error) {
     console.log('请求失败', error)
-ElMessage.error('请求失败')
+    ElMessage.error('请求失败')
   }
 }
 // 搜索
@@ -160,6 +164,31 @@ const throttledAdd = async () => {
     ElMessage.error('新增活动失败')
   }
 }
+
+// 删除确认方法
+const delConfirm = async (row) => {
+  try {
+    delObj.value = row
+    // 发送删除请求
+    const result = await request({
+      url: '/recharge/activity/delete', // 假设这是删除活动的接口
+      method: 'post',
+      data: delObj.value
+    })
+    console.log('删除活动成功', result)
+    ElMessage.success('删除活动成功')
+    // 重新获取数据
+    get()
+  } catch (error) {
+    console.log('删除活动失败', error)
+    ElMessage.error('删除活动失败')
+  }
+}
+
+// 删除方法
+const del = (row) => {
+  delObj.value = row
+}
 </script>
 
 <template>
@@ -206,7 +235,7 @@ const throttledAdd = async () => {
           >
         </div>
         <div>
-          <el-table :data="tableData" :height="tableHeight" style="width: 100%">
+          <el-table :data="tableData" style="width: 100%">
             <el-table-column
               type="index"
               label="序号"
@@ -267,7 +296,7 @@ const throttledAdd = async () => {
               <template #default="scope">
                 <el-popconfirm
                   title="确定将此条活动删除吗？"
-                  @confirm="delConfirm"
+                  @confirm="delConfirm(delObj.value)"
                 >
                   <template #reference>
                     <el-button type="primary" text @click="del(scope.row)">
@@ -291,7 +320,7 @@ const throttledAdd = async () => {
           <el-pagination
             background
             :page-size="getObj.pageSize"
-            :page-sizes="[5, 10, 20, 50, 100]"
+            :page-sizes="[5, 10, 20, 50]"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
             @size-change="handlePageSizeChange"