From 87055237da278d8c4cd9afce394fe2a81b1bcc9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Wed, 27 Sep 2023 18:29:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                            |  2 +-
 src/api/volunteer/gxhzs/gxhzsgl/index.js    | 10 +++++++++
 src/assets/styles/myTable.scss              |  7 ++++---
 src/views/volunteer/gxhzs/gxhzsdh/index.vue | 23 +++++++++++++++++++--
 src/views/volunteer/gxhzs/gxhzsgl/index.vue | 14 ++++++++-----
 5 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 6855adf..0fe1cb9 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ ENV = 'development'
 # 志愿者管理系统/开发环境
 # VUE_APP_BASE_API = 'https://vue.ruoyi.vip/prod-api'
 # VUE_APP_BASE_API = 'http://192.168.0.108:9034'
-VUE_APP_BASE_API = 'http://39.101.188.84:9034'
+VUE_APP_BASE_API = 'http://192.168.0.117:9034'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/api/volunteer/gxhzs/gxhzsgl/index.js b/src/api/volunteer/gxhzs/gxhzsgl/index.js
index e40f3a6..d1911bb 100644
--- a/src/api/volunteer/gxhzs/gxhzsgl/index.js
+++ b/src/api/volunteer/gxhzs/gxhzsgl/index.js
@@ -42,3 +42,13 @@ export function delCertificates(id) {
     method: "delete",
   });
 }
+
+//发放
+
+export function exchange(data) {
+  return request({
+    url: "/zhiyuanzhe/pointsRedemption/exchange",
+    method: "post",
+    data,
+  });
+}
diff --git a/src/assets/styles/myTable.scss b/src/assets/styles/myTable.scss
index c1012f8..f42b8ae 100644
--- a/src/assets/styles/myTable.scss
+++ b/src/assets/styles/myTable.scss
@@ -63,7 +63,7 @@
   justify-content: space-between;
 }
 //卡片布局
-.book-main {
+::v-deep .book-main {
   margin: 0;
   padding: 0;
   display: flex;
@@ -80,10 +80,11 @@
     border-radius: 10px;
     position: relative;
     overflow: hidden;
+
     .integral-num {
       position: absolute;
       top: 6%;
-      right: 10%;
+      right: 7%;
       font-size: 18px;
       font-weight: bold;
       color: #2aa984;
@@ -95,7 +96,7 @@
       width: 100%;
       display: flex;
       justify-content: space-between;
-      align-content: center;
+      align-items: center;
       padding: 0 10px;
       .integral {
         flex: 1;
diff --git a/src/views/volunteer/gxhzs/gxhzsdh/index.vue b/src/views/volunteer/gxhzs/gxhzsdh/index.vue
index 1c6b224..7f0c926 100644
--- a/src/views/volunteer/gxhzs/gxhzsdh/index.vue
+++ b/src/views/volunteer/gxhzs/gxhzsdh/index.vue
@@ -38,7 +38,10 @@
 </template>
 
 <script>
-import { listCertificates } from "@/api/volunteer/gxhzs/gxhzsgl/index.js";
+import {
+  listCertificates,
+  exchange,
+} from "@/api/volunteer/gxhzs/gxhzsgl/index.js";
 export default {
   data() {
     return {
@@ -52,6 +55,7 @@ export default {
       tableData: [],
       total: 0,
       queryParams: {
+        type: 0,
         name: undefined,
         pageNum: 1,
         pageSize: 10,
@@ -80,7 +84,22 @@ export default {
     },
     /**兑换 */
     conversion(item) {
-      console.log(item);
+      // console.log(item);
+      let data = {
+        address: "测试地址",
+        certificateId: item.id,
+        type: 0,
+      };
+      this.$modal
+        .confirm(`您确定要兑换“${item.name}”证书吗？`)
+        .then(function () {
+          return exchange(data);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("兑换成功！");
+        })
+        .catch(() => {});
     },
     /**搜索 */
     handleSearch(keyWord) {
diff --git a/src/views/volunteer/gxhzs/gxhzsgl/index.vue b/src/views/volunteer/gxhzs/gxhzsgl/index.vue
index 3bfadcf..6ccadde 100644
--- a/src/views/volunteer/gxhzs/gxhzsgl/index.vue
+++ b/src/views/volunteer/gxhzs/gxhzsgl/index.vue
@@ -11,13 +11,15 @@
         :key="item.id"
         :style="{ marginBottom: isLastRow(index) ? '0px' : '' }"
       >
-        <div class="integral-num">积分：50</div>
+        <div class="integral-num">积分：{{ item.integral }}</div>
+
         <el-image
           style="width: 100%; height: 87%"
           :src="baseUrl + item.cover"
           fit="fill"
         >
         </el-image>
+
         <div class="operate">
           <div class="integral">
             {{ item.name }}
@@ -65,8 +67,8 @@
         <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 label="积分" prop="integral">
+          <el-input v-model="form.integral" placeholder="请输入积分" />
         </el-form-item>
         <el-form-item label="证书封面" prop="cover">
           <ImageUpload :limit="1" v-model="form.cover" />
@@ -91,7 +93,7 @@
           </div>
           <div class="info-item">
             <div class="item-lable">积分:</div>
-            <div class="item-value">{{ form.serviceDuration }}</div>
+            <div class="item-value">{{ form.integral }}</div>
           </div>
           <div class="info-item">
             <div class="item-lable">证书封面:</div>
@@ -126,6 +128,7 @@ export default {
       tableData: [],
       total: 0,
       queryParams: {
+        type: 0, //个性化证书
         name: undefined,
         pageNum: 1,
         pageSize: 10,
@@ -182,7 +185,7 @@ export default {
         cover: null,
         content: null,
         datetime: null,
-        serviceDuration: null,
+        integral: null,
         createId: null,
         createBy: null,
         createTime: null,
@@ -229,6 +232,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
+          this.form.type = 0;
           if (this.form.id != null) {
             updateCertificates(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");