From c97f67603cfe77f992448dcd2c562ac4bfabdef3 Mon Sep 17 00:00:00 2001 From: jmal Date: Thu, 4 Feb 2021 14:13:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=88=86=E6=9E=90?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=A4=8D=E5=88=B6=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Icon/Icon.vue | 4 +- src/components/button/CopyButton.vue | 15 ++ src/utils/file-config.js | 11 +- src/views/public/article/ArticleTop.vue | 79 ------- src/views/public/article/SidebarNav.vue | 95 -------- src/views/public/article/index.vue | 295 ------------------------ src/views/public/articles/index.vue | 219 ------------------ src/views/public/share/shareList.vue | 56 +++-- src/views/share/index.vue | 1 + 9 files changed, 66 insertions(+), 709 deletions(-) create mode 100644 src/components/button/CopyButton.vue delete mode 100644 src/views/public/article/ArticleTop.vue delete mode 100644 src/views/public/article/SidebarNav.vue delete mode 100644 src/views/public/article/index.vue delete mode 100644 src/views/public/articles/index.vue diff --git a/src/components/Icon/Icon.vue b/src/components/Icon/Icon.vue index 1d51394..4ea8b87 100644 --- a/src/components/Icon/Icon.vue +++ b/src/components/Icon/Icon.vue @@ -5,7 +5,7 @@ import { Icon } from 'ant-design-vue' const IconFont = Icon.createFromIconfontCN({ - scriptUrl: '//at.alicdn.com/t/font_2024484_dczwxweaavk.js' + scriptUrl: '//at.alicdn.com/t/font_2024484_q3oifn59jr.js' }) // 把此段代码贴到iconfont项目页面的控制台中, 以获取图标列表 @@ -16,7 +16,7 @@ const IconFont = Icon.createFromIconfontCN({ // console.log(iconNames.slice(80,160)) export const iconFonts = { - list: ["iso", "zuijinhuoyue","key", "shouquan", "sort", "grid", "list", "emoji-a", "emoji-bizui", "emoji-baiyan", "emoji-aixin", "emoji-dajing", "emoji-ziya", "emoji-daxiao", "emoji-esi", "emoji-fadai", "emoji-fankun", "emoji-ganga", "emoji-fennu", "emoji-hanyan", "emoji-jingkong", "emoji-haochi", "emoji-emo", "emoji-jingsong", "emoji-jingya", "emoji-kaixin", "emoji-lengku", "emoji-danao", "emoji-liukoushui", "emoji-liulei", "emoji-mengbi", "mianwubiaoqing", "nanguo", "shuizhuo", "taoyan", "tanchi", "siliao", "tiaopi", "xiaochulei", "wuliao", "xingxingyan", "xieyan", "xiasi", "xiaolian", "ku", "shengqi", "yousiliao", "en", "bushufu", "bianbian", "fankun1", "feiwen", "ganmao", "huaixiao", "liuhan", "outu", "keshui", "renzhe", "santiaoxian", "guaiwu", "shoushang", "tianshi", "shuai", "xianwen", "xiaodiaodaya", "xiong", "yiwen", "yun", "liubixie", "shimo", "dianzan", "biti", "fendou", "huqi", "heng", "kulou", "leng", "taoyan1", "shuixing", "aini", "aixin1", "zhadan", "xinsui", + list: ["menu-fuzhi", "iso", "zuijinhuoyue","key", "shouquan", "sort", "grid", "list", "emoji-a", "emoji-bizui", "emoji-baiyan", "emoji-aixin", "emoji-dajing", "emoji-ziya", "emoji-daxiao", "emoji-esi", "emoji-fadai", "emoji-fankun", "emoji-ganga", "emoji-fennu", "emoji-hanyan", "emoji-jingkong", "emoji-haochi", "emoji-emo", "emoji-jingsong", "emoji-jingya", "emoji-kaixin", "emoji-lengku", "emoji-danao", "emoji-liukoushui", "emoji-liulei", "emoji-mengbi", "mianwubiaoqing", "nanguo", "shuizhuo", "taoyan", "tanchi", "siliao", "tiaopi", "xiaochulei", "wuliao", "xingxingyan", "xieyan", "xiasi", "xiaolian", "ku", "shengqi", "yousiliao", "en", "bushufu", "bianbian", "fankun1", "feiwen", "ganmao", "huaixiao", "liuhan", "outu", "keshui", "renzhe", "santiaoxian", "guaiwu", "shoushang", "tianshi", "shuai", "xianwen", "xiaodiaodaya", "xiong", "yiwen", "yun", "liubixie", "shimo", "dianzan", "biti", "fendou", "huqi", "heng", "kulou", "leng", "taoyan1", "shuixing", "aini", "aixin1", "zhadan", "xinsui", "maren", "zhutou", "qie", "youling", "apple-fill", "attachment", "android-fill", "apple", "download", "arrow-up-circle", "arrow-right-circle", "arrow-down", "ashbin", "add", "file_music", "menu", "role", "jiaoseguanli", "yemianshezhi", "drop_down", "yuandian", "tag", "service-directory", "fabu", "wailian", "bianji-", "WEBSITE", "wangzhanguanli", "Up", "up", "fenlei", "guanlizhuanjiawenzhang", "pifu", "tuichudenglu", "shezhi", "wangzhan", "huaban", "yunshezhi", "UserSettings", "blogger", "biaoqian", "myself", "guidang", "quxiaoyulan1-copy", "yulan-copy", "quxiaoyulan1", "yulan"] } diff --git a/src/components/button/CopyButton.vue b/src/components/button/CopyButton.vue new file mode 100644 index 0000000..4c1f9d9 --- /dev/null +++ b/src/components/button/CopyButton.vue @@ -0,0 +1,15 @@ + + + + + diff --git a/src/utils/file-config.js b/src/utils/file-config.js index b1a807a..58c1d6c 100644 --- a/src/utils/file-config.js +++ b/src/utils/file-config.js @@ -28,8 +28,7 @@ export default { }) }, publicDownload: function(shareId, file) { - let url = `${this.baseUrl}/public/s/download/${file.id}/${shareId}` - window.open(url, '_self') + window.open(this.publicDownloadUrl(shareId, file), '_self') }, packageDownload: function(fileIds, token) { fileApi.isAllowDownload().then(() => { @@ -37,6 +36,12 @@ export default { }) }, publicPackageDownload: function(shareId, fileIds) { - window.open(`${this.baseUrl}/public/s/packageDownload?shareId=${shareId}&fileIds=${fileIds}`, '_self') + window.open(this.publicPackageDownloadUrl(shareId, fileIds), '_self') + }, + publicDownloadUrl: function(shareId, file) { + return window.location.origin + `${this.baseUrl}/public/s/download/${file.id}/${shareId}` + }, + publicPackageDownloadUrl: function(shareId, fileIds) { + return window.location.origin + `${this.baseUrl}/public/s/packageDownload?shareId=${shareId}&fileIds=${fileIds}` }, } diff --git a/src/views/public/article/ArticleTop.vue b/src/views/public/article/ArticleTop.vue deleted file mode 100644 index fa530e9..0000000 --- a/src/views/public/article/ArticleTop.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - diff --git a/src/views/public/article/SidebarNav.vue b/src/views/public/article/SidebarNav.vue deleted file mode 100644 index 9297f1c..0000000 --- a/src/views/public/article/SidebarNav.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - diff --git a/src/views/public/article/index.vue b/src/views/public/article/index.vue deleted file mode 100644 index 0b439f7..0000000 --- a/src/views/public/article/index.vue +++ /dev/null @@ -1,295 +0,0 @@ - - - - diff --git a/src/views/public/articles/index.vue b/src/views/public/articles/index.vue deleted file mode 100644 index efbe9c7..0000000 --- a/src/views/public/articles/index.vue +++ /dev/null @@ -1,219 +0,0 @@ - - - - diff --git a/src/views/public/share/shareList.vue b/src/views/public/share/shareList.vue index 65e5778..422ad53 100644 --- a/src/views/public/share/shareList.vue +++ b/src/views/public/share/shareList.vue @@ -3,6 +3,7 @@ +