diff --git a/src/components/Player.vue b/src/components/Player.vue
index e552993..777233d 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -35,12 +35,19 @@ function artistsOrganize(list: string[]) {
 
 function setMetadata() {
 	if ('mediaSession' in navigator) {
+		let current = (() => {
+			if (playQueueStore.playMode.shuffle) {
+				return playQueueStore.list[playQueueStore.shuffleList[playQueueStore.currentIndex]]
+			} else {
+				return playQueueStore.list[playQueueStore.currentIndex]
+			}
+		})()
 		navigator.mediaSession.metadata = new MediaMetadata({
-			title: playQueueStore.list[playQueueStore.currentIndex].song.name,
-			artist: artistsOrganize(playQueueStore.list[playQueueStore.currentIndex].song.artists ?? []),
-			album: playQueueStore.list[playQueueStore.currentIndex].album?.name,
+			title: current.song.name,
+			artist: artistsOrganize(current.song.artists ?? []),
+			album: current.album?.name,
 			artwork: [
-				{ src: playQueueStore.list[playQueueStore.currentIndex].album?.coverUrl ?? '', sizes: '500x500', type: 'image/png' },
+				{ src: current.album?.coverUrl ?? '', sizes: '500x500', type: 'image/png' },
 			]
 		})
 
@@ -140,12 +147,50 @@ watch(() => error.value, (newError) => {
 		console.error('[Player] 可视化器错误:', newError)
 	}
 })
+
+// 切换播放模式
+watch(() => playQueueStore.playMode.shuffle, (isShuffle) => {
+	if (isShuffle) {
+		// 提取当前歌曲的索引和队列中总项目数
+		const currentIndex = playQueueStore.currentIndex
+		const trackCount = playQueueStore.list.length
+		// 生成新的随机播放列表，该列表是原来列表的下标数组（保持原有的顺序不变，以便用户关闭随机播放时恢复原有队列）
+		// 将队列中剩余的项目随机排列，队列中更早的歌曲保持不变
+		let shuffledList = [...Array(currentIndex).keys()]
+		// 如果 shuffleCurrent 被指定为 false 或 undefined，那么将当前歌曲放在新列表的开头
+		if (!playQueueStore.shuffleCurrent) {
+			shuffledList.push(currentIndex)
+		}
+
+		// 将剩余的项目列出来
+		let shuffleSpace = [...Array(trackCount).keys()]
+		shuffleSpace = shuffleSpace.filter((item) => item > currentIndex)
+		console.log(shuffleSpace)
+		// 随机打乱剩余的项目
+		shuffleSpace.sort(() => Math.random() - 0.5)
+
+		// 拼接新队列
+		shuffledList = shuffledList.concat(shuffleSpace)
+
+		// 应用新的随机播放列表
+		playQueueStore.shuffleList = shuffledList
+	} else {
+		// 将当前播放的歌曲的原来的索引赋给 currentIndex
+		playQueueStore.currentIndex = playQueueStore.shuffleList[playQueueStore.currentIndex]
+	}
+})
 </script>
 
 <template>
 	<div>
 		<audio
-			:src="playQueueStore.list[playQueueStore.currentIndex] ? playQueueStore.list[playQueueStore.currentIndex].song.sourceUrl : ''"
+			:src="(() => {
+				if (playQueueStore.playMode.shuffle) {
+					return playQueueStore.list[playQueueStore.shuffleList[playQueueStore.currentIndex]] ? playQueueStore.list[playQueueStore.shuffleList[playQueueStore.currentIndex]].song.sourceUrl : ''
+				} else {
+					return playQueueStore.list[playQueueStore.currentIndex] ? playQueueStore.list[playQueueStore.currentIndex].song.sourceUrl : ''
+				}
+			})()"
 			ref="playerRef" 
 			:autoplay="playQueueStore.isPlaying" 
 			v-if="playQueueStore.list.length !== 0" 
