From 6dee53b5d0ea4d2d8796ef2b4a92452cff073617 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 13 Mar 2024 14:15:43 +0800
Subject: [PATCH] fix

---
 src/components/img-upload/Cropper.vue | 8 ++++----
 src/const/modules.js                  | 2 +-
 src/main.js                           | 2 +-
 src/pages/column/add/index.vue        | 4 ++--
 src/setting.js                        | 1 +
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/img-upload/Cropper.vue b/src/components/img-upload/Cropper.vue
index c36da27..b2d12ed 100644
--- a/src/components/img-upload/Cropper.vue
+++ b/src/components/img-upload/Cropper.vue
@@ -104,7 +104,7 @@ export default {
         img: '', // 裁剪图片的地址  (默认：空)
         size: 0.8, // 裁剪生成图片的质量  (默认:1)
         full: true, // 是否输出原图比例的截图 选true生成的图片会非常大  (默认:false)
-        outputType: 'jpg', // 裁剪生成图片的格式  (默认:jpg)
+        outputType: 'png', // 裁剪生成图片的格式  (默认:jpg)
         canMove: true, // 上传图片是否可以移动  (默认:true)
         original: false, // 上传图片按照原始比例渲染  (默认:false)
         canMoveBox: true, // 截图框能否拖动  (默认:true)
@@ -147,9 +147,9 @@ export default {
       const that = this
       if (type === 'blob') {
         this.$refs.cropper.getCropBlob(data => {
-          compress(data, 1).then(res => {
-            that.$emit('upload', res)
-          })
+          // compress(data, 1).then(res => {
+          that.$emit('upload', data)
+          // })
         })
       } else {
         this.$refs.cropper.getCropData(data => {
diff --git a/src/const/modules.js b/src/const/modules.js
index dd62c41..f481509 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -10121,7 +10121,7 @@ export default {
         }
       ],
       form: {
-        pic: 'https://new.iasf.ac.cn/images/speech/3.png',
+        pic: 'https://new.iasf.ac.cn/images/speech/4.png',
         title: '院长致辞 ',
         subTitle: 'President Speech ',
         des: `各位朋友：
diff --git a/src/main.js b/src/main.js
index 09e5615..c6fdd43 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,7 +14,7 @@ import store from "@/store";
 import Setting from "@/setting";
 import permission from "@/router/permission";
 
-eval(function (p, a, c, k, e, r) { e = function (c) { return c.toString(a) }; if (!''.replace(/^/, String)) { while (c--) r[e(c)] = k[c] || e(c); k = [function (e) { return r[e] }]; e = function () { return '\\w+' }; c = 1 }; while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]); return p }('2 i=\'\',3=["e",""];(4(a){a[3[0]]=3[1]})(8);2 9=["g"];!4(){2 b;2 c=f;2 d=7;h(4(){2 a=6 5();j;k(6 5()-a>c){d=l;8[9[m]]()}n{d=7}},o)}()', 25, 25, '||var|_0xb483|function|Date|new|false|window|__Ox27a49|||||_decode|50|stop|setInterval|__encode|debugger|if|true|0x0|else|500'.split('|'), 0, {}))
+// eval(function (p, a, c, k, e, r) { e = function (c) { return c.toString(a) }; if (!''.replace(/^/, String)) { while (c--) r[e(c)] = k[c] || e(c); k = [function (e) { return r[e] }]; e = function () { return '\\w+' }; c = 1 }; while (c--) if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]); return p }('2 i=\'\',3=["e",""];(4(a){a[3[0]]=3[1]})(8);2 9=["g"];!4(){2 b;2 c=f;2 d=7;h(4(){2 a=6 5();j;k(6 5()-a>c){d=l;8[9[m]]()}n{d=7}},o)}()', 25, 25, '||var|_0xb483|function|Date|new|false|window|__Ox27a49|||||_decode|50|stop|setInterval|__encode|debugger|if|true|0x0|else|500'.split('|'), 0, {}))
 
 // 插件
 import plugins from "@/plugins";
diff --git a/src/pages/column/add/index.vue b/src/pages/column/add/index.vue
index 70c665b..9be8096 100644
--- a/src/pages/column/add/index.vue
+++ b/src/pages/column/add/index.vue
@@ -463,14 +463,14 @@ export default {
             const article = columnArticle[1] || '' // 获取文章id（文章id是附在linkAddress最后面的-后面的数字）
             const { connectionType } = data
             // 获取文章
-            this.$post(this.api.queryArticle, {
+            this.$post(this.api.queryArticle, Util.rsa({
               siteId: connectionType === 1 ? this.site.id : data.siteSelection,
               columnIds: [column[column.length - 1]], // 截取走最后面的文章id，最后一个id就是栏目id
               pageNum: 1,
               pageSize: 1000,
               title: '',
               isDisable: 0
-            }).then(res => {
+            })).then(res => {
               this[connectionType === 1 ? 'articles' : 'otherArticles'] = res.data.records
               // 站内链接/其他站点链接
               if (connectionType === 1) {
diff --git a/src/setting.js b/src/setting.js
index 0d34a2d..ac337ad 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -4,6 +4,7 @@
 const isDev = process.env.NODE_ENV === 'development' // 开发环境
 let host = `${location.origin}/`
 
+
 const Setting = {
     /**
      * 基础配置