Merge branch 'master-20251023-tag' into test1024

# Conflicts:
#	src/views/portal/course/Detail.vue
This commit is contained in:
670788339
2025-11-11 18:19:11 +08:00
3 changed files with 12 additions and 9 deletions

View File

@@ -45,22 +45,24 @@
<!-- 蒙层引导组件 --> <!-- 蒙层引导组件 -->
<div v-if="showGuidance" class="guidance-overlay" @click="closeGuidance"> <div v-if="showGuidance" class="guidance-overlay" @click="closeGuidance">
<div class="guidance-content"> <div class="guidance-content">
<div class="guidance-title">操作引导</div> <div class="guidance-title">新功能引导</div>
<div class="guidance-steps"> <div class="guidance-steps">
<div class="guidance-step" :class="{ active: currentStep === 1 }"> <div class="guidance-step" :class="{ active: currentStep === 1 }">
<div class="step-number">1</div> <div class="step-number">1</div>
<div class="step-content"> <div class="step-content">
<div class="step-title">设置内容分类</div> <div class="step-title">用标签为课程精准定位吸引更多学员可从以下维度构思</div>
<div class="step-desc">当选择内容分类后其关联标签将在下拉列表中优先显示</div> <div class="step-desc"> 讲领域品质管理</div>
<div class="step-desc"> 教技能沟通技巧</div>
<div class="step-desc"> 涉内容5W1H分析法</div>
</div> </div>
</div> </div>
<div class="guidance-step" :class="{ active: currentStep === 2 }"> <!-- <div class="guidance-step" :class="{ active: currentStep === 2 }">
<div class="step-number">2</div> <div class="step-number">2</div>
<div class="step-content"> <div class="step-content">
<div class="step-title">添加课程标签</div> <div class="step-title">添加课程标签</div>
<div class="step-desc">为课程添加相关标签,最多5个便于搜索和分类,可回车创建新标签</div> <div class="step-desc">为课程添加相关标签,最多5个便于搜索和分类,可回车创建新标签</div>
</div> </div>
</div> </div>-->
</div> </div>
<!-- <div class="guidance-actions"> <!-- <div class="guidance-actions">
<el-button @click="previousStep1" v-if="currentStep > 1">上一步</el-button> <el-button @click="previousStep1" v-if="currentStep > 1">上一步</el-button>

View File

@@ -458,7 +458,7 @@ export default {
padding: 24px 24px 5px 24px; padding: 24px 24px 5px 24px;
// margin-right: 361px; // margin-right: 361px;
.study-count { .study-count {
margin-top: 10px; margin-top: 30px;
font-size: 16px; font-size: 16px;
color: #444444; color: #444444;
} }
@@ -485,13 +485,13 @@ export default {
min-height: 20px; min-height: 20px;
.keyword-tag { .keyword-tag {
padding: 0px 8px; padding: 0px 10px;
margin-top: 5px; margin-top: 7px;
float: left; float: left;
line-height: 24px; line-height: 24px;
font-size: 12px; font-size: 12px;
border-radius: 2px; border-radius: 2px;
margin-right: 8px; margin-right: 10px;
color: #2C68FF; color: #2C68FF;
height: 24px; height: 24px;
background: rgba(44, 104, 255, 0.06); background: rgba(44, 104, 255, 0.06);

View File

@@ -2330,6 +2330,7 @@ export default {
display: inline-block; display: inline-block;
font-size: 14px; font-size: 14px;
margin: 0px 15px; margin: 0px 15px;
cursor: pointer
} }
.option-border { .option-border {