From 9e639f7e6738c35fcc2a0a6bee9fcdc82cb8e9ea Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Fri, 22 Sep 2023 09:38:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=84=BF=E8=80=85=E7=AB=AF=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=8E=A8=E8=8D=90=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                              |  14 ++
 .../jifenduihuan/huodongtuijian/index.js      |  34 ++++
 .../jifenduihuan/jifenhuoqu/index.js          |  13 ++
 src/main.js                                   |   3 +
 src/views/components/dialog/index.vue         |  45 ++++-
 src/views/components/myInput/index.vue        |   4 +-
 src/views/components/myPagination/index.vue   |   3 +-
 .../volunteer/activityRecommend/index.vue     |   4 +-
 src/views/volunteer/components/invite.vue     |   7 +-
 src/views/volunteer/components/recommend.vue  | 174 +++++++++++-------
 .../volunteer/conversionRecord/index.vue      |  23 +--
 .../volunteer/integralConversion/index.vue    |  69 ++++---
 src/views/volunteer/integralGain/index.vue    |  13 +-
 13 files changed, 281 insertions(+), 125 deletions(-)
 create mode 100644 src/api/index.js
 create mode 100644 src/api/volunteer/jifenduihuan/huodongtuijian/index.js
 create mode 100644 src/api/volunteer/jifenduihuan/jifenhuoqu/index.js

diff --git a/src/api/index.js b/src/api/index.js
new file mode 100644
index 0000000..356f010
--- /dev/null
+++ b/src/api/index.js
@@ -0,0 +1,14 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2023-09-21 10:39:35
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-09-21 10:41:22
+ */
+import huodongtuijian from "./volunteer/jifenduihuan/huodongtuijian";
+
+
+export default {
+  huodongtuijian
+}
\ No newline at end of file
diff --git a/src/api/volunteer/jifenduihuan/huodongtuijian/index.js b/src/api/volunteer/jifenduihuan/huodongtuijian/index.js
new file mode 100644
index 0000000..571c257
--- /dev/null
+++ b/src/api/volunteer/jifenduihuan/huodongtuijian/index.js
@@ -0,0 +1,34 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2023-09-21 10:36:32
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-09-21 10:57:12
+ */
+import request from "@/utils/request";
+
+export default {
+  list(params){
+    return request({
+      url:'/zhiyuanzhe/activity/list',
+      method:"get",
+      params,
+    })
+  },
+  // 查看详情
+  activity(id){
+    return request({
+      url:'/zhiyuanzhe/activity' + id,
+      method:"get",
+    })
+  },
+  // 参与活动
+  zyzreport(data) {
+    return request({
+      url:'/zhiyuanzhe/zyzreport',
+      method:"post",
+      data
+    })
+  }
+}
\ No newline at end of file
diff --git a/src/api/volunteer/jifenduihuan/jifenhuoqu/index.js b/src/api/volunteer/jifenduihuan/jifenhuoqu/index.js
new file mode 100644
index 0000000..90ac56a
--- /dev/null
+++ b/src/api/volunteer/jifenduihuan/jifenhuoqu/index.js
@@ -0,0 +1,13 @@
+/*
+ * @Descripttion: 
+ * @version: 
+ * @Author: JC9527
+ * @Date: 2023-09-21 09:46:16
+ * @LastEditors: JC9527
+ * @LastEditTime: 2023-09-21 11:02:10
+ */
+import request from "@/utils/request";
+
+export default {
+  
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 71d44cf..3c50273 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,6 +7,8 @@ import './assets/styles/element-variables.scss'
 
 import "@/utils/rem.js"; //计算rem基准
 
+import API from "@/api/index.js";
+
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'
@@ -50,6 +52,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
+Vue.prototype.$api = API
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag)
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index f0fd575..2f31987 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-20 14:14:24
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-20 14:40:07
+ * @LastEditTime: 2023-09-21 10:13:28
 -->
 <template>
   <el-dialog
