From 7b165316aa2b2914db1e89c6776ecc20ce3bfd68 Mon Sep 17 00:00:00 2001 From: muchen Date: Fri, 29 Oct 2021 01:54:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=8D=E5=88=B6=20=E7=A7=BB=E5=8A=A8=20?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20=20=E8=B5=84=E6=BA=90=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 38 ++++-- package.json | 2 + src/router/index.ts | 5 + src/utils/axios.ts | 16 ++- src/views/layout/index.vue | 18 ++- src/views/list.vue | 252 +++++++++++++++++++++++++++++++++++-- src/views/share.vue | 143 +++++++++++++++++++++ vite.config.ts | 10 +- 8 files changed, 462 insertions(+), 22 deletions(-) create mode 100644 src/views/share.vue diff --git a/package-lock.json b/package-lock.json index d1110b558..3db5dd5c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -159,6 +159,12 @@ "integrity": "sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==", "dev": true }, + "@types/qs": { + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", + "dev": true + }, "@types/streamsaver": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/streamsaver/-/streamsaver-2.0.1.tgz", @@ -528,7 +534,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -917,14 +922,12 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==", - "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -953,7 +956,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, "requires": { "function-bind": "^1.1.1" } @@ -967,8 +969,7 @@ "has-symbols": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz", - "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==", - "dev": true + "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==" }, "has-tostringtag": { "version": "1.0.0", @@ -1207,6 +1208,11 @@ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true }, + "object-inspect": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", + "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" + }, "path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", @@ -1405,6 +1411,14 @@ "integrity": "sha512-yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ==", "dev": true }, + "qs": { + "version": "6.10.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz", + "integrity": "sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==", + "requires": { + "side-channel": "^1.0.4" + } + }, "rangetouch": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rangetouch/-/rangetouch-2.0.1.tgz", @@ -1494,6 +1508,16 @@ "lru-cache": "^6.0.0" } }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", diff --git a/package.json b/package.json index 081e79569..11a531878 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "dplayer": "^1.26.0", "element-resize-detector": "^1.2.3", "plyr": "^3.6.9", + "qs": "^6.10.1", "streamsaver": "^2.0.5", "vue": "^3.2.16", "vue-router": "^4.0.12" @@ -19,6 +20,7 @@ "devDependencies": { "@types/dplayer": "^1.25.2", "@types/element-resize-detector": "^1.1.3", + "@types/qs": "^6.9.7", "@types/streamsaver": "^2.0.1", "@types/video.js": "^7.3.27", "@vicons/tabler": "^0.11.0", diff --git a/src/router/index.ts b/src/router/index.ts index b3f6c4e3f..9784fb6da 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -22,6 +22,11 @@ const routes: Array = [ name: 'setting', component: () => import('../views/setting.vue') }, + { + path: 'share', + name: 'share', + component: () => import('../views/share.vue') + } ] }, { diff --git a/src/utils/axios.ts b/src/utils/axios.ts index e2ddc6a07..604d171b0 100644 --- a/src/utils/axios.ts +++ b/src/utils/axios.ts @@ -62,7 +62,7 @@ instance.interceptors.response.use(response => { } break; - case 400: + case 400: case 403: window.$message.error(response.data.error_description || '出错了') default: break; @@ -72,4 +72,18 @@ instance.interceptors.response.use(response => { return Promise.reject(error) }) +const instance2 = axios.create({}) +instance2.interceptors.request.use(request => { + request.headers = { + Authorization: 'Bearer secret_FErDcv3kgsFNLiWUDOWYdJhNqOIKj55eteBg3vIoiLt', + 'Notion-Version': '2021-08-16', + 'Content-Type': 'application/json' + } + if(request.url?.indexOf('https://cors.z7.workers.dev') === -1) { + request.url = 'https://cors.z7.workers.dev/' + request.url + } + return request +}) + +export const notionHttp = instance2 export default instance \ No newline at end of file diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 5e18dcf30..042fe3962 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -79,7 +79,7 @@ import { ref } from '@vue/reactivity'; import { h, onMounted, watch } from '@vue/runtime-core'; import { NLayout, NLayoutSider, NLayoutContent, NMenu, MenuOption, NIcon, NProgress, NText, NModal, NCard, NInput, NButton, NScrollbar, NTime, NTooltip, useDialog } from 'naive-ui' -import { File, Trash, CircleX, Logout, Settings } from '@vicons/tabler' +import { File, Trash, CircleX, Logout, Settings, Share } from '@vicons/tabler' import http from '../../utils/axios' import { byteConvert } from '../../utils' import { useRoute, useRouter } from 'vue-router'; @@ -100,17 +100,22 @@ import { useRoute, useRouter } from 'vue-router'; key: 'trash', icon: renderIcon(Trash) }, - { label: '设置', key: 'setting', icon: renderIcon(Settings) }, + { + label: '资源库', + key: 'share', + icon: renderIcon(Share) + } ]) const userInfo = ref() const getUserInfo = () => { http.get('https://user.mypikpak.com/v1/user/me') .then(res => { + window.localStorage.setItem('pikpakUser', JSON.stringify(res.data)) userInfo.value = res.data }) .catch(error => { @@ -284,4 +289,13 @@ import { useRoute, useRouter } from 'vue-router'; font-size: 18px; cursor: pointer; } + + .list-page { + padding: 40px; + } + @media(max-width: 968px) { + .list-page { + padding: 10px; + } + } \ No newline at end of file diff --git a/src/views/list.vue b/src/views/list.vue index 977383124..9d569d405 100644 --- a/src/views/list.vue +++ b/src/views/list.vue @@ -11,10 +11,18 @@ -
- - - +
+ + + 粘贴已剪切{{moveFiles.length}}项资源 + + + 粘贴已复制{{copyFiles.length}}项资源 + + + + +
@@ -26,6 +34,26 @@
+
+ + + 复制所选 + +
+
+ + + 剪切所选 + +