diff --git a/components.d.ts b/components.d.ts index a5bd864..6090c28 100644 --- a/components.d.ts +++ b/components.d.ts @@ -29,9 +29,7 @@ declare module 'vue' { DSelect: typeof import('vue-devui/select/index.es.js')['Select'] DTab: typeof import('vue-devui/tabs/index.es.js')['Tab'] DTabs: typeof import('vue-devui/tabs/index.es.js')['Tabs'] - DUpload: typeof import('vue-devui/upload/index.es.js')['Upload'] HomeSide: typeof import('./src/components/homeSide.vue')['default'] - Menu: typeof import('./src/components/menuH.vue')['default'] MenuH: typeof import('./src/components/menuH.vue')['default'] RouterLink: typeof import('vue-router')['RouterLink'] RouterView: typeof import('vue-router')['RouterView'] diff --git a/index.html b/index.html index 287148c..f510a37 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,7 @@ + 柚子の网站 diff --git a/package.json b/package.json index 17fd24a..606a50f 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,11 @@ }, "dependencies": { "@devui-design/icons": "^1.4.0", + "@meting/core": "^1.5.13", "@unocss/reset": "^66.3.3", "aplayer": "^1.10.1", "axios": "^1.11.0", + "crypto-js": "^4.2.0", "devui-theme": "^0.0.7", "es-toolkit": "^1.39.8", "less": "^4.4.0", @@ -28,6 +30,7 @@ "unplugin-auto-import": "^19.3.0", "unplugin-vue-components": "^28.8.0", "unplugin-vue-router": "^0.15.0", + "vditor": "^3.11.2", "vite-svg-loader": "^5.1.0", "vue": "^3.6.0-alpha.2", "vue-devui": "^1.6.33", diff --git a/src/assets/images/offwork.png b/src/assets/images/offwork.png new file mode 100644 index 0000000..406b38e Binary files /dev/null and b/src/assets/images/offwork.png differ diff --git a/src/assets/images/onwork.png b/src/assets/images/onwork.png new file mode 100644 index 0000000..f6d1ede Binary files /dev/null and b/src/assets/images/onwork.png differ diff --git a/src/components/aplayer.vue b/src/components/aplayer.vue index d85e99a..0bdaf12 100644 --- a/src/components/aplayer.vue +++ b/src/components/aplayer.vue @@ -30,14 +30,20 @@ const data: any = reactive({ onMounted(async () => { // 8834041785 - const res = await fetch("https://met.hxyouzi.com/meting-api/?server=tencent&type=playlist&id=7567066822") + // const res = await fetch("https://met.hxyouzi.com/meting-api/?server=tencent&type=playlist&id=7567066822") // const res = await fetch("https://api.moeyao.cn/meting/?server=tencent&type=playlist&id=8834041785") - const mlist = await res.json() + // const mlist = await res.json() + const metto = 'youzi' + const server = 'tencent' + const gdid = '7567066822' + let ck = 'RK=beuVmBI+x3; ptcz=08924c0c66c35b66361f002fb0b3005ff0f2144404f548f8728b167ffb3dc25d; pgv_pvid=2605897556; fqm_pvqid=c38eee7f-1f49-4867-8fb4-8dbb764cb93b; ts_uid=4584087650; pac_uid=0_xXEQBtbyPnKSj; omgid=0_SK8mZi6ZyjtN4; _qimei_q32=d611a6803057686110470945b0c17a21; _qimei_q36=fcef018f916225c22be032db30001e219617; _qimei_h38=e8d664cf2171af215382857302000000719801; eas_sid=I1j7m5e9o2O188P6Y4P7D745Z4; fqm_sessionid=f2c44c43-4d85-4dcb-99c0-cef6d6e2b0cb; pgv_info=ssid=s1311374400; ts_last=y.qq.com/; ts_refer=cn.bing.com/; _qpsvr_localtk=0.1390152059728047; login_type=1; psrf_access_token_expiresAt=1765271149; psrf_qqopenid=DE4C1520CB81DEEF7C0BE8E9B0FD2783; wxrefresh_token=; music_ignore_pskey=202306271436Hn@vBj; wxunionid=; euin=owv5oeCioiEAoz**; wxopenid=; tmeLoginType=2; psrf_qqrefresh_token=A9707E145813679F3654C6E051AA3E2F; psrf_qqaccess_token=C0591D34DF4A719D28815DBA71122DC5; psrf_musickey_createtime=1760087149; psrf_qqunionid=AD81CE40E407AFA9A2F984D05F7F5CD6; uin=2410633923; qm_keyst=Q_H_L_63k3NMFc5RtmTBDyGhskoc5AjaymIKYUZThRS2bJfh0AHztt8D10MRy1XN-MEAUtIkdF_oauym2Y51IbgjNvw1Wu8hZECDA; qqmusic_key=Q_H_L_63k3NMFc5RtmTBDyGhskoc5AjaymIKYUZThRS2bJfh0AHztt8D10MRy1XN-MEAUtIkdF_oauym2Y51IbgjNvw1Wu8hZECDA' + const res = await fetch(`https://met.hxyouzi.com/api?server=${server}&type=playlist&id=${gdid}`) + let mlist: any = await res.json() data.audio = [] mlist.forEach((i: any) => { data.audio.push({ - title: i.name, - author: i.artist, + title: i.title, + author: i.author, url: i.url, pic: i.pic, lrc: i.lrc, diff --git a/src/components/homeSide.vue b/src/components/homeSide.vue index 38841e7..9f21f5b 100644 --- a/src/components/homeSide.vue +++ b/src/components/homeSide.vue @@ -1,37 +1,27 @@ @@ -119,9 +133,8 @@ onUnmounted(() => { src: url('@/assets/font/LCDML.woff2'); } -.dt-card { - background-image: url('@/assets/images/中秋节中国风边框34.png'); - background-size: 100% 100%; - padding: 20px 40px; -} - \ No newline at end of file +// .dt-card { +// background-image: url('@/assets/images/中秋节中国风边框34.png'); +// background-size: 100% 100%; +// padding: 20px 40px; +// } \ No newline at end of file diff --git a/src/components/menuH.vue b/src/components/menuH.vue index c25d877..788b9b6 100644 --- a/src/components/menuH.vue +++ b/src/components/menuH.vue @@ -32,8 +32,8 @@ -
- +
+ {{ locationInfo }} @@ -41,8 +41,11 @@ {{ wea }} {{ temp }}°C - - +
+ +
+ +
@@ -69,6 +72,7 @@ const key = ref("home"); const locationInfo = ref("获取位置中..."); const latitude = ref(null); const longitude = ref(null); +const fxlink = ref("#") const wea = ref("") const weaIcon = ref("") const temp = ref(0); @@ -96,13 +100,13 @@ const getLocation = () => { async (error) => { switch (error.code) { case error.PERMISSION_DENIED: - locationInfo.value = "用户拒绝了位置请求"; + locationInfo.value = "正在定位..."; break; case error.POSITION_UNAVAILABLE: - locationInfo.value = "位置信息不可用"; + locationInfo.value = "正在定位..."; break; case error.TIMEOUT: - locationInfo.value = "获取位置超时"; + locationInfo.value = "正在定位..."; break; } const res = await $http.mix.getIp(); @@ -125,11 +129,12 @@ async function handdleJw(jw: string) { const zxs = ['北京', '重庆', '天津', '上海'] // 根据经纬度获取物理位置 const loc = await $http.mix.getLocation({ location: jw }); - console.log(loc); + console.log('>>> --> handdleJw --> loc:', loc) + fxlink.value = loc.data.fxLink if (loc.code == 200) { const data = loc.data; if (zxs.includes(data.adm2)) { - locationInfo.value = `${data.country}${data.adm1}${data.name}`; + locationInfo.value = `${data.adm1}${data.name}`; } else { locationInfo.value = `${data.adm1}${data.adm2}${data.name}`; } @@ -138,7 +143,7 @@ async function handdleJw(jw: string) { return } const res = await $http.mix.getWeather({ location: jw }); - console.log(res); + console.log('>>> --> handdleJw --> res:', res) if (res.code == 200) { wea.value = res.data.text; weaIcon.value = res.data.icon; @@ -158,11 +163,17 @@ function goHome() { } function toLogin() { + console.log('>>> --> toLogin --> toLogin:', 'toLogin') + if ($cookies.get('token')) return router.push('/login'); } - +function gotoHf(){ + console.log('>>> --> gotoHf --> fxlink:', fxlink) + window.open(fxlink.value,"_BLACK") + +} onMounted(() => { userinfo.value = $cookies.get('userinfo'); diff --git a/src/views/Article.vue b/src/views/Article.vue index cec5a54..44dc331 100644 --- a/src/views/Article.vue +++ b/src/views/Article.vue @@ -1,18 +1,28 @@