@@ -14,16 +14,12 @@
     :close-on-click-modal="false"
     append-to-body
     custom-class="dialog-boxed"
-    width="30%"
+    :width="width"
   >
+    <div slot="title">
+      <div class="titleText">{{ title }}</div>
+    </div>
     <div class="dialog-slot">
-      <div class="closeClick">
-        <div class="newplan">
-          <div class="line"></div>
-          <div class="span">新增计划</div>
-        </div>
-        <img src="@/assets/images/close.png" alt="" @click="Close" />
-      </div>
       <slot></slot>
     </div>
   </el-dialog>
@@ -35,6 +31,16 @@ export default {
       dialogVisible: false,
     }
   },
+  props:{
+    width:{
+      type:String,
+      default:'35%'
+    },
+    title:{
+      type:String,
+      default:'查看详情'
+    }
+  },
   methods:{
     open() {
       this.dialogVisible = true;
@@ -46,7 +52,28 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.titleText {
+  font-family: "Alibaba-PuHuiTi-Regular";
+  font-weight: bold;
+  color: #4c4949;
+  padding-left: 15px;
+  font-size: 16px;
+  position: relative;
+  &::before {
+    position: absolute;
+    top: 3.8px;
+    left: 0;
+    content: "";
+    width: 5px;
+    height: 15px;
+    background: #f8414d;
+  }
+}
+::v-deep .el-dialog__body {
+  padding: 0;
+}
 .dialog-slot {
+  padding: 20px 30px;
   .closeClick {
     position: absolute;
     top: 0;
diff --git a/src/views/components/myInput/index.vue b/src/views/components/myInput/index.vue
index ef4da79..9f0ebb2 100644
--- a/src/views/components/myInput/index.vue
+++ b/src/views/components/myInput/index.vue
@@ -31,7 +31,7 @@ export default {
   display: flex;
   ::v-deep .el-input {
     width: 515px;
-    height: 50px;
+    height: 40px;
     .el-input__inner {
       width: 100%;
       height: 100%;
@@ -45,7 +45,7 @@ export default {
     align-items: center;
     justify-content: center;
     width: 52px;
-    height: 50px;
+    height: 40px;
     border-radius: 0 4px 4px 0;
     background-color: #F8414D;
     cursor: pointer;
diff --git a/src/views/components/myPagination/index.vue b/src/views/components/myPagination/index.vue
index 55bdbd4..bf6e89f 100644
--- a/src/views/components/myPagination/index.vue
+++ b/src/views/components/myPagination/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-04 13:11:33
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-18 16:07:36
+ * @LastEditTime: 2023-09-21 10:52:27
 -->
 <template>
   <div class="pagination">
@@ -17,6 +17,7 @@
           : pageSize * (pageNum - 1) + 1
       }}-{{ numberMap() }}条</span
     > -->
+    <span class="custom">共{{ total }}条</span>
     <el-pagination
       background
       :small="true"
diff --git a/src/views/volunteer/activityRecommend/index.vue b/src/views/volunteer/activityRecommend/index.vue
index e7c28d8..bd4087c 100644
--- a/src/views/volunteer/activityRecommend/index.vue
+++ b/src/views/volunteer/activityRecommend/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-18 10:08:30
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-20 13:35:08
+ * @LastEditTime: 2023-09-21 09:28:08
 -->
 <template>
   <div class="plan-management">
@@ -59,7 +59,7 @@ export default {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 40px 0 0 0;
+    padding: 20px 0 0 0;
     ::v-deep .el-tabs--top {
       height: 40px;
     }
diff --git a/src/views/volunteer/components/invite.vue b/src/views/volunteer/components/invite.vue
index 2942f5f..8727815 100644
--- a/src/views/volunteer/components/invite.vue
+++ b/src/views/volunteer/components/invite.vue
@@ -178,6 +178,7 @@ export default {
     .activity {
       div {
         text-align: left;
+        line-height: 20px;
         &:nth-child(1) {
           font-size: 14px;
           font-family: 'Alibaba PuHuiTi';
@@ -197,7 +198,7 @@ export default {
       }
     }
     td {
-      height: 57px;
+      height: 42px;
       box-sizing: border-box;
       // text-align: center;
       font-size: 14px;
@@ -207,7 +208,7 @@ export default {
       padding: 2px 0;
     }
     th {
-      height: 57px;
+      height: 45px;
       background-color: #F7F5F5;
       font-size: 15px;
       font-family: 'Alibaba PuHuiTi';
@@ -244,6 +245,6 @@ export default {
   }
 }
 .pagination {
-  margin-top: 10px;
+  // margin-top: 10px;
 }
 </style>
diff --git a/src/views/volunteer/components/recommend.vue b/src/views/volunteer/components/recommend.vue
index 36671c6..0a033cd 100644
--- a/src/views/volunteer/components/recommend.vue
+++ b/src/views/volunteer/components/recommend.vue
@@ -29,22 +29,30 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="person"
-          label="参与人员"
+          prop="publisher"
+          label="发布方"
           show-overflow-tooltip
           width="180"
         >
         </el-table-column>
         <el-table-column
           prop="duration"
-          label="状态"
+          label="服务时长"
         >
         </el-table-column>
         <el-table-column
-          prop="time"
-          label="兑换时间"
+          prop="address"
+          label="参加地址"
         >
         </el-table-column>
+        <el-table-column
+          prop="activityTime"
+          label="参加时间"
+        >
+          <template slot-scope="scope">
+            <div>{{ scope.row.activityTime.split(' ')[0] }}</div>
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作"
           width="250"
@@ -55,9 +63,9 @@
                 <img src="@/assets/images/look.png" alt="">
                 <span>查看</span>
               </div>
-              <div class="look" @click="look(scope.row)">
-                <img src="@/assets/images/look.png" alt="">
-                <span>参与</span>
+              <div class="look" @click="participation(scope.row)" v-if="scope.row.involveStaus == 2">
+                <!-- <img src="@/assets/images/look.png" alt=""> -->
+                <span>报名</span>
               </div>
             </div>
           </template>
@@ -67,67 +75,34 @@
     <div class="pagination">
       <my-pagination :total="total" @pagesChange="pagesChange"></my-pagination>
     </div>
+    <!-- <my-dialog ref="participation" title="参与">
+      <el-form ref="ruleForm" :model="form" label-width="100px" :rules="rules">
+        <el-form-item label="参与信息：" prop="info">
+          <el-input type="textarea" v-model="form.info" resize="none"></el-input>
+        </el-form-item>
+        <div class="form-btns">
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit">参与</el-button>
+            <el-button @click="close">取消</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </my-dialog> -->
+    <my-dialog ref="chakan" title="查看详情">
+      
+    </my-dialog>
   </div>
 </template>
 <script>
 import myPagination from "@/views/components/myPagination/index.vue"
+import myDialog from "@/views/components/dialog/index.vue"
+import { mapState } from "vuex";
+import { Loading } from "element-ui";
 export default {
-  components:{myPagination},
+  components:{myPagination,myDialog},
   data() {
     return {
-      tableData: [
-        {
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },{
-          content:'志愿活动协助指挥交通 我参加的志愿者活动，指挥交通',
-          person:'吴加好',
-          duration:'10',
-          time:'2023-08-14'
-        },
-      ],
+      tableData: [],
       pages:{
         pageSize:10,
         pageNum:1
@@ -142,6 +117,11 @@ export default {
       default:''
     }
   },
+  computed: {
+    ...mapState({
+      dept: (state) => state.user.dept,
+    }),
+  },
   watch:{
     value:{
       handler(newInput,oldInput) {
@@ -150,6 +130,16 @@ export default {
     }
   },
   methods:{
+    // 获取活动推荐列表
+    async getList(){
+      this.loading = true;
+      let data = await this.$api.huodongtuijian.list(this.pages);
+      if(data.code == 200) {
+        this.loading = false;
+        this.tableData = data.rows;
+        this.total = data.total;
+      }
+    },
     // 页码，当前页切换事件
     pagesChange(pages){
       // console.log(pages)
@@ -170,7 +160,54 @@ export default {
         return '';
       }
     },
+    // 查看详情
+    look(row){
+      this.$refs.chakan.open();
+    },
+    // 参与按钮
+    participation(row){
+      // this.$refs.participation.open();
+      this.$confirm('是否确定报名活动？', '确认信息', {
+        distinguishCancelAndClose: true,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      })
+      .then(() => {
+        this.action(row)
+      })
+      .catch(action => {
+        console.log(action)
+      });
+    },
+    // 确定参与活动按钮
+    async action(row){
+      let downloadLoadingInstance = Loading.service({
+        text: "正在申请报名活动，请稍后",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+      let obj = {
+        activityId: row.id
+      }
+      let data = await this.$api.huodongtuijian.zyzreport(obj)
+      // alert('submit!');
+      if(data.code == 200) {
+        downloadLoadingInstance.close();
+        this.$message({
+          message: "申请报名成功",
+          type: "success",
+        });
+        this.getList();
+      }
+    },
+    // 关闭
+    close(){
+      this.$refs.participation.Close();
+    }
   },
+  mounted(){
+    this.getList();
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -182,6 +219,7 @@ export default {
     .activity {
       div {
         text-align: left;
+        line-height: 20px;
         &:nth-child(1) {
           font-size: 14px;
           font-family: 'Alibaba PuHuiTi';
@@ -201,7 +239,7 @@ export default {
       }
     }
     td {
-      height: 57px;
+      height: 42px;
       box-sizing: border-box;
       // text-align: center;
       font-size: 14px;
@@ -211,7 +249,7 @@ export default {
       padding: 2px 0;
     }
     th {
-      height: 57px;
+      height: 45px;
       background-color: #F7F5F5;
       font-size: 15px;
       font-family: 'Alibaba PuHuiTi';
@@ -248,6 +286,12 @@ export default {
   }
 }
 .pagination {
-  margin-top: 10px;
+  // margin-top: 10px;
+}
+::v-deep .el-textarea__inner {
+  height: 80px !important;
+}
+.form-btns {
+  text-align: right;
 }
 </style>
diff --git a/src/views/volunteer/conversionRecord/index.vue b/src/views/volunteer/conversionRecord/index.vue
index 26c5d15..72860dd 100644
--- a/src/views/volunteer/conversionRecord/index.vue
+++ b/src/views/volunteer/conversionRecord/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-18 10:08:30
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-20 14:53:05
+ * @LastEditTime: 2023-09-21 09:39:41
 -->
 <template>
   <div class="plan-management">
@@ -255,10 +255,10 @@ export default {
   border-radius: 10px 10px 0 0;
   box-shadow: 0px 0px 15px 0px rgba(229,212,212,0.58);
   .plan-topBox {
-    padding: 40px 0 0 0;
+    padding: 30px 0 0 0;
   }
   .plan-bottomBox {
-    margin-top: 30px;
+    margin-top: 20px;
     .tables {
       ::v-deep .el-table {
         .success-row {
@@ -267,6 +267,7 @@ export default {
         .activity {
           div {
             text-align: left;
+            line-height: 20px;
             &:nth-child(1) {
               font-size: 14px;
               font-family: 'Alibaba PuHuiTi';
@@ -286,7 +287,7 @@ export default {
           }
         }
         td {
-          height: 57px;
+          height: 42px;
           box-sizing: border-box;
           // text-align: center;
           font-size: 14px;
@@ -296,7 +297,7 @@ export default {
           padding: 2px 0;
         }
         th {
-          height: 57px;
+          height: 45px;
           background-color: #F7F5F5;
           font-size: 15px;
           font-family: 'Alibaba PuHuiTi';
@@ -333,7 +334,7 @@ export default {
       }
     }
     .pagination {
-      margin-top: 10px;
+      // margin-top: 10px;
     }
   }
 }
@@ -343,11 +344,11 @@ export default {
       display: flex;
       align-items: center;
       img {
-        width: 16px;
+        width: 14px;
         margin-right: 10px;
       }
       span {
-        font-size: 18px;
+        font-size: 16px;
         font-family: 'Alibaba PuHuiTi';
         font-weight: bold;
         color: #4C4949;
@@ -368,13 +369,13 @@ export default {
           align-items: center;
           div {
             &:nth-child(1) {
-              font-size: 16px;
+              font-size: 14px;
               font-family: 'Alibaba PuHuiTi';
               font-weight: 400;
               color: #4C4949;
             }
             &:nth-child(2) {
-              font-size: 16px;
+              font-size: 14px;
               font-family: 'Alibaba PuHuiTi';
               font-weight: 400;
               color: #807A7A;
@@ -399,7 +400,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: center;
-      font-size: 16px;
+      font-size: 14px;
       font-family: 'Alibaba PuHuiTi';
       font-weight: 400;
       color: #F8414D;
diff --git a/src/views/volunteer/integralConversion/index.vue b/src/views/volunteer/integralConversion/index.vue
index eb39f93..883ade7 100644
--- a/src/views/volunteer/integralConversion/index.vue
+++ b/src/views/volunteer/integralConversion/index.vue
@@ -4,19 +4,19 @@
  * @Author: JC9527
  * @Date: 2023-09-18 10:08:30
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-20 14:01:56
+ * @LastEditTime: 2023-09-22 09:31:54
 -->
 <template>
   <div class="mainBox">
     <div class="convert-topBox">
       <my-input @changeInput="changeInput"></my-input>
     </div>
-    <div class="convert-content">
+    <div class="convert-content" v-loading="loading">
       <div class="integral-lists">
         <div class="list" v-for="item in certificateList">
-          <div class="list-top" :class="item.type == 1 ? 'top-two' : item.type == 2 ? 'top-three' : '' "></div>
+          <div class="list-top" :style="{'background-image': 'url(' + basicUrl + item.cover + ')'}"></div>
           <div class="list-bottom">
-            <span class="bottom-left">{{ item.type == 0 ? '高级' : item.type == 1 ? '中级' : '初级' }}</span>
+            <span class="bottom-left">{{ item.name }}</span>
             <span class="bottom-right" @click="conversion(item)">兑换</span>
           </div>
         </div>
@@ -30,6 +30,7 @@
 <script>
 import myInput from "@/views/components/myInput/index.vue"
 import myPagination from "@/views/components/myPagination/index.vue"
+import { listCertificates } from "@/api/volunteer/gxhzs/gxhzsgl/index.js";
 export default {
   data() {
     return {
@@ -52,19 +53,26 @@ export default {
         },{
           type:1,
         }
-      ]
+      ],
+      basicUrl:process.env.VUE_APP_BASE_API,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      loading:false,
     };
   },
   components: {
     myInput,myPagination
   },
   mounted() {
-    
+    this.getList()
   },
   methods: {
     // 页码切换
     pagesChange(pages){
-
+      this.queryParams = pages;
+      this.getList()
     },
     // 点击搜索输入框的值
     changeInput(e){
@@ -72,8 +80,16 @@ export default {
     },
     // 点击兑换
     conversion(item){
-
+      console.log(item)
     },
+    getList(){
+      this.loading = true;
+      listCertificates(this.queryParams).then((response) => {
+        this.certificateList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    }
   },
 };
 </script>
@@ -86,7 +102,7 @@ export default {
   padding: 0 20px 10px 20px;
   box-shadow: 0px 0px 15px 0px rgba(229,212,212,0.58);
   .convert-topBox {
-    padding: 40px 0 0 0;
+    padding: 20px 0 0 0;
   }
   .convert-content {
     .integral-lists {
@@ -94,34 +110,35 @@ export default {
       // flex-wrap: wrap;
       margin-top: 30px;
       display: grid;
-      grid-template-columns: repeat(5, 300px);
-      grid-column-gap: 30px;
-      grid-row-gap: 30px;
+      grid-template-columns: repeat(5, 230px);
+      grid-column-gap: 25px;
+      grid-row-gap: 25px;
+      height: 491px;
       .list {
-        width: 300px;
-        // height: 305px;
+        width: 230px;
+        height: 233.2px;
         // background: linear-gradient(0deg, #EFE6D9, #DDC9AC);
         box-shadow: 0px 3px 15px 0px rgba(184,184,184,0.22);
         border-radius: 10px;
         .list-top {
-          background: url('../../../assets/images/icon1.png') no-repeat center center;
+          // background: url('../../../assets/images/icon1.png') no-repeat center center;
           background-size: 100% 100%;
-          height: 216px;
+          height: 188px;
           width: 100%;
         }
-        .top-two {
-          background: url('../../../assets/images/icon2.png') no-repeat center center;
-          background-size: 100% 100%;
-        }
-        .top-three {
-          background: url('../../../assets/images/icon3.png') no-repeat center center;
-          background-size: 100% 100%;
-        }
+        // .top-two {
+        //   background: url('../../../assets/images/icon2.png') no-repeat center center;
+        //   background-size: 100% 100%;
+        // }
+        // .top-three {
+        //   background: url('../../../assets/images/icon3.png') no-repeat center center;
+        //   background-size: 100% 100%;
+        // }
         .list-bottom {
           display: flex;
           justify-content: space-between;
           align-items: center;
-          padding: 20px 20px;
+          padding: 10px 20px;
           .bottom-left {
             font-size: 16px;
             font-family: FZDaBiaoSong-B06S;
@@ -142,7 +159,7 @@ export default {
       }
     }
     .pagination {
-      margin-top: 45px;
+      margin-top: 10px;
     }
   }
 }
diff --git a/src/views/volunteer/integralGain/index.vue b/src/views/volunteer/integralGain/index.vue
index a646627..bb1df59 100644
--- a/src/views/volunteer/integralGain/index.vue
+++ b/src/views/volunteer/integralGain/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-09-18 10:08:30
  * @LastEditors: JC9527
- * @LastEditTime: 2023-09-20 13:57:07
+ * @LastEditTime: 2023-09-21 09:28:45
 -->
 <template>
   <div class="plan-management">
@@ -198,10 +198,10 @@ export default {
   border-radius: 10px 10px 0 0;
   box-shadow: 0px 0px 15px 0px rgba(229,212,212,0.58);
   .plan-topBox {
-    padding: 40px 0 0 0;
+    padding: 30px 0 0 0;
   }
   .plan-bottomBox {
-    margin-top: 30px;
+    margin-top: 20px;
     .tables {
       ::v-deep .el-table {
         .success-row {
@@ -210,6 +210,7 @@ export default {
         .activity {
           div {
             text-align: left;
+            line-height: 20px;
             &:nth-child(1) {
               font-size: 14px;
               font-family: 'Alibaba PuHuiTi';
@@ -229,7 +230,7 @@ export default {
           }
         }
         td {
-          height: 57px;
+          height: 42px;
           box-sizing: border-box;
           // text-align: center;
           font-size: 14px;
@@ -239,7 +240,7 @@ export default {
           padding: 2px 0;
         }
         th {
-          height: 57px;
+          height: 45px;
           background-color: #F7F5F5;
           font-size: 15px;
           font-family: 'Alibaba PuHuiTi';
@@ -284,7 +285,7 @@ export default {
       }
     }
     .pagination {
-      margin-top: 10px;
+      // margin-top: 10px;
     }
   }
 }