From f78e8558a9bac5ad1e214acaef3595d7d2628d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com>
Date: Mon, 11 Dec 2023 10:13:25 +0800
Subject: [PATCH] 1

---
 .env.production                               |  4 +-
 src/api/login.js                              | 53 ++++++++++---------
 src/views/volunteer/gxhzs/gxhzsff/index.vue   |  7 +++
 src/views/volunteer/gxhzs/mygxhzs/index.vue   |  7 +++
 src/views/volunteer/userbq/dictGl/data.vue    |  4 +-
 src/views/volunteer/yzczs/myycxhd/index.vue   |  7 +++
 .../volunteer/yzczs/myycxzs/index copy.vue    |  7 +++
 src/views/volunteer/yzczs/myycxzs/index.vue   |  7 +++
 src/views/volunteer/yzczs/ycxzsff/index.vue   |  7 +++
 9 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/.env.production b/.env.production
index 3ac36c2..e103ca9 100644
--- a/.env.production
+++ b/.env.production
@@ -5,4 +5,6 @@ VUE_APP_TITLE = 苏州园区志愿服务活动区块链平台
 ENV = 'production'
 
 # 苏州园区志愿服务活动区块链平台/生产环境
-VUE_APP_BASE_API = 'http://39.101.188.84:9034'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9034/api'
+
+VUE_APP_BASE_API = 'http://192.114.0.243/api'
diff --git a/src/api/login.js b/src/api/login.js
index 649f59c..b736374 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -1,59 +1,60 @@
-import request from '@/utils/request'
-
+import request from "@/utils/request";
+import { encrypt } from "@/utils/jsencrypt";
 // 登录方法
 export function login(username, password, code, uuid) {
+  password = encrypt(password);
   const data = {
     username,
     password,
     code,
-    uuid
-  }
+    uuid,
+  };
   return request({
-    url: '/login',
+    url: "/login",
     headers: {
-      isToken: false
+      isToken: false,
     },
-    method: 'post',
-    data: data
-  })
+    method: "post",
+    data: data,
+  });
 }
 
 // 注册方法
 export function register(data) {
   return request({
-    url: '/register',
+    url: "/register",
     headers: {
-      isToken: false
+      isToken: false,
     },
-    method: 'post',
-    data: data
-  })
+    method: "post",
+    data: data,
+  });
 }
 
 // 获取用户详细信息
 export function getInfo() {
   return request({
-    url: '/getInfo',
-    method: 'get'
-  })
+    url: "/getInfo",
+    method: "get",
+  });
 }
 
 // 退出方法
 export function logout() {
   return request({
-    url: '/logout',
-    method: 'post'
-  })
+    url: "/logout",
+    method: "post",
+  });
 }
 
 // 获取验证码
 export function getCodeImg() {
   return request({
-    url: '/captchaImage',
+    url: "/captchaImage",
     headers: {
-      isToken: false
+      isToken: false,
     },
-    method: 'get',
-    timeout: 20000
-  })
-}
\ No newline at end of file
+    method: "get",
+    timeout: 20000,
+  });
+}
diff --git a/src/views/volunteer/gxhzs/gxhzsff/index.vue b/src/views/volunteer/gxhzs/gxhzsff/index.vue
index 6d8c4e3..1c4aa3a 100644
--- a/src/views/volunteer/gxhzs/gxhzsff/index.vue
+++ b/src/views/volunteer/gxhzs/gxhzsff/index.vue
@@ -303,6 +303,12 @@ export default {
     },
     /**下载电子证书 */
     downloadContentAsImage() {
+      const loading = this.$loading({
+        lock: true,
+        text: "下载中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       const content = this.$refs.zs; // 获取目标<div>的DOM节点
       // 创建一个Canvas元素，并设置宽高等于目标<div>的尺寸
       const canvas = document.createElement("canvas");
@@ -315,6 +321,7 @@ export default {
         const dataURL = canvas.toDataURL("image/png");
         // 使用FileSaver.js保存DataURL为图片文件
         saveAs(dataURL, "download.png");
+        loading.close();
       });
     },
 
diff --git a/src/views/volunteer/gxhzs/mygxhzs/index.vue b/src/views/volunteer/gxhzs/mygxhzs/index.vue
index 5f9a16c..f22d274 100644
--- a/src/views/volunteer/gxhzs/mygxhzs/index.vue
+++ b/src/views/volunteer/gxhzs/mygxhzs/index.vue
@@ -277,6 +277,12 @@ export default {
     },
     /**下载电子证书 */
     downloadContentAsImage() {
+      const loading = this.$loading({
+        lock: true,
+        text: "下载中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       const content = this.$refs.zs; // 获取目标<div>的DOM节点
       // 创建一个Canvas元素，并设置宽高等于目标<div>的尺寸
       const canvas = document.createElement("canvas");
@@ -289,6 +295,7 @@ export default {
         const dataURL = canvas.toDataURL("image/png");
         // 使用FileSaver.js保存DataURL为图片文件
         saveAs(dataURL, "download.png");
+        loading.close();
       });
     },
 
diff --git a/src/views/volunteer/userbq/dictGl/data.vue b/src/views/volunteer/userbq/dictGl/data.vue
index 5b35b1f..234a365 100644
--- a/src/views/volunteer/userbq/dictGl/data.vue
+++ b/src/views/volunteer/userbq/dictGl/data.vue
@@ -8,7 +8,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="字典名称" prop="dictType">
+      <!-- <el-form-item label="字典名称" prop="dictType">
         <el-select v-model="queryParams.dictType">
           <el-option
             v-for="item in typeOptions"
@@ -17,7 +17,7 @@
             :value="item.dictType"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="字典标签" prop="dictLabel">
         <el-input
           v-model="queryParams.dictLabel"
diff --git a/src/views/volunteer/yzczs/myycxhd/index.vue b/src/views/volunteer/yzczs/myycxhd/index.vue
index aae0a0b..926869d 100644
--- a/src/views/volunteer/yzczs/myycxhd/index.vue
+++ b/src/views/volunteer/yzczs/myycxhd/index.vue
@@ -292,6 +292,12 @@ export default {
     },
     /**下载电子证书 */
     downloadContentAsImage() {
+      const loading = this.$loading({
+        lock: true,
+        text: "下载中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       const content = this.$refs.zs; // 获取目标<div>的DOM节点
       // 创建一个Canvas元素，并设置宽高等于目标<div>的尺寸
       const canvas = document.createElement("canvas");
@@ -304,6 +310,7 @@ export default {
         const dataURL = canvas.toDataURL("image/png");
         // 使用FileSaver.js保存DataURL为图片文件
         saveAs(dataURL, "download.png");
+        loading.close();
       });
     },
 
diff --git a/src/views/volunteer/yzczs/myycxzs/index copy.vue b/src/views/volunteer/yzczs/myycxzs/index copy.vue
index 834ebf5..782a937 100644
--- a/src/views/volunteer/yzczs/myycxzs/index copy.vue	
+++ b/src/views/volunteer/yzczs/myycxzs/index copy.vue	
@@ -259,6 +259,12 @@ export default {
     },
     /**下载电子证书 */
     downloadContentAsImage() {
+      const loading = this.$loading({
+        lock: true,
+        text: "下载中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       const content = this.$refs.zs; // 获取目标<div>的DOM节点
       // 创建一个Canvas元素，并设置宽高等于目标<div>的尺寸
       const canvas = document.createElement("canvas");
@@ -271,6 +277,7 @@ export default {
         const dataURL = canvas.toDataURL("image/png");
         // 使用FileSaver.js保存DataURL为图片文件
         saveAs(dataURL, "download.png");
+        loading.close();
       });
     },
 
diff --git a/src/views/volunteer/yzczs/myycxzs/index.vue b/src/views/volunteer/yzczs/myycxzs/index.vue
index f5a27bf..744ce03 100644
--- a/src/views/volunteer/yzczs/myycxzs/index.vue
+++ b/src/views/volunteer/yzczs/myycxzs/index.vue
@@ -293,6 +293,12 @@ export default {
     },
     /**下载电子证书 */
     downloadContentAsImage() {
+      const loading = this.$loading({
+        lock: true,
+        text: "下载中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       const content = this.$refs.zs; // 获取目标<div>的DOM节点
       // 创建一个Canvas元素，并设置宽高等于目标<div>的尺寸
       const canvas = document.createElement("canvas");
@@ -305,6 +311,7 @@ export default {
         const dataURL = canvas.toDataURL("image/png");
         // 使用FileSaver.js保存DataURL为图片文件
         saveAs(dataURL, "download.png");
+        loading.close();
       });
     },
 
diff --git a/src/views/volunteer/yzczs/ycxzsff/index.vue b/src/views/volunteer/yzczs/ycxzsff/index.vue
index 931b711..221f22e 100644
--- a/src/views/volunteer/yzczs/ycxzsff/index.vue
+++ b/src/views/volunteer/yzczs/ycxzsff/index.vue
@@ -311,6 +311,12 @@ export default {
     },
     /**下载电子证书 */
     downloadContentAsImage() {
+      const loading = this.$loading({
+        lock: true,
+        text: "下载中",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
       const content = this.$refs.zs; // 获取目标<div>的DOM节点
       // 创建一个Canvas元素，并设置宽高等于目标<div>的尺寸
       const canvas = document.createElement("canvas");
@@ -323,6 +329,7 @@ export default {
         const dataURL = canvas.toDataURL("image/png");
         // 使用FileSaver.js保存DataURL为图片文件
         saveAs(dataURL, "download.png");
+        loading.close();
       });
     },