diff --git a/src/pages/Playroom.vue b/src/pages/Playroom.vue
index 59603b2..9f2d0b3 100644
--- a/src/pages/Playroom.vue
+++ b/src/pages/Playroom.vue
@@ -134,39 +134,47 @@ function makePlayQueueListDismiss() {
 		ease: 'power2.out'
 	})
 }
+
+function getCurrentTrack() {
+	if (playQueueStore.playMode.shuffle) {
+		return playQueueStore.list[playQueueStore.shuffleList[playQueueStore.currentIndex]] 
+	} else {
+		return playQueueStore.list[playQueueStore.currentIndex]
+	}
+}
 </script>
 
 <template>
 	<div class="z-0 absolute top-0 left-0 w-screen h-screen"
-		v-if="playQueueStore.list[playQueueStore.currentIndex].album?.coverDeUrl">
+		v-if="getCurrentTrack().album?.coverDeUrl">
 		<img class="w-full h-full blur-2xl object-cover"
-			:src="playQueueStore.list[playQueueStore.currentIndex].album?.coverDeUrl" />
+			:src="getCurrentTrack().album?.coverDeUrl" />
 		<div class="bg-transparent w-full h-full absolute top-0 left-0" />
 	</div>
 
 	<div class="w-full flex justify-center items-center my-auto gap-16 z-10 select-none">
 		<div class="flex flex-col w-96 gap-4">
-			<img :src="playQueueStore.list[playQueueStore.currentIndex].album?.coverUrl"
+			<img :src="getCurrentTrack().album?.coverUrl"
 				class="rounded-2xl shadow-2xl border border-white/20 w-96 h-96" />
 			<div class="flex justify-between items-center">
 				<div class="relative flex-auto w-0">
 					<div class="">
 						<div class="text-black/90 blur-lg text-lg font-medium truncate">
-							{{ playQueueStore.list[playQueueStore.currentIndex].song.name }}
+							{{ getCurrentTrack().song.name }}
 						</div>
 						<div class="text-black/90 blur-lg text-base truncate">
-							{{ artistsOrganize(playQueueStore.list[playQueueStore.currentIndex].song.artists ?? []) }} —
-							{{ playQueueStore.list[playQueueStore.currentIndex].album?.name ?? '未知专辑' }}
+							{{ getCurrentTrack().song.artists ?? [] }} —
+							{{ getCurrentTrack().album?.name ?? '未知专辑' }}
 						</div>
 					</div>
 
 					<div class="absolute top-0">
 						<div class="text-white text-lg font-medium truncate">
-							{{ playQueueStore.list[playQueueStore.currentIndex].song.name }}
+							{{ getCurrentTrack().song.name }}
 						</div>
 						<div class="text-white/75 text-base truncate">
-							{{ artistsOrganize(playQueueStore.list[playQueueStore.currentIndex].song.artists ?? []) }} —
-							{{ playQueueStore.list[playQueueStore.currentIndex].album?.name ?? '未知专辑' }}
+							{{ artistsOrganize(getCurrentTrack().song.artists ?? []) }} —
+							{{ getCurrentTrack().album?.name ?? '未知专辑' }}
 						</div>
 					</div>
 
@@ -337,8 +345,12 @@ function makePlayQueueListDismiss() {
 
 			<div class="flex gap-2 mx-8 mb-4">
 				<button
-					class="text-white flex-1 h-9 bg-neutral-800/80 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl flex justify-center items-center"
-					@click="">
+					class="flex-1 h-9 border border-[#ffffff39] rounded-full text-center backdrop-blur-3xl flex justify-center items-center"
+					:class="playQueueStore.playMode.shuffle ? 'bg-[#ffffffaa] text-neutral-700' : 'text-white bg-neutral-800/80'"
+					@click="() => {
+						playQueueStore.playMode.shuffle = !playQueueStore.playMode.shuffle
+						playQueueStore.shuffleCurrent = false
+					}">
 					<ShuffleIcon :size="4" />
 				</button>
 				<button
