diff --git a/cf-worker/index.js b/cf-worker/index.js index 6de9fc98e..f294115ac 100644 --- a/cf-worker/index.js +++ b/cf-worker/index.js @@ -73,7 +73,7 @@ async function handleRequest(event) { // 发起 fetch let fr = (await fetch(url, fp)); outCt = fr.headers.get('content-type'); - if(outCt.includes('application/text') || outCt.includes('text/html')) { + if(outCt && (outCt.includes('application/text') || outCt.includes('text/html'))) { try { // 添加base let newFr = new HTMLRewriter() @@ -89,6 +89,9 @@ async function handleRequest(event) { } catch(e) { } } + for (const [key, value] of fr.headers.entries()) { + outHeaders.set(key, value); + } outStatus = fr.status; outStatusText = fr.statusText; outBody = fr.body; diff --git a/index.html b/index.html index 3bd1badf8..025e1b6fa 100644 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - + PikPak diff --git a/package-lock.json b/package-lock.json index 40705cd92..8abbc454c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -654,11 +654,6 @@ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "dev": true }, - "balloon-css": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/balloon-css/-/balloon-css-1.2.0.tgz", - "integrity": "sha512-urXwkHgwp6GsXVF+it01485Z2Cj4pnW02ICnM0TemOlkKmCNnDLmyy+ZZiRXBpwldUXO+aRNr7Hdia4CBvXJ5A==" - }, "batch-processor": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz", @@ -879,14 +874,6 @@ "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=", "dev": true }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - }, "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -1006,34 +993,6 @@ "domhandler": "^4.2.0" } }, - "dplayer": { - "version": "1.26.0", - "resolved": "https://registry.npmjs.org/dplayer/-/dplayer-1.26.0.tgz", - "integrity": "sha512-uOE0w/WdlX7N9d0ppIEcAYrcnUjY52TMX+MBL4lj9Mj+JMljVuaEc5w88HkZp5Q11VqvN/jxnM8ktx2Dr7/MgA==", - "requires": { - "axios": "0.19.2", - "balloon-css": "^1.0.3", - "promise-polyfill": "8.1.3" - }, - "dependencies": { - "axios": { - "version": "0.19.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", - "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", - "requires": { - "follow-redirects": "1.5.10" - } - }, - "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - } - } - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -1933,7 +1892,8 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true }, "mux.js": { "version": "5.13.0", @@ -2217,11 +2177,6 @@ "asap": "~2.0.3" } }, - "promise-polyfill": { - "version": "8.1.3", - "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-8.1.3.tgz", - "integrity": "sha512-MG5r82wBzh7pSKDRa9y+vllNHz3e3d4CNj1PQE4BQYxLme0gKYYBm9YENq+UkEikyZ0XbiGWxYlVw3Rl9O/U8g==" - }, "proxy-agent": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz", diff --git a/package.json b/package.json index 8111923be..71f12e2ee 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,6 @@ "dependencies": { "axios": "^0.23.0", "clipboard": "^2.0.8", - "dplayer": "^1.26.0", "element-resize-detector": "^1.2.3", "plyr": "^3.6.9", "qs": "^6.10.1", diff --git a/src/config/index.ts b/src/config/index.ts index c107cb405..701484ffb 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -1,10 +1,10 @@ export const proxy = [ - 'https://cors.z13.workers.dev', - 'https://cors.z14.workers.dev', - 'https://cors.z15.workers.dev', - 'https://cors.z16.workers.dev', - 'https://cors.z17.workers.dev', - 'https://cors.z18.workers.dev', + 'https://api.13pikpak.cf', + 'https://api.14pikpak.cf', + 'https://api.15pikpak.cf', + 'https://api.16pikpak.cf', + 'https://api.17pikpak.cf', + 'https://api.18pikpak.cf', ] export const version = '1.0.0' \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 982b502e2..118c723f9 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -1,6 +1,6 @@ import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router' import Layout from '../views/layout/index.vue' -const routes: Array = [ +const routes: RouteRecordRaw[] = [ { path: '/', name: 'home', @@ -40,6 +40,11 @@ const routes: Array = [ name: 'setting', component: () => import('../views/setting.vue') }, + { + path: 'invited', + name: 'invited', + component: () => import('../views/invited.vue') + }, { path: 'share', name: 'share', diff --git a/src/utils/axios.ts b/src/utils/axios.ts index 3f6a494b4..14cccb2fe 100644 --- a/src/utils/axios.ts +++ b/src/utils/axios.ts @@ -60,7 +60,7 @@ instance.interceptors.response.use(response => { }) } else { router.push('/login') - return false + return Promise.reject(error) } break; diff --git a/src/views/invited.vue b/src/views/invited.vue new file mode 100644 index 000000000..a2037b8ee --- /dev/null +++ b/src/views/invited.vue @@ -0,0 +1,209 @@ + + + + + \ No newline at end of file diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index ed346a064..584765a26 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -12,7 +12,7 @@ bordered > - +
PikPak
 @@ -28,11 +28,11 @@ processing>

- + - 【0.33元/天】PikPak体验会员VIP年卡-可与7天免费会员码叠加-每人只能购买使用一次，官方代理商分销，感谢支持 + 2021年12月23日~2021年12月31日 【1年PikPak体验会员仅售：119元！原价450元】 2022年1月1日起： 1年PikPak体验会员仅售：169元！原价450元】 -每人只能购买使用一次，官方代理商分销，感谢支持

@@ -90,7 +90,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, Share, Video, Camera } from '@vicons/tabler' +import { File, Trash, CircleX, Logout, Settings, Copy, Share, Video, Camera } from '@vicons/tabler' import http from '../../utils/axios' import { byteConvert } from '../../utils' import { useRoute, useRouter } from 'vue-router' @@ -121,6 +121,11 @@ import { useRoute, useRouter } from 'vue-router' key: 'trash', icon: renderIcon(Trash) }, + { + label: '邀请', + key: 'invited', + icon: renderIcon(Copy) + }, { label: '资源库', key: 'share', @@ -172,8 +177,9 @@ import { useRoute, useRouter } from 'vue-router' const code = ref() const showCode = ref(false) const postCode = () => { - http.post('https://api-drive.mypikpak.com/vip/v1/order/free', { - activation_code: code.value + http.post('https://api-drive.mypikpak.com/vip/v1/order/activation-code', { + activation_code: code.value, + data: {} }) .then(res => { window.$message.success('兑换成功') diff --git a/src/views/login.vue b/src/views/login.vue index d250a69ef..afcd4357f 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -24,8 +24,8 @@ 忘记密码 - 注册 - 去下载注册 + + 去下载注册得5天VIP