diff --git a/music-client/public/index.html b/music-client/public/index.html index 9fcfb4b6..3e5a1396 100644 --- a/music-client/public/index.html +++ b/music-client/public/index.html @@ -4,7 +4,7 @@ - + <%= htmlWebpackPlugin.options.title %> diff --git a/music-client/public/musicClient.ico b/music-client/public/musicClient.ico deleted file mode 100644 index c8e25ba8..00000000 Binary files a/music-client/public/musicClient.ico and /dev/null differ diff --git a/music-client/src/api/index.ts b/music-client/src/api/index.ts index 5a66add0..e4a31464 100644 --- a/music-client/src/api/index.ts +++ b/music-client/src/api/index.ts @@ -29,10 +29,10 @@ const HttpManager = { // 返回歌单里指定歌单ID的歌曲 getListSongOfSongId: (songListId) => get(`listSong/detail?songListId=${songListId}`), - // =======================> 艺人 API 完成 - // 返回所有艺人 + // =======================> 歌手 API 完成 + // 返回所有歌手 getAllSinger: () => get("singer"), - // 通过性别对艺人分类 + // 通过性别对歌手分类 getSingerOfSex: (sex) => get(`singer/sex/detail?sex=${sex}`), // =======================> 收藏 API 完成 @@ -74,9 +74,9 @@ const HttpManager = { // =======================> 歌曲 API // 返回指定歌曲ID的歌曲 getSongOfId: (id) => get(`song/detail?id=${id}`), - // 返回指定艺人ID的歌曲 + // 返回指定歌手ID的歌曲 getSongOfSingerId: (id) => get(`song/singer/detail?singerId=${id}`), - // 返回指定艺人名的歌曲 + // 返回指定歌手名的歌曲 getSongOfSingerName: (keywords) => get(`song/singerName/detail?name=${keywords}`), // 下载音乐 downloadMusic: (url) => get(url, { responseType: "blob" }), diff --git a/music-client/src/components/SongList.vue b/music-client/src/components/SongList.vue index 358655e4..964b554e 100644 --- a/music-client/src/components/SongList.vue +++ b/music-client/src/components/SongList.vue @@ -2,7 +2,7 @@
- + diff --git a/music-client/src/components/layouts/YinPlayBar.vue b/music-client/src/components/layouts/YinPlayBar.vue index 6f6ba071..93dbe62f 100644 --- a/music-client/src/components/layouts/YinPlayBar.vue +++ b/music-client/src/components/layouts/YinPlayBar.vue @@ -9,7 +9,7 @@
- +
@@ -166,7 +166,7 @@ export default defineComponent({ "songId", // 音乐id "songUrl", // 音乐地址 "songTitle", // 歌名 - "singerName", // 艺人名 + "singerName", // 歌手名 "songPic", // 歌曲图片 "curTime", // 当前音乐的播放位置 "duration", // 音乐时长 diff --git a/music-client/src/enums/music-name.ts b/music-client/src/enums/music-name.ts index a6409f56..f42e9df6 100644 --- a/music-client/src/enums/music-name.ts +++ b/music-client/src/enums/music-name.ts @@ -1 +1 @@ -export const MUSICNAME = "Nan-Music"; +export const MUSICNAME = "Yin-music"; diff --git a/music-client/src/enums/nav.ts b/music-client/src/enums/nav.ts index 34dab9b2..5b82b83c 100644 --- a/music-client/src/enums/nav.ts +++ b/music-client/src/enums/nav.ts @@ -3,7 +3,7 @@ import { RouterName } from "./router-name"; export const enum NavName { Home = "首页", SongSheet = "歌单", - Singer = "艺人", + Singer = "歌手", Personal = "个人主页", Setting = "设置", SignIn = "登录", diff --git a/music-client/src/enums/singer.ts b/music-client/src/enums/singer.ts index b5e1d49b..4dea23d4 100644 --- a/music-client/src/enums/singer.ts +++ b/music-client/src/enums/singer.ts @@ -1,18 +1,18 @@ export const singerStyle = [ { - name: "全部艺人", + name: "全部歌手", type: "-1", }, { - name: "男艺人", + name: "男歌手", type: "1", }, { - name: "女艺人", + name: "女歌手", type: "0", }, { - name: "组合艺人", + name: "组合歌手", type: "2", }, ]; diff --git a/music-client/src/mixins/mixin.ts b/music-client/src/mixins/mixin.ts index a94822d1..286f16f8 100644 --- a/music-client/src/mixins/mixin.ts +++ b/music-client/src/mixins/mixin.ts @@ -28,7 +28,7 @@ export default function () { return str.split("-")[1]; } - // 获取艺人名 + // 获取歌手名 function getSingerName(str) { return str.split("-")[0]; } diff --git a/music-client/src/store/song.ts b/music-client/src/store/song.ts index 5bc77e3d..77e53f36 100644 --- a/music-client/src/store/song.ts +++ b/music-client/src/store/song.ts @@ -7,7 +7,7 @@ export default { songTitle: "", // 歌名 songUrl: "", // 音乐 URL songPic: `/img/songPic/tubiao.jpg`, // 歌曲图片 - singerName: "", // 艺人名 + singerName: "", // 歌手名 lyric: [], // 处理后的歌词数据 /** 音乐播放信息 */ diff --git a/music-client/src/views/FPassword.vue b/music-client/src/views/FPassword.vue index 92fcdac4..af33f1fd 100644 --- a/music-client/src/views/FPassword.vue +++ b/music-client/src/views/FPassword.vue @@ -7,9 +7,7 @@ - - {{ countdown > 0 ? `重新发送(${countdown}s)` : '发送验证码' }} - + 发送验证码 @@ -49,71 +47,55 @@ export default { email: "", code: "", password: "", - confirmPassword: "", - countdown: 0, + confirmPassword: "" }; }, methods: { async sendVerificationCode() { try { - const email = document.getElementById('email').value; - const { data: { message, success } } = await axios.get('http://localhost:8888/user/sendVerificationCode', { params: { email } }); - - console.log(message, success); - + const email =document.getElementById('email').value; + const response = await axios.get('http://localhost:8888/user/sendVerificationCode',({params: { + email: email + }})); + console.log(response.data); this.$message({ - message, - type: success ? 'success' : 'error' + message: response.data, + type: 'success' }); - - if (success) { - // 设置倒计时 - this.countdown = 58; - const timer = setInterval(() => { - if (this.countdown > 0) { - this.countdown--; - } else { - clearInterval(timer); - } - }, 1000); - } } catch (error) { - console.error('发送验证码异常', error); - this.$message({ - message: '发送验证码异常', - type: 'error' - }); - } - }, + console.error('Error submitting email:'); + this.$message({ + message: 'response.data', + type: 'error' + }); + } + }, async handleSubmit() { - try { - const email =document.getElementById('email').value; - const code=document.getElementById('code').value - const password=document.getElementById('password').value - const confirmPassword=document.getElementById('confirmPassword').value - const data = { - email: email, - code: code, - password: password, - confirmPassword: confirmPassword - }; - const { data: { message, success } } = await axios.post('http://localhost:8888/user/resetPassword', data); - console.log(message, success); - this.$message({ - message, - type: success ? 'success' : 'error' - }); - if (success){ - this.$router.back(); - } - } catch (error) { - console.error('提交异常', error); - this.$message({ - message: '提交异常', - type: 'error' - }); - } - } - }, + try { + const email =document.getElementById('email').value; + const code=document.getElementById('code').value + const password=document.getElementById('password').value + const confirmPassword=document.getElementById('confirmPassword').value + const data = { + email: email, + code: code, + password: password, + confirmPassword: confirmPassword + }; + const response = await axios.post('http://localhost:8888/user/resetPassword', data); + console.log(response.data); + this.$message({ + message: response.data, + type: 'success' + }); + } catch (error) { + this.$message({ + message: 'response.data', + type: 'error' + }); + } +} + +}, }; diff --git a/music-client/src/views/Home.vue b/music-client/src/views/Home.vue index 9a7d06fe..c1717f76 100644 --- a/music-client/src/views/Home.vue +++ b/music-client/src/views/Home.vue @@ -1,14 +1,14 @@