diff --git a/ruoyi-ui/src/api/playlist/normal.js b/ruoyi-ui/src/api/playlist/normal.js
new file mode 100644
index 0000000..884c5bf
--- /dev/null
+++ b/ruoyi-ui/src/api/playlist/normal.js
@@ -0,0 +1,83 @@
+import request from '@/utils/request'
+
+// 查询普通歌曲列表
+export function listNormalSong(query) {
+  return request({
+    url: '/back/normal/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询普通歌曲详细
+export function getNormalSong(id) {
+  return request({
+    url: '/back/normal/' + id,
+    method: 'get'
+  })
+}
+
+// 新增普通歌曲
+export function addNormalSong(data) {
+  const formData = new FormData()
+  formData.append('musicName', data.musicName)
+  formData.append('producer', data.producer)
+  formData.append('fileType', data.fileType)
+  formData.append('permission', data.permission)
+  formData.append('categoryConfig', data.categoryConfig)
+  formData.append('category', data.category)
+  formData.append('tags', JSON.stringify(data.tags))
+  formData.append('status', data.status)
+  formData.append('audioType', data.audioType)
+  if (data.songFile) {
+    formData.append('songFile', data.songFile)
+  }
+  if (data.coverFile) {
+    formData.append('coverFile', data.coverFile)
+  }
+  return request({
+    url: '/back/normal/add',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+// 修改普通歌曲
+export function updateNormalSong(data) {
+  const formData = new FormData()
+  formData.append('id', data.id)
+  formData.append('musicName', data.musicName)
+  formData.append('producer', data.producer)
+  formData.append('fileType', data.fileType)
+  formData.append('permission', data.permission)
+  formData.append('categoryConfig', data.categoryConfig)
+  formData.append('category', data.category)
+  formData.append('tags', JSON.stringify(data.tags))
+  formData.append('status', data.status)
+  formData.append('audioType', data.audioType)
+  if (data.songFile) {
+    formData.append('songFile', data.songFile)
+  }
+  if (data.coverFile) {
+    formData.append('coverFile', data.coverFile)
+  }
+  return request({
+    url: '/back/normal/update',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+// 删除普通歌曲
+export function delNormalSong(id) {
+  return request({
+    url: '/back/normal/' + id,
+    method: 'delete'
+  })
+} 
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/playlist/playlist.js b/ruoyi-ui/src/api/playlist/playlist.js
new file mode 100644
index 0000000..c5325d2
--- /dev/null
+++ b/ruoyi-ui/src/api/playlist/playlist.js
@@ -0,0 +1,75 @@
+import request from '@/utils/request'
+
+// 查询歌单列表
+export function listPlaylist(query) {
+  return request({
+    url: '/back/playlist/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询歌单详细
+export function getPlaylist(id) {
+  return request({
+    url: '/back/playlist/' + id,
+    method: 'get'
+  })
+}
+
+// 新增歌单
+export function addPlaylist(data) {
+  const formData = new FormData()
+  formData.append('musicName', data.musicName)
+  formData.append('producer', data.producer)
+  formData.append('fileType', data.fileType)
+  formData.append('permission', data.permission)
+  formData.append('category', data.category)
+  formData.append('tags', JSON.stringify(data.tags))
+  formData.append('status', data.status)
+  formData.append('audioType', data.audioType)
+  if (data.file) {
+    formData.append('file', data.file)
+  }
+  return request({
+    url: '/back/playlist/add',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+// 修改歌单
+export function updatePlaylist(data) {
+  const formData = new FormData()
+  formData.append('id', data.id)
+  formData.append('musicName', data.musicName)
+  formData.append('producer', data.producer)
+  formData.append('fileType', data.fileType)
+  formData.append('permission', data.permission)
+  formData.append('category', data.category)
+  formData.append('tags', JSON.stringify(data.tags))
+  formData.append('status', data.status)
+  formData.append('audioType', data.audioType)
+  if (data.file) {
+    formData.append('file', data.file)
+  }
+  return request({
+    url: '/back/playlist/update',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+// 删除歌单
+export function delPlaylist(id) {
+  return request({
+    url: '/back/playlist/' + id,
+    method: 'delete'
+  })
+} 
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/playlist/remix.js b/ruoyi-ui/src/api/playlist/remix.js
new file mode 100644
index 0000000..df95996
--- /dev/null
+++ b/ruoyi-ui/src/api/playlist/remix.js
@@ -0,0 +1,75 @@
+import request from '@/utils/request'
+
+// 查询混音歌曲列表
+export function listRemixSong(query) {
+  return request({
+    url: '/back/remix/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询混音歌曲详细
+export function getRemixSong(id) {
+  return request({
+    url: '/back/remix/' + id,
+    method: 'get'
+  })
+}
+
+// 获取音乐列表（用于选择场景音乐）
+export function getMusicList() {
+  return request({
+    url: '/back/music/list',
+    method: 'get'
+  })
+}
+
+// 新增混音歌曲
+export function addRemixSong(data) {
+  const formData = new FormData()
+  formData.append('remixName', data.remixName)
+  formData.append('permission', data.permission)
+  formData.append('categoryConfig', data.categoryConfig)
+  formData.append('category', data.category)
+  formData.append('tags', JSON.stringify(data.tags))
+  formData.append('status', data.status)
+  formData.append('selectedSongs', JSON.stringify(data.selectedSongs))
+  return request({
+    url: '/back/remix/add',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+// 修改混音歌曲
+export function updateRemixSong(data) {
+  const formData = new FormData()
+  formData.append('id', data.id)
+  formData.append('remixName', data.remixName)
+  formData.append('permission', data.permission)
+  formData.append('categoryConfig', data.categoryConfig)
+  formData.append('category', data.category)
+  formData.append('tags', JSON.stringify(data.tags))
+  formData.append('status', data.status)
+  formData.append('selectedSongs', JSON.stringify(data.selectedSongs))
+  return request({
+    url: '/back/remix/update',
+    method: 'post',
+    data: formData,
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    }
+  })
+}
+
+// 删除混音歌曲
+export function delRemixSong(id) {
+  return request({
+    url: '/back/remix/' + id,
+    method: 'delete'
+  })
+} 
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/user/user.js b/ruoyi-ui/src/api/user/user.js
new file mode 100644
index 0000000..b0cd5e4
--- /dev/null
+++ b/ruoyi-ui/src/api/user/user.js
@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+// 查询用户列表
+export function listUser(query) {
+  return request({
+    url: '/back/user/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户详细
+export function getUser(id) {
+  return request({
+    url: '/back/user/' + id,
+    method: 'get'
+  })
+}
+
+// 修改用户状态
+export function updateUserStatus(id, status) {
+  return request({
+    url: '/back/user/status',
+    method: 'post',
+    data: {
+      id: id,
+      status: status
+    }
+  })
+}
+
+// 删除用户
+export function delUser(id) {
+  return request({
+    url: '/back/user/' + id,
+    method: 'delete'
+  })
+} 
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/playlist/normal/index.vue b/ruoyi-ui/src/views/playlist/normal/index.vue
new file mode 100644
index 0000000..dc8957b
--- /dev/null
+++ b/ruoyi-ui/src/views/playlist/normal/index.vue
@@ -0,0 +1,469 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="音乐名称" prop="musicName">
+        <el-input
+          v-model="queryParams.musicName"
+          placeholder="请输入音乐名称查找"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="选择分类" prop="category">
+        <el-select v-model="queryParams.category" placeholder="选择分类" clearable style="width: 150px">
+          <el-option
+            v-for="item in categoryOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择标签" prop="tag">
+        <el-select v-model="queryParams.tag" placeholder="选择标签" clearable style="width: 150px">
+          <el-option
+            v-for="item in tagOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="选择上架状态" clearable style="width: 150px">
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择权限" prop="permission">
+        <el-select v-model="queryParams.permission" placeholder="选择权限" clearable style="width: 150px">
+          <el-option
+            v-for="item in permissionOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">+ 新增歌曲</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="playlistList">
+      <el-table-column label="序号" align="center" type="index" width="60" />
+      <el-table-column label="音乐名称" align="center" prop="musicName" :show-overflow-tooltip="true" />
+      <el-table-column label="制作人" align="center" prop="producer" :show-overflow-tooltip="true" />
+      <el-table-column label="上传时间" align="center" prop="uploadTime" width="120" />
+      <el-table-column label="文件类型" align="center" prop="fileType" width="80" />
+      <el-table-column label="权限" align="center" prop="permission" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.permission === 1 ? 'VIP' : '免费' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分类" align="center" prop="category" width="100">
+        <template slot-scope="scope">
+          <el-tag type="primary" size="mini">{{ scope.row.category }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="标签" align="center" prop="tags" width="150">
+        <template slot-scope="scope">
+          <el-tag 
+            v-for="tag in scope.row.tags" 
+            :key="tag" 
+            type="warning" 
+            size="mini" 
+            style="margin-right: 5px;"
+          >
+            {{ tag }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" width="80">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'" size="mini">
+            {{ scope.row.status === 1 ? '上架' : '下架' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="音频类型" align="center" prop="audioType" width="120" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['playlist:normal:edit']"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['playlist:normal:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改普通歌曲对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="音乐名称" prop="musicName" required>
+          <el-input v-model="form.musicName" placeholder="请输入音乐名称" />
+        </el-form-item>
+        <el-form-item label="制作人" prop="producer" required>
+          <el-input v-model="form.producer" placeholder="请输入制作人" />
+        </el-form-item>
+        <el-form-item label="文件类型" prop="fileType" required>
+          <el-select v-model="form.fileType" placeholder="请选择文件类型" style="width: 100%">
+            <el-option label="mp3" value="mp3" />
+            <el-option label="wav" value="wav" />
+            <el-option label="flac" value="flac" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="权限" prop="permission" required>
+          <el-select v-model="form.permission" placeholder="请选择权限" style="width: 100%">
+            <el-option label="免费" :value="0" />
+            <el-option label="VIP" :value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分类配置" prop="categoryConfig" required>
+          <el-select v-model="form.categoryConfig" placeholder="请选择分类" style="width: 100%">
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签" prop="tags">
+          <el-select v-model="form.tags" multiple placeholder="请添加标签 (可多选)" style="width: 100%">
+            <el-option
+              v-for="item in tagOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分类" prop="category" required>
+          <el-select v-model="form.category" placeholder="请选择分类" style="width: 100%">
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="音频类型" prop="audioType" required>
+          <el-select v-model="form.audioType" placeholder="请选择音频类型" style="width: 100%">
+            <el-option label="普通歌曲" value="普通歌曲" />
+            <el-option label="场景音乐" value="场景音乐" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上架状态" prop="status" required>
+          <el-switch v-model="form.status" active-value="1" inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="上传歌曲" required>
+          <el-upload
+            action=""
+            :auto-upload="false"
+            :show-file-list="false"
+            :on-change="handleSongFileChange"
+            :before-upload="beforeSongFileUpload"
+            class="song-uploader"
+          >
+            <div v-if="form.songUrl" class="song-preview">
+              <i class="el-icon-video-play"></i>
+              <span>{{ form.songFileName || '已选择歌曲文件' }}</span>
+            </div>
+            <i v-else class="el-icon-plus song-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="上传封面">
+          <el-upload
+            action=""
+            :auto-upload="false"
+            :show-file-list="false"
+            :on-change="handleCoverFileChange"
+            :before-upload="beforeCoverFileUpload"
+            class="cover-uploader"
+          >
+            <img v-if="form.coverUrl" :src="form.coverUrl" class="cover">
+            <i v-else class="el-icon-plus cover-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listNormalSong, getNormalSong, delNormalSong, addNormalSong, updateNormalSong } from "@/api/playlist/normal";
+
+export default {
+  name: "NormalSong",
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      playlistList: [],
+      title: "",
+      open: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        musicName: null,
+        category: null,
+        tag: null,
+        status: null,
+        permission: null
+      },
+      form: {},
+      rules: {
+        musicName: [{ required: true, message: "音乐名称不能为空", trigger: "blur" }],
+        producer: [{ required: true, message: "制作人不能为空", trigger: "blur" }],
+        fileType: [{ required: true, message: "文件类型不能为空", trigger: "change" }],
+        permission: [{ required: true, message: "权限不能为空", trigger: "change" }],
+        categoryConfig: [{ required: true, message: "分类配置不能为空", trigger: "change" }],
+        category: [{ required: true, message: "分类不能为空", trigger: "change" }],
+        audioType: [{ required: true, message: "音频类型不能为空", trigger: "change" }]
+      },
+      categoryOptions: [
+        { label: '热门', value: '热门' },
+        { label: '流行', value: '流行' },
+        { label: '摇滚', value: '摇滚' },
+        { label: '古典', value: '古典' },
+        { label: '爵士', value: '爵士' }
+      ],
+      tagOptions: [
+        { label: '流行', value: '流行' },
+        { label: '摇滚', value: '摇滚' },
+        { label: '古典', value: '古典' },
+        { label: '爵士', value: '爵士' },
+        { label: '电子', value: '电子' },
+        { label: '民谣', value: '民谣' },
+        { label: '电音', value: '电音' }
+      ],
+      statusOptions: [
+        { label: '下架', value: 0 },
+        { label: '上架', value: 1 }
+      ],
+      permissionOptions: [
+        { label: '免费', value: 0 },
+        { label: 'VIP', value: 1 }
+      ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listNormalSong(this.queryParams).then(response => {
+        this.playlistList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    reset() {
+      this.form = {
+        id: null,
+        musicName: null,
+        producer: null,
+        uploadTime: null,
+        fileType: null,
+        permission: 0,
+        categoryConfig: null,
+        category: null,
+        tags: [],
+        status: 1,
+        audioType: '普通歌曲',
+        songUrl: null,
+        songFileName: null,
+        songFile: null,
+        coverUrl: null,
+        coverFile: null
+      };
+      this.resetForm("form");
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增普通歌曲";
+    },
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getNormalSong(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "编辑普通歌曲";
+      });
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateNormalSong(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addNormalSong(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除歌曲编号为"' + ids + '"的数据项？').then(function() {
+        return delNormalSong(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    handleSongFileChange(file) {
+      this.form.songFile = file.raw;
+      this.form.songFileName = file.name;
+      this.form.songUrl = URL.createObjectURL(file.raw);
+    },
+    handleCoverFileChange(file) {
+      this.form.coverFile = file.raw;
+      this.form.coverUrl = URL.createObjectURL(file.raw);
+    },
+    beforeSongFileUpload(file) {
+      const isMusic = file.type === 'audio/mpeg' || file.type === 'audio/wav' || file.type === 'audio/flac';
+      const isLt50M = file.size / 1024 / 1024 < 50;
+
+      if (!isMusic) {
+        this.$message.error('上传文件只能是音频格式!');
+        return false;
+      }
+      if (!isLt50M) {
+        this.$message.error('上传文件大小不能超过 50MB!');
+        return false;
+      }
+      return true;
+    },
+    beforeCoverFileUpload(file) {
+      const isImage = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif';
+      const isLt2M = file.size / 1024 / 1024 < 2;
+
+      if (!isImage) {
+        this.$message.error('上传封面只能是图片格式!');
+        return false;
+      }
+      if (!isLt2M) {
+        this.$message.error('上传封面大小不能超过 2MB!');
+        return false;
+      }
+      return true;
+    }
+  }
+};
+</script>
+
+<style scoped>
+.song-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.song-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.song-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 200px;
+  height: 60px;
+  line-height: 60px;
+  text-align: center;
+}
+.song-preview {
+  width: 200px;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #f5f7fa;
+  border-radius: 6px;
+}
+.song-preview i {
+  font-size: 20px;
+  color: #409EFF;
+  margin-right: 8px;
+}
+.cover-uploader .el-upload {
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.cover-uploader .el-upload:hover {
+  border-color: #409EFF;
+}
+.cover-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 100px;
+  height: 100px;
+  line-height: 100px;
+  text-align: center;
+}
+.cover {
+  width: 100px;
+  height: 100px;
+  display: block;
+}
+.el-tag {
+  border-radius: 12px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/playlist/remix/index.vue b/ruoyi-ui/src/views/playlist/remix/index.vue
new file mode 100644
index 0000000..c209e9e
--- /dev/null
+++ b/ruoyi-ui/src/views/playlist/remix/index.vue
@@ -0,0 +1,452 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
+      <el-form-item label="音乐名称" prop="musicName">
+        <el-input
+          v-model="queryParams.musicName"
+          placeholder="请输入音乐名称查找"
+          clearable
+          style="width: 200px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="选择分类" prop="category">
+        <el-select v-model="queryParams.category" placeholder="选择分类" clearable style="width: 150px">
+          <el-option
+            v-for="item in categoryOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择标签" prop="tag">
+        <el-select v-model="queryParams.tag" placeholder="选择标签" clearable style="width: 150px">
+          <el-option
+            v-for="item in tagOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="上架状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="选择上架状态" clearable style="width: 150px">
+          <el-option
+            v-for="item in statusOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择权限" prop="permission">
+        <el-select v-model="queryParams.permission" placeholder="选择权限" clearable style="width: 150px">
+          <el-option
+            v-for="item in permissionOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">+ 新增混音</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="playlistList">
+      <el-table-column label="序号" align="center" type="index" width="60" />
+      <el-table-column label="混音名称" align="center" prop="remixName" :show-overflow-tooltip="true" />
+      <el-table-column label="二类音乐名称" align="center" prop="secondMusicName" :show-overflow-tooltip="true" />
+      <el-table-column label="制作时间" align="center" prop="productionTime" width="120" />
+      <el-table-column label="文件类型" align="center" prop="fileType" width="120" />
+      <el-table-column label="权限" align="center" prop="permission" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.permission === 1 ? 'VIP' : '免费' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分类" align="center" prop="category" width="100">
+        <template slot-scope="scope">
+          <el-tag type="primary" size="mini">{{ scope.row.category }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="标签" align="center" prop="tags" width="150">
+        <template slot-scope="scope">
+          <el-tag 
+            v-for="tag in scope.row.tags" 
+            :key="tag" 
+            type="warning" 
+            size="mini" 
+            style="margin-right: 5px;"
+          >
+            {{ tag }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" width="80">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'" size="mini">
+            {{ scope.row.status === 1 ? '上架' : '下架' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['playlist:remix:edit']"
+          >编辑</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['playlist:remix:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改混音歌曲对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="混音名称" prop="remixName" required>
+          <el-input v-model="form.remixName" placeholder="请输入音乐名称" />
+        </el-form-item>
+        <el-form-item label="权限" prop="permission" required>
+          <el-select v-model="form.permission" placeholder="请选择权限" style="width: 100%">
+            <el-option label="免费" :value="0" />
+            <el-option label="VIP" :value="1" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分类配置" prop="categoryConfig" required>
+          <el-select v-model="form.categoryConfig" placeholder="请选择分类" style="width: 100%">
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标签" prop="tags">
+          <el-select v-model="form.tags" multiple placeholder="请添加标签 (可多选)" style="width: 100%">
+            <el-option
+              v-for="item in tagOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分类" prop="category" required>
+          <el-select v-model="form.category" placeholder="请选择分类" style="width: 100%">
+            <el-option
+              v-for="item in categoryOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="上架状态" prop="status" required>
+          <el-switch v-model="form.status" active-value="1" inactive-value="0" />
+        </el-form-item>
+        <el-form-item label="添加场景音乐" required>
+          <div class="scene-music-container">
+            <div 
+              v-for="(item, index) in 3" 
+              :key="index"
+              class="scene-music-item"
+              @click="selectSceneMusic(index)"
+            >
+              <div v-if="form.selectedSongs[index]" class="selected-music">
+                <img :src="form.selectedSongs[index].coverUrl" class="music-cover">
+                <span class="music-name">{{ form.selectedSongs[index].musicName }}</span>
+                <i class="el-icon-close remove-btn" @click.stop="removeSceneMusic(index)"></i>
+              </div>
+              <div v-else class="add-music-btn">
+                <i class="el-icon-plus"></i>
+              </div>
+            </div>
+          </div>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 选择场景音乐对话框 -->
+    <el-dialog title="选择场景音乐" :visible.sync="musicSelectOpen" width="800px" append-to-body>
+      <el-table :data="musicList" @selection-change="handleMusicSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column label="音乐名称" prop="musicName" />
+        <el-table-column label="制作人" prop="producer" />
+        <el-table-column label="分类" prop="category" />
+        <el-table-column label="标签" prop="tags">
+          <template slot-scope="scope">
+            <el-tag 
+              v-for="tag in scope.row.tags" 
+              :key="tag" 
+              type="warning" 
+              size="mini" 
+              style="margin-right: 5px;"
+            >
+              {{ tag }}
+            </el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmMusicSelection">确 定</el-button>
+        <el-button @click="musicSelectOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRemixSong, getRemixSong, delRemixSong, addRemixSong, updateRemixSong, getMusicList } from "@/api/playlist/remix";
+
+export default {
+  name: "RemixSong",
+  data() {
+    return {
+      loading: true,
+      showSearch: true,
+      total: 0,
+      playlistList: [],
+      title: "",
+      open: false,
+      musicSelectOpen: false,
+      currentMusicIndex: 0,
+      musicList: [],
+      selectedMusic: null,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        musicName: null,
+        category: null,
+        tag: null,
+        status: null,
+        permission: null
+      },
+      form: {
+        selectedSongs: []
+      },
+      rules: {
+        remixName: [{ required: true, message: "混音名称不能为空", trigger: "blur" }],
+        permission: [{ required: true, message: "权限不能为空", trigger: "change" }],
+        categoryConfig: [{ required: true, message: "分类配置不能为空", trigger: "change" }],
+        category: [{ required: true, message: "分类不能为空", trigger: "change" }]
+      },
+      categoryOptions: [
+        { label: '热门', value: '热门' },
+        { label: '流行', value: '流行' },
+        { label: '摇滚', value: '摇滚' },
+        { label: '古典', value: '古典' },
+        { label: '爵士', value: '爵士' }
+      ],
+      tagOptions: [
+        { label: '流行', value: '流行' },
+        { label: '摇滚', value: '摇滚' },
+        { label: '古典', value: '古典' },
+        { label: '爵士', value: '爵士' },
+        { label: '电子', value: '电子' },
+        { label: '民谣', value: '民谣' },
+        { label: '电音', value: '电音' },
+        { label: '混音', value: '混音' },
+        { label: '睡眠', value: '睡眠' }
+      ],
+      statusOptions: [
+        { label: '下架', value: 0 },
+        { label: '上架', value: 1 }
+      ],
+      permissionOptions: [
+        { label: '免费', value: 0 },
+        { label: 'VIP', value: 1 }
+      ]
+    };
+  },
+  created() {
+    this.getList();
+    this.getMusicListData();
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listRemixSong(this.queryParams).then(response => {
+        this.playlistList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    getMusicListData() {
+      getMusicList().then(response => {
+        this.musicList = response.rows || [];
+      });
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    reset() {
+      this.form = {
+        id: null,
+        remixName: null,
+        permission: 0,
+        categoryConfig: null,
+        category: null,
+        tags: [],
+        status: 1,
+        selectedSongs: []
+      };
+      this.resetForm("form");
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增混音歌曲";
+    },
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getRemixSong(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "编辑混音歌曲";
+      });
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateRemixSong(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRemixSong(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除混音歌曲编号为"' + ids + '"的数据项？').then(function() {
+        return delRemixSong(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    selectSceneMusic(index) {
+      this.currentMusicIndex = index;
+      this.musicSelectOpen = true;
+    },
+    handleMusicSelectionChange(selection) {
+      if (selection.length > 0) {
+        this.selectedMusic = selection[0];
+      }
+    },
+    confirmMusicSelection() {
+      if (this.selectedMusic) {
+        this.$set(this.form.selectedSongs, this.currentMusicIndex, this.selectedMusic);
+        this.musicSelectOpen = false;
+        this.selectedMusic = null;
+      }
+    },
+    removeSceneMusic(index) {
+      this.$delete(this.form.selectedSongs, index);
+    }
+  }
+};
+</script>
+
+<style scoped>
+.scene-music-container {
+  display: flex;
+  gap: 10px;
+}
+.scene-music-item {
+  width: 120px;
+  height: 120px;
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+.scene-music-item:hover {
+  border-color: #409EFF;
+}
+.add-music-btn {
+  font-size: 28px;
+  color: #8c939d;
+}
+.selected-music {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  position: relative;
+}
+.music-cover {
+  width: 60px;
+  height: 60px;
+  border-radius: 4px;
+  margin-bottom: 5px;
+}
+.music-name {
+  font-size: 12px;
+  color: #606266;
+  text-align: center;
+  max-width: 100px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.remove-btn {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  color: #f56c6c;
+  cursor: pointer;
+}
+.el-tag {
+  border-radius: 12px;
+}
+</style>
diff --git a/ruoyi-ui/src/views/user/manage/index.vue b/ruoyi-ui/src/views/user/manage/index.vue
new file mode 100644
index 0000000..ebcd621
--- /dev/null
+++ b/ruoyi-ui/src/views/user/manage/index.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="手机号/昵称" prop="searchKey">
+        <el-input
+          v-model="queryParams.searchKey"
+          placeholder="请输入手机号或昵称"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">筛选</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="userList">
+      <el-table-column label="用户id" align="center" prop="id" width="80" />
+      <el-table-column label="手机号" align="center" prop="phone" width="120" />
+      <el-table-column label="昵称" align="center" prop="nickname" :show-overflow-tooltip="true" />
+      <el-table-column label="性别" align="center" prop="gender" width="60">
+        <template slot-scope="scope">
+          <span>{{ scope.row.gender === 1 ? '男' : '女' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="生日" align="center" prop="birthday" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="城市" align="center" prop="addr" :show-overflow-tooltip="true" />
+      <el-table-column label="注册时间" align="center" prop="registerTime" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.registerTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" width="80">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.status === 1 ? 'success' : 'danger'" size="mini">
+            {{ scope.row.status === 1 ? '正常' : '黑名单' }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="会员状态" align="center" prop="vipStatus" width="100">
+        <template slot-scope="scope">
+          <span>{{ scope.row.vipStatus === 1 ? 'vip' : '普通用户' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="播放标签" align="center" prop="playTag" width="100">
+        <template slot-scope="scope">
+          <el-tag type="warning" size="mini">{{ scope.row.playTag }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="本周在线时长" align="center" prop="onlineTime" width="120">
+        <template slot-scope="scope">
+          <span>{{ scope.row.onlineTime }}小时</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            :style="{ color: scope.row.status === 1 ? '#F56C6C' : '#67C23A' }"
+            @click="handleStatusChange(scope.row)"
+          >
+            {{ scope.row.status === 1 ? '加入黑名单' : '取消加入黑名单' }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { listUser, updateUserStatus } from "@/api/user/user";
+
+export default {
+  name: "User",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        searchKey: null
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.queryParams).then(response => {
+        this.userList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 状态修改 */
+    handleStatusChange(row) {
+      const statusText = row.status === 1 ? "加入黑名单" : "取消加入黑名单";
+      const newStatus = row.status === 1 ? 0 : 1;
+      
+      this.$modal.confirm('确认要' + statusText + '用户"' + row.nickname + '"吗？').then(function() {
+        return updateUserStatus(row.id, newStatus);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess(statusText + "成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+
+<style scoped>
+.el-tag {
+  border-radius: 12px;
+}
+</style> 
\ No newline at end of file