From c2fb20469238f2bd211159504fd90eb79e03c9ab Mon Sep 17 00:00:00 2001
From: wangjie52 <wangjie52@baijia.com>
Date: Sat, 2 Aug 2025 18:31:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=8F=8F=E8=BF=B0=E4=B8=BA=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=9F=B3=E4=B9=90=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=8C=E7=AE=80=E5=8C=96=E9=9F=B3?=
 =?UTF-8?q?=E4=B9=90=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/api/content/recommend.js         |  3 +-
 .../src/views/content/recommend/index.vue     | 47 +++++++++++++++++--
 ruoyi-ui/src/views/playlist/normal/index.vue  |  4 +-
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/api/content/recommend.js b/ruoyi-ui/src/api/content/recommend.js
index 56ea5b1..8f6f4ae 100644
--- a/ruoyi-ui/src/api/content/recommend.js
+++ b/ruoyi-ui/src/api/content/recommend.js
@@ -61,7 +61,7 @@ export function delRecommend(id) {
 // 获取推荐已绑定的音乐
 export function getRecommendBoundMusic(recommendId) {
   return request({
-    url: `/back/re/cate/music/${recommendId}`,
+    url: `/back/re/music/${recommendId}`,
     method: 'get'
   })
 }
@@ -71,6 +71,5 @@ export function bindMusicToRecommend(recommendId, musicIds) {
   return request({
     url: `/back/re/bind/${recommendId}/${musicIds.join(',')}`,
     method: 'put',
-    baseURL: 'http://60.205.107.210:8080'
   })
 } 
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/content/recommend/index.vue b/ruoyi-ui/src/views/content/recommend/index.vue
index d9e0819..d8ad823 100644
--- a/ruoyi-ui/src/views/content/recommend/index.vue
+++ b/ruoyi-ui/src/views/content/recommend/index.vue
@@ -87,7 +87,7 @@
         <el-form-item label="推荐名称" prop="name" required>
           <el-input v-model="form.name" placeholder="请输入推荐名称" />
         </el-form-item>
-        <el-form-item label="推荐描述" prop="desc">
+        <el-form-item label="推荐描述" prop="desc" required>
           <el-input v-model="form.desc" type="textarea" :rows="3" placeholder="请输入推荐描述" />
         </el-form-item>
         <el-form-item label="推荐图片" required>
@@ -116,12 +116,36 @@
 
     <!-- 绑定音乐对话框 -->
     <el-dialog title="绑定音乐" :visible.sync="bindMusicOpen" width="800px" append-to-body>
+      <!-- 搜索表单 -->
+      <el-form :model="musicQueryParams" ref="musicQueryForm" size="small" :inline="true" label-width="80px" style="margin-bottom: 15px;">
+        <el-form-item label="音乐名称" prop="name">
+          <el-input
+            v-model="musicQueryParams.name"
+            placeholder="请输入音乐名称"
+            clearable
+            style="width: 150px"
+            @keyup.enter.native="handleMusicQuery"
+          />
+        </el-form-item>
+        <el-form-item label="音乐类型" prop="musicType">
+          <el-select v-model="musicQueryParams.musicType" placeholder="选择音乐类型" clearable style="width: 150px">
+            <el-option label="全部" value="" />
+            <el-option label="普通歌曲" value="ordinary" />
+            <el-option label="混音歌曲" value="mixing" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleMusicQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetMusicQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
       <el-table 
         ref="musicTable"
         v-loading="musicLoading" 
         :data="musicList" 
         @selection-change="handleMusicSelectionChange"
-        height="400"
+        style="max-height: 300px; overflow-y: auto;"
       >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="音乐名称" align="center" prop="name" :show-overflow-tooltip="true" />
@@ -166,6 +190,7 @@
         :page.sync="musicQueryParams.pageNum"
         :limit.sync="musicQueryParams.pageSize"
         @pagination="handleMusicPagination"
+        style="margin-top: 15px;"
       />
       
       <div slot="footer" class="dialog-footer">
@@ -216,6 +241,9 @@ export default {
       rules: {
         name: [
           { required: true, message: "推荐名称不能为空", trigger: "blur" }
+        ],
+        desc: [
+          { required: true, message: "推荐描述不能为空", trigger: "blur" }
         ]
       },
       // 图片上传状态
@@ -230,7 +258,8 @@ export default {
       musicQueryParams: {
         pageNum: 1,
         pageSize: 10,
-        musicType: null
+        name: null,
+        musicType: ''
       },
       bindLoading: false
     };
@@ -505,6 +534,18 @@ export default {
       this.musicQueryParams.pageNum = val.pageNum;
       this.musicQueryParams.pageSize = val.pageSize;
       this.getMusicList();
+    },
+    /** 搜索音乐 */
+    handleMusicQuery() {
+      this.musicQueryParams.pageNum = 1;
+      this.getMusicList();
+    },
+    /** 重置音乐搜索 */
+    resetMusicQuery() {
+      this.resetForm("musicQueryForm");
+      // 重置后保持musicType为空（显示全部）
+      this.musicQueryParams.musicType = '';
+      this.handleMusicQuery();
     }
   }
 };
diff --git a/ruoyi-ui/src/views/playlist/normal/index.vue b/ruoyi-ui/src/views/playlist/normal/index.vue
index 67f931e..a0fa520 100644
--- a/ruoyi-ui/src/views/playlist/normal/index.vue
+++ b/ruoyi-ui/src/views/playlist/normal/index.vue
@@ -241,7 +241,7 @@ export default {
         author: null,
         vip: null,
         shelf: null,
-        musicType: null
+        musicType: 'ordinary'
       },
       form: {},
       rules: {
@@ -327,6 +327,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      // 重置后保持musicType为ordinary
+      this.queryParams.musicType = 'ordinary';
       this.handleQuery();
     },
     /** 新增按钮操作 */