From 59f1f7a0bdc4c95b090c4602eb75f00e0c8046e6 Mon Sep 17 00:00:00 2001 From: 康鲁杰 <60095866+KangLujie@users.noreply.github.com> Date: 星期二, 22 四月 2025 10:58:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- easegen-front/src/views/myCourse/index.vue | 33 ++++++++++++++++++++++----------- 1 files changed, 22 insertions(+), 11 deletions(-) diff --git a/easegen-front/src/views/myCourse/index.vue b/easegen-front/src/views/myCourse/index.vue index 7229ee4..733bbab 100644 --- a/easegen-front/src/views/myCourse/index.vue +++ b/easegen-front/src/views/myCourse/index.vue @@ -293,7 +293,7 @@ <el-col :span="12"> <el-form-item label="鐗囧ご瑙嗛"> <div class="video-select-container"> - <div class="video-grid"> + <div class="video-grid" v-if="titlesList.length>0"> <div v-for="item in titlesList" :key="item.id" @@ -314,13 +314,17 @@ </div> </div> </div> + <div v-else> + <el-icon color="#ff0000" :size="20" style="vertical-align: middle"><Warning /></el-icon> + 鏆傛棤鐗囧ご瑙嗛锛岃鍦ㄣ�愮墖澶寸墖灏俱�戜笂浼狅紒 + </div> </div> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="鐗囧熬瑙嗛"> <div class="video-select-container"> - <div class="video-grid"> + <div class="video-grid" v-if="trailerList.length>0"> <div v-for="item in trailerList" :key="item.id" @@ -340,6 +344,10 @@ <el-icon v-if="formData1.value.trailer === item.url" class="selected-icon"><Check /></el-icon> </div> </div> + </div> + <div v-else> + <el-icon color="#ff0000" :size="20" style="vertical-align: middle"><Warning /></el-icon> + 鏆傛棤鐗囧熬瑙嗛锛岃鍦ㄣ�愮墖澶寸墖灏俱�戜笂浼狅紒 </div> </div> </el-form-item> @@ -899,17 +907,20 @@ 'tenant-id': getTenantId() } }) - - // 5. 璋冪敤淇濆瓨瀛楀箷鎺ュ彛 - const params = { - id: subtitleForm.videoId, - subtitlesUrl: uploadResponse.data.data, + if(uploadResponse.data.data){ + const params = { + id: subtitleForm.videoId, + subtitlesUrl: uploadResponse.data.data, + } + // 5. 璋冪敤淇濆瓨瀛楀箷鎺ュ彛 + const res = await pptTemplateApi.saveSubtitles(params) + if (res) { + message.success('瀛楀箷淇濆瓨鎴愬姛') + subtitleForm.originalContent = subtitleForm.content + isSubtitleModified.value = false + } } - await pptTemplateApi.saveSubtitles(params) - message.success('瀛楀箷淇濆瓨鎴愬姛') - subtitleForm.originalContent = subtitleForm.content - isSubtitleModified.value = false } catch (error) { console.error('淇濆瓨瀛楀箷澶辫触:', error) message.error(`淇濆瓨瀛楀箷澶辫触: ${error.message || '鏈煡閿欒'}`) -- Gitblit v1.9.3