diff --git a/src/layout/components/MyHead/index.vue b/src/layout/components/MyHead/index.vue
index 6714838..15afc96 100644
--- a/src/layout/components/MyHead/index.vue
+++ b/src/layout/components/MyHead/index.vue
@@ -7,6 +7,7 @@
         trigger="click"
       >
         <div class="avatar-wrapper">
+          <div class="my-jifen">我的积分余额: 200分</div>
           <img :src="avatar" class="user-avatar" />
           <!-- <i class="el-icon-caret-bottom" /> -->
           <div class="user-name">{{ name }}</div>
@@ -62,6 +63,7 @@ export default {
   justify-content: space-between;
   align-items: center;
   padding: 0 20px;
+
   .system-log {
     font-size: 23px;
     font-family: "Alibaba-PuHuiTi-Bold";
@@ -70,6 +72,13 @@ export default {
     line-height: 60px;
     letter-spacing: 2px;
   }
+  .my-jifen {
+    font-size: 18px;
+    font-weight: 400;
+    color: #ffffff;
+    font-family: "Alibaba-PuHuiTi-Regular";
+    margin-right: 30px;
+  }
   .avatar-container {
     .avatar-wrapper {
       display: flex;
diff --git a/src/router/index.js b/src/router/index.js
index 1a11ed0..ae14653 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -61,19 +61,19 @@ export const constantRoutes = [
     component: () => import("@/views/error/401"),
     hidden: true,
   },
-  // {
-  //   path: "",
-  //   component: Layout,
-  //   redirect: "index",
-  //   children: [
-  //     {
-  //       path: "index",
-  //       component: () => import("@/views/index"),
-  //       name: "Index",
-  //       meta: { title: "首页", icon: "dashboard", affix: true },
-  //     },
-  //   ],
-  // },
+  {
+    path: "",
+    component: Layout,
+    redirect: "index",
+    children: [
+      {
+        path: "index",
+        component: () => import("@/views/index"),
+        name: "Index",
+        meta: { title: "首页", icon: "dashboard", affix: true },
+      },
+    ],
+  },
   {
     path: "/user",
     component: Layout,
@@ -97,8 +97,13 @@ export const constantRoutes = [
         path: "/volunteer/zyzsjgl/zdgl/:dictId(\\d+)",
         component: () => import("@/views/volunteer/zyzsjgl/zdgl/data"),
         hidden: true,
-        name:"Zdgl",
-        meta: { title: "字典详情", icon: "dashboard", affix: true , activeMenu: "/volunteer/zyzsjgl/zdgl"},
+        name: "Zdgl",
+        meta: {
+          title: "字典详情",
+          icon: "dashboard",
+          affix: true,
+          activeMenu: "/volunteer/zyzsjgl/zdgl",
+        },
       },
     ],
   },
diff --git a/src/views/volunteer/gxhzs/gxhzsdh/index.vue b/src/views/volunteer/gxhzs/gxhzsdh/index.vue
index 5e0930e..1c6b224 100644
--- a/src/views/volunteer/gxhzs/gxhzsdh/index.vue
+++ b/src/views/volunteer/gxhzs/gxhzsdh/index.vue
@@ -15,7 +15,6 @@
           style="width: 100%; height: 87%"
           :src="baseUrl + item.cover"
           fit="fill"
-          :preview-src-list="[`${baseUrl + item.cover}`]"
         >
         </el-image>
         <div class="operate">
diff --git a/src/views/volunteer/gxhzs/gxhzsff/index.vue b/src/views/volunteer/gxhzs/gxhzsff/index.vue
index 8f4dd6a..a6d33e9 100644
--- a/src/views/volunteer/gxhzs/gxhzsff/index.vue
+++ b/src/views/volunteer/gxhzs/gxhzsff/index.vue
@@ -36,6 +36,7 @@
       />
       <el-table-column label="证书" align="center" prop="certificateId" />
       <el-table-column label="志愿者" align="center" prop="uid" />
+      <el-table-column label="兑换时间" align="center" prop="uid" />
       <el-table-column label="状态" align="center" prop="type">
         <template slot-scope="scope">
           {{ scope.row.type == 1 ? "已发放" : "未发放" }}
@@ -77,6 +78,10 @@
             <div class="item-lable">志愿者:</div>
             <div class="item-value">{{ form.uid }}</div>
           </div>
+          <div class="info-item">
+            <div class="item-lable">兑换时间:</div>
+            <div class="item-value">{{ form.uid }}</div>
+          </div>
           <div class="info-item">
             <div class="item-lable">状态:</div>
             <div class="item-value">
diff --git a/src/views/volunteer/gxhzs/gxhzsgl/index.vue b/src/views/volunteer/gxhzs/gxhzsgl/index.vue
index 3a66b13..3bfadcf 100644
--- a/src/views/volunteer/gxhzs/gxhzsgl/index.vue
+++ b/src/views/volunteer/gxhzs/gxhzsgl/index.vue
@@ -16,7 +16,6 @@
           style="width: 100%; height: 87%"
           :src="baseUrl + item.cover"
           fit="fill"
-          :preview-src-list="[`${baseUrl + item.cover}`]"
         >
         </el-image>
         <div class="operate">
diff --git a/src/views/volunteer/gxhzs/mygxhzs/index.vue b/src/views/volunteer/gxhzs/mygxhzs/index.vue
index 5ec3a3a..598346b 100644
--- a/src/views/volunteer/gxhzs/mygxhzs/index.vue
+++ b/src/views/volunteer/gxhzs/mygxhzs/index.vue
@@ -35,7 +35,7 @@
         width="55"
       />
       <el-table-column label="证书名称" align="center" prop="certificateId" />
-      <el-table-column label="兑换人员" align="center" prop="type" />
+      <el-table-column label="志愿者" align="center" prop="type" />
       <el-table-column label="状态" align="center" prop="duration" />
       <el-table-column label="兑换时间" align="center" prop="time" />
       <el-table-column
@@ -81,7 +81,7 @@
                 <div>xxx证书</div>
               </div>
               <div class="list-right">
-                <div>兑换人员：</div>
+                <div>志愿者：</div>
                 <div>xxxx</div>
               </div>
             </div>
diff --git a/src/views/volunteer/integralConversion/index.vue b/src/views/volunteer/integralConversion/index.vue
index 5e0930e..1c6b224 100644
--- a/src/views/volunteer/integralConversion/index.vue
+++ b/src/views/volunteer/integralConversion/index.vue
@@ -15,7 +15,6 @@
           style="width: 100%; height: 87%"
           :src="baseUrl + item.cover"
           fit="fill"
-          :preview-src-list="[`${baseUrl + item.cover}`]"
         >
         </el-image>
         <div class="operate">
diff --git a/src/views/volunteer/yzczs/myycxhd/index.vue b/src/views/volunteer/yzczs/myycxhd/index.vue
index e69de29..58fe8ff 100644
--- a/src/views/volunteer/yzczs/myycxhd/index.vue
+++ b/src/views/volunteer/yzczs/myycxhd/index.vue
@@ -0,0 +1,228 @@
+<template>
+  <div class="app-container" ref="main">
+    <div ref="search">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        class="search-container"
+      >
+        <el-form-item prop="name">
+          <el-input
+            v-model="queryParams.input"
+            placeholder="请输入关键字"
+            clearable
+          >
+            <div class="search-btn" slot="append">
+              <i class="el-icon-search"></i>
+            </div>
+          </el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      :height="tableHeigth + 'px'"
+    >
+      <el-table-column
+        label="序号"
+        align="center"
+        type="index"
+        prop="id"
+        width="55"
+      />
+      <el-table-column label="活动名称" align="center" prop="certificateId" />
+      <el-table-column label="志愿者" align="center" prop="type" />
+
+      <el-table-column label="参与时间" align="center" prop="time" />
+      <el-table-column label="活动地址" align="center" prop="duration" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            icon="el-icon-view"
+            type="text"
+            @click="handleInfo(scope.row)"
+            >查看</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 发布对话框 -->
+    <el-dialog :visible.sync="open" width="900px" append-to-body>
+      <div slot="title" class="dialog-title">
+        <span class="title-line"></span>
+        {{ title }}
+      </div>
+      <div class="conversionInfo">
+        <div class="basicInfo">
+          <div class="title">
+            <img src="@/assets/images/huodong.png" alt="" />
+            <span>活动详情</span>
+          </div>
+          <div class="info">
+            <div class="lists">
+              <div class="list-left">
+                <div>活动名称：</div>
+                <div>xxx证书</div>
+              </div>
+              <div class="list-right">
+                <div>志愿者：</div>
+                <div>xxxx</div>
+              </div>
+            </div>
+            <div class="lists">
+              <div class="list-left">
+                <div>参与时间：</div>
+                <div>xxxx</div>
+              </div>
+              <div class="list-left">
+                <div>活动地址：</div>
+                <div>xxxx</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="logisticsInfo">
+          <div class="title">
+            <img src="@/assets/images/huodong.png" alt="" />
+            <span>物流信息</span>
+          </div>
+          <div class="info">
+            <div class="lists">
+              <div class="list-left">
+                <div>快递公司：</div>
+                <div>XXXXXXXXX</div>
+              </div>
+              <div class="list-right">
+                <div>快递单号：</div>
+                <div>XXXXXXXXXXX</div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getSellectall,
+  postElectron,
+  getInfo,
+  editData,
+} from "@/api/volunteer/gxhzs/hdzsff/index.js";
+export default {
+  data() {
+    return {
+      infoOpen: false,
+      form: {},
+      open: false,
+      title: "",
+      tableHeigth: 0,
+      queryParams: {},
+      loading: false,
+      tableData: [{}],
+      total: 1,
+      queryParams: {
+        creType: 2,
+        pageNum: 1,
+        pageSize: 20,
+      },
+    };
+  },
+  created() {
+    // //给表格一个固定值
+    this.$nextTick(() => {
+      this.tableHeigth =
+        this.$refs.main.offsetHeight - this.$refs.search.offsetHeight - 80;
+      this.getList();
+    });
+  },
+  methods: {
+    handleInfo() {
+      this.title = "查看";
+      this.open = true;
+    },
+    cancel() {
+      this.open = false;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/styles/myTable.scss";
+::v-deep .conversionInfo {
+  .basicInfo,
+  .logisticsInfo {
+    .title {
+      display: flex;
+      align-items: center;
+      img {
+        width: 14px;
+        margin-right: 10px;
+      }
+      span {
+        font-size: 16px;
+        font-family: "Alibaba PuHuiTi";
+        font-weight: bold;
+        color: #4c4949;
+      }
+    }
+    .info {
+      margin-top: 20px;
+      display: grid;
+      grid-column: 1fr;
+      grid-row-gap: 20px;
+      .lists {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .list-left,
+        .list-right {
+          flex: 1;
+          display: flex;
+          align-items: center;
+          div {
+            &:nth-child(1) {
+              font-size: 14px;
+              font-family: "Alibaba PuHuiTi";
+              font-weight: 400;
+              color: #4c4949;
+            }
+            &:nth-child(2) {
+              font-size: 14px;
+              font-family: "Alibaba PuHuiTi";
+              font-weight: 400;
+              color: #807a7a;
+            }
+          }
+        }
+      }
+    }
+  }
+  .logisticsInfo {
+    margin-top: 30px;
+  }
+}
+</style>
diff --git a/src/views/volunteer/yzczs/myycxzs/index.vue b/src/views/volunteer/yzczs/myycxzs/index.vue
index 5ec3a3a..598346b 100644
--- a/src/views/volunteer/yzczs/myycxzs/index.vue
+++ b/src/views/volunteer/yzczs/myycxzs/index.vue
@@ -35,7 +35,7 @@
         width="55"
       />
       <el-table-column label="证书名称" align="center" prop="certificateId" />
-      <el-table-column label="兑换人员" align="center" prop="type" />
+      <el-table-column label="志愿者" align="center" prop="type" />
       <el-table-column label="状态" align="center" prop="duration" />
       <el-table-column label="兑换时间" align="center" prop="time" />
       <el-table-column
@@ -81,7 +81,7 @@
                 <div>xxx证书</div>
               </div>
               <div class="list-right">
-                <div>兑换人员：</div>
+                <div>志愿者：</div>
                 <div>xxxx</div>
               </div>
             </div>
diff --git a/src/views/volunteer/yzczs/ycxzsff/index.vue b/src/views/volunteer/yzczs/ycxzsff/index.vue
index 5e0930e..a6d33e9 100644
--- a/src/views/volunteer/yzczs/ycxzsff/index.vue
+++ b/src/views/volunteer/yzczs/ycxzsff/index.vue
@@ -1,33 +1,59 @@
 <template>
   <div class="app-container" ref="main">
-    <div class="search" ref="search">
-      <MyInput v-model="queryParams.name" @clickSearch="handleSearch" />
+    <div ref="search">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        class="search-container"
+      >
+        <el-form-item prop="name">
+          <el-input
+            v-model="queryParams.input"
+            placeholder="请输入关键字"
+            clearable
+          >
+            <div class="search-btn" slot="append">
+              <i class="el-icon-search"></i>
+            </div>
+          </el-input>
+        </el-form-item>
+      </el-form>
     </div>
 
-    <ul class="book-main" :style="listStyle">
-      <li
-        v-for="(item, index) in certificatesList"
-        :key="item.id"
-        :style="{ marginBottom: isLastRow(index) ? '0px' : '' }"
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      :height="tableHeigth + 'px'"
+    >
+      <el-table-column
+        label="序号"
+        align="center"
+        type="index"
+        prop="id"
+        width="55"
+      />
+      <el-table-column label="证书" align="center" prop="certificateId" />
+      <el-table-column label="志愿者" align="center" prop="uid" />
+      <el-table-column label="兑换时间" align="center" prop="uid" />
+      <el-table-column label="状态" align="center" prop="type">
+        <template slot-scope="scope">
+          {{ scope.row.type == 1 ? "已发放" : "未发放" }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
       >
-        <div class="integral-num">积分：50</div>
-        <el-image
-          style="width: 100%; height: 87%"
-          :src="baseUrl + item.cover"
-          fit="fill"
-          :preview-src-list="[`${baseUrl + item.cover}`]"
-        >
-        </el-image>
-        <div class="operate">
-          <div class="integral">
-            {{ item.name }}
-          </div>
-          <div class="operate-child">
-            <div class="exchange-btn" @click="conversion(item)">兑 换</div>
-          </div>
-        </div>
-      </li>
-    </ul>
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" @click="handleFabu(scope.row)"
+            >发布</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
     <pagination
       v-show="total > 0"
       :total="total"
@@ -35,82 +61,152 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+
+    <!-- 发布对话框 -->
+    <el-dialog :visible.sync="open" width="500px" append-to-body>
+      <div slot="title" class="dialog-title">
+        <span class="title-line"></span>
+        {{ title }}
+      </div>
+      <div class="info-box">
+        <div>
+          <div class="info-item">
+            <div class="item-lable">证书:</div>
+            <div class="item-value">{{ form.certificateId }}</div>
+          </div>
+          <div class="info-item">
+            <div class="item-lable">志愿者:</div>
+            <div class="item-value">{{ form.uid }}</div>
+          </div>
+          <div class="info-item">
+            <div class="item-lable">兑换时间:</div>
+            <div class="item-value">{{ form.uid }}</div>
+          </div>
+          <div class="info-item">
+            <div class="item-lable">状态:</div>
+            <div class="item-value">
+              {{ form.type == 1 ? "已发放" : "未发放" }}
+            </div>
+          </div>
+          <div class="info-item">
+            <div class="item-lable">姓名:</div>
+            <div class="item-value"></div>
+          </div>
+          <div class="info-item">
+            <div class="item-lable">手机号:</div>
+            <div class="item-value"></div>
+          </div>
+          <div class="info-item">
+            <div class="item-lable">详细地址:</div>
+            <div class="item-value"></div>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">关 闭</el-button>
+        <el-button type="warning" @click="submitPaper">发放纸质证书</el-button>
+        <el-button type="primary" @click="submitElectron"
+          >发放电子证书</el-button
+        >
+      </div>
+    </el-dialog>
+    <!-- 纸质证书 -->
+    <el-dialog :visible.sync="infoOpen" width="500px" append-to-body>
+      <div slot="title" class="dialog-title">
+        <span class="title-line"></span>
+        邮政信息
+      </div>
+      <!-- <Editor v-model="form.content" :min-height="192" /> -->
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="快递公司" prop="name">
+          <el-input v-model="form.name" placeholder="请输入快递公司" />
+        </el-form-item>
+        <el-form-item label="快递单号" prop="serviceDuration">
+          <el-input
+            v-model="form.serviceDuration"
+            placeholder="请输入快递公司"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">提 交</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listCertificates } from "@/api/volunteer/gxhzs/gxhzsgl/index.js";
+import {
+  getSellectall,
+  postElectron,
+  getInfo,
+  editData,
+} from "@/api/volunteer/gxhzs/hdzsff/index.js";
 export default {
   data() {
     return {
-      listStyle: {
-        height: 0,
-        overflowY: "auto",
-      },
-      baseUrl: process.env.VUE_APP_BASE_API,
-      certificatesList: [],
+      infoOpen: false,
+      form: {},
+      rules: {},
+      open: false,
+      title: "",
+      tableHeigth: 0,
+      queryParams: {},
       loading: false,
       tableData: [],
-      total: 0,
+      total: 1,
       queryParams: {
-        name: undefined,
+        creType: 2,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
       },
-      form: {},
-      rules: {},
     };
   },
   created() {
     // //给表格一个固定值
     this.$nextTick(() => {
-      this.listStyle.height =
-        this.$refs.main.offsetHeight -
-        40 -
-        this.$refs.search.offsetHeight -
-        42 +
-        "px";
+      this.tableHeigth =
+        this.$refs.main.offsetHeight - this.$refs.search.offsetHeight - 75;
       this.getList();
     });
   },
   methods: {
-    isLastRow(index) {
-      const rowCount = Math.ceil(this.certificatesList.length / 5);
-      const row = Math.floor(index / 5);
-      return row === rowCount - 1;
+    /**纸质提交 */
+    submitForm() {
+      editData(this.form).then((res) => {
+        this.submitElectron();
+      });
     },
-    /**兑换 */
-    conversion(item) {
-      console.log(item);
+    /**纸质 */
+    submitPaper() {
+      this.infoOpen = true;
     },
-    /**搜索 */
-    handleSearch(keyWord) {
-      this.queryParams = {
-        name: keyWord,
-        pageNum: 1,
-        pageSize: 10,
+    /**电子 */
+    submitElectron() {
+      let data = {
+        activityId: this.form.activityId,
+        uid: this.form.uid,
       };
-      this.getList();
-    },
-    /** 查询证书管理列表 */
-    getList() {
-      this.loading = true;
-      listCertificates(this.queryParams).then((response) => {
-        this.certificatesList = response.rows;
-        this.total = response.total;
-        this.loading = false;
+      postElectron(data).then((res) => {
+        this.infoOpen = false;
+        this.open = false;
+        this.$modal.msgSuccess("发放成功");
+        this.getList();
       });
     },
-    // 表单重置
+    /**关闭 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /**重置 */
     reset() {
       this.form = {
         id: null,
-        name: null,
-        type: null,
-        cover: null,
+        activityId: null,
+        certificateId: null,
+        uId: null,
         content: null,
-        datetime: null,
-        serviceDuration: null,
         createId: null,
         createBy: null,
         createTime: null,
@@ -120,17 +216,45 @@ export default {
         remark: null,
         userId: null,
         deptId: null,
+        type: null,
       };
-      this.resetForm("form");
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
+    /** 查询发放记录列表 */
+    getList() {
+      this.loading = true;
+      getSellectall(this.queryParams).then((response) => {
+        this.tableData = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+
+    handleFabu(row) {
       this.reset();
+      let id = row.id;
+      getInfo(id).then((res) => {
+        this.form = res.data;
+        this.title = "发放查看";
+        this.open = true;
+      });
     },
   },
 };
 </script>
 <style lang="scss" scoped>
 @import "@/assets/styles/myTable.scss";
+// ::v-deep .search-container {
+//   .el-form-item__content {
+//     width: 550px;
+//   }
+//   .el-input-group__append {
+//     padding-left: 15px !important;
+//     padding-right: 15px !important;
+//     background: #f8414d !important;
+//     border-color: #f8414d !important;
+//     .search-btn {
+//       color: #fff !important;
+//     }
+//   }
+// }
 </style>