@@ -350,7 +362,36 @@ function makePlayQueueListDismiss() {
 
 			<hr class="border-[#ffffff39]" />
 
-			<div class="flex-auto h-0 overflow-y-auto px-4 flex flex-col gap-2">
+			<div class="flex-auto h-0 overflow-y-auto px-4 flex flex-col gap-2" v-if="playQueueStore.playMode.shuffle">
+				<button v-for="(oriIndex, shuffledIndex) in playQueueStore.shuffleList" class="p-4 w-full rounded-md hover:bg-white/5 first:mt-2"
+					:key="oriIndex" @click="() => {
+						if (playQueueStore.currentIndex === shuffledIndex) { return }
+						playQueueStore.currentIndex = shuffledIndex
+						playQueueStore.isPlaying = true
+					}">
+					<div class="flex gap-2">
+						<div class="relative w-12 h-12 rounded-md shadow-xl overflow-hidden">
+							<img :src="playQueueStore.list[oriIndex].album?.coverUrl" />
+							<div class="w-full h-full absolute top-0 left-0 bg-neutral-900/75 flex justify-center items-center"
+								v-if="shuffledIndex === playQueueStore.currentIndex">
+								<div style="height: 1rem;" class="flex justify-center items-center gap-[.125rem]">
+									<div class="bg-white w-[.125rem] rounded-full" v-for="(bar, index) in playQueueStore.visualizer"
+										:key="index" :style="{
+											height: `${Math.max(10, bar)}%`
+										}" />
+								</div>
+							</div>
+						</div>
+						<div class="flex flex-col text-left flex-auto w-0">
+							<div class="text-white text-base font-medium truncate">{{ playQueueStore.list[oriIndex].song.name }}</div>
+							<div class="text-white/75 text-sm truncate">{{ artistsOrganize(playQueueStore.list[oriIndex].song.artists ?? []) }} —
+								{{ playQueueStore.list[oriIndex].album?.name ?? '未知专辑' }}
+							</div>
+						</div>
+					</div>
+				</button>
+			</div>
+			<div class="flex-auto h-0 overflow-y-auto px-4 flex flex-col gap-2" v-else>
 				<button v-for="(track, index) in playQueueStore.list" class="p-4 w-full rounded-md hover:bg-white/5 first:mt-2"
 					:key="track.song.cid" @click="() => {
 						if (playQueueStore.currentIndex === index) { return }
diff --git a/src/stores/usePlayQueueStore.ts b/src/stores/usePlayQueueStore.ts
index bb4fdf5..b4ce9b7 100644
--- a/src/stores/usePlayQueueStore.ts
+++ b/src/stores/usePlayQueueStore.ts
@@ -10,7 +10,16 @@ export const usePlayQueueStore = defineStore('queue', () =>{
 	const currentTime = ref<number>(0)
 	const duration = ref<number>(0)
 	const updatedCurrentTime = ref<number | null>(null)
-	const visualizer = ref<number[]>([0, 0, 0, 0])
+	const visualizer = ref<number[]>([0, 0, 0, 0, 0, 0])
+	const shuffleList = ref<number[]>([])
+	const playMode = ref<{
+		shuffle: boolean,
+		repeat: 'off' | 'single' | 'all'
+	}>({
+		shuffle: false,
+		repeat: 'off'
+	})
+	const shuffleCurrent = ref<boolean | undefined>(undefined)
 
-  return { list, currentIndex, isPlaying, queueReplaceLock, isBuffering, currentTime, duration, updatedCurrentTime, visualizer }
+  return { list, currentIndex, isPlaying, queueReplaceLock, isBuffering, currentTime, duration, updatedCurrentTime, visualizer, shuffleList, playMode, shuffleCurrent }
 })
\ No newline at end of file