Merge branch 'master-20251023-tag' into test1024

# Conflicts:
#	src/components/Course/courseForm.vue
#	src/views/portal/course/Index.vue
#	src/views/portal/course/qualityCourse.vue
This commit is contained in:
670788339
2025-11-14 08:47:52 +08:00
3 changed files with 78 additions and 78 deletions

View File

@@ -56,7 +56,7 @@
<div class="step-desc"> 涉内容5W1H分析法</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>
@@ -75,7 +75,7 @@
</div> </div>
<!-- 高亮指引元素 --> <!-- 高亮指引元素 -->
<!-- <div v-if="showGuidance" class="highlight-element" :style="highlightStyle"></div>--> <!-- <div v-if="showGuidance" class="highlight-element" :style="highlightStyle"></div>-->
<!--微课--> <!--微课-->

View File

@@ -117,7 +117,7 @@
:class="{ 'option-active': tag.checked }" :class="{ 'option-active': tag.checked }"
> >
<span>{{tag.tagName}} </span> <span>{{tag.tagName}} </span>
<!-- <span :class="tag.checked ? 'nav-bottbor' : ''"></span>--> <!-- <span :class="tag.checked ? 'nav-bottbor' : ''"></span>-->
</div> </div>
</div> </div>

View File

@@ -57,22 +57,22 @@
<!-- 修改后 --> <!-- 修改后 -->
<div class="search-div nav" style="flex: 1;height: auto;"> <div class="search-div nav" style="flex: 1;height: auto;">
<div class="nav-primary" style="display: flex; justify-content: space-between; align-items: center;margin-top: 15px;"> <div class="nav-primary" style="display: flex; justify-content: space-between; align-items: center;margin-top: 15px;">
<div style="display: flex;"> <div style="display: flex;margin-top: 20px;">
<div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item" <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item"
:class="{ 'option-active': ctypeList[0].checked }"> :class="{ 'option-active': ctypeList[0].checked }">
<a>全部</a> <a>全部</a>
<!-- <span :class="ctypeList[0].checked ? 'nav-bottbor' : ''"></span>--> <!-- <span :class="ctypeList[0].checked ? 'nav-bottbor' : ''"></span>-->
</div> </div>
<div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item" <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item"
:class="{ 'option-active': ctypeList[1].checked }" style="padding-left: 15px;"> :class="{ 'option-active': ctypeList[1].checked }" style="padding-left: 15px;">
<a>内部专享</a> <a>内部专享</a>
<!-- <span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>--> <!-- <span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>-->
</div> </div>
<div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item" <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item"
:class="{ 'option-active': ctypeList[2].checked }" style="padding-left: 15px;"> :class="{ 'option-active': ctypeList[2].checked }" style="padding-left: 15px;">
<a>外部精选</a> <a>外部精选</a>
<!-- <span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>--> <!-- <span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>-->
</div> </div>
</div> </div>
@@ -90,60 +90,60 @@
</div> </div>
</div> </div>
<!-- <div style="margin-top:10px;flex: 1;">--> <!-- <div style="margin-top:10px;flex: 1;">-->
<!-- &lt;!&ndash; 修改热点标签容器支持换行 &ndash;&gt;--> <!-- &lt;!&ndash; 修改热点标签容器支持换行 &ndash;&gt;-->
<!-- <div class="hot-tags-wrapper" style="display: flex;">--> <!-- <div class="hot-tags-wrapper" style="display: flex;">-->
<!-- <div class="hot-tags-wrapper" style="display: flex; align-items: center;">--> <!-- <div class="hot-tags-wrapper" style="display: flex; align-items: center;">-->
<!-- <div--> <!-- <div-->
<!-- class="option-item"--> <!-- class="option-item"-->
<!-- style=" padding-top: 2px; margin-left: 15px;"--> <!-- style=" padding-top: 2px; margin-left: 15px;"-->
<!-- :class="{ 'option-active': isAllHotTagsSelected }"--> <!-- :class="{ 'option-active': isAllHotTagsSelected }"-->
<!-- @click="handleClearHotTags"--> <!-- @click="handleClearHotTags"-->
<!-- >--> <!-- >-->
<!-- <span>全部</span>--> <!-- <span>全部</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div--> <!-- <div-->
<!-- class="option-item"--> <!-- class="option-item"-->
<!-- style=" padding-top: 2px;"--> <!-- style=" padding-top: 2px;"-->
<!-- v-for="tag in hotTagsList"--> <!-- v-for="tag in hotTagsList"-->
<!-- :key="tag.id"--> <!-- :key="tag.id"-->
<!-- @click="handleTagClick(tag, hotTagsList,1)"--> <!-- @click="handleTagClick(tag, hotTagsList,1)"-->
<!-- :class="{ 'option-active': tag.checked }"--> <!-- :class="{ 'option-active': tag.checked }"-->
<!-- >--> <!-- >-->
<!-- <span>{{tag.tagName}}</span>--> <!-- <span>{{tag.tagName}}</span>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- <div style="margin:20px 0;flex: 1;">--> <!-- <div style="margin:20px 0;flex: 1;">-->
<!-- <div>--> <!-- <div>-->
<!-- <div style="display: flex">--> <!-- <div style="display: flex">-->
<!-- <div--> <!-- <div-->
<!-- class="option-item" style=" padding-top: 2px;"--> <!-- class="option-item" style=" padding-top: 2px;"-->
<!-- :class="{ 'option-active': isAllHotTagsSelected }"--> <!-- :class="{ 'option-active': isAllHotTagsSelected }"-->
<!-- @click="handleClearHotTags"--> <!-- @click="handleClearHotTags"-->
<!-- >--> <!-- >-->
<!-- <span>全部</span>--> <!-- <span>全部</span>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="fieldbox" style="padding-left: 15px;">--> <!-- <div class="fieldbox" style="padding-left: 15px;">-->
<!-- <div--> <!-- <div-->
<!-- class="option-item" style=" padding-top: 2px;"--> <!-- class="option-item" style=" padding-top: 2px;"-->
<!-- v-for="tag in hotTagsList"--> <!-- v-for="tag in hotTagsList"-->
<!-- :key="tag.id"--> <!-- :key="tag.id"-->
<!-- @click="handleTagClick(tag, hotTagsList,1)"--> <!-- @click="handleTagClick(tag, hotTagsList,1)"-->
<!-- :class="{ 'option-active': tag.checked }"--> <!-- :class="{ 'option-active': tag.checked }"-->
<!-- >--> <!-- >-->
<!-- <span>{{tag.tagName}} </span>--> <!-- <span>{{tag.tagName}} </span>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div style="margin:15px 0;flex: 1;"> <div style="margin:20px 0;flex: 1;">
<div> <div>
<div style="display: flex"> <div style="display: flex">
<div class="option-item" style="padding-top: 2px;min-width: 33px;" <div class="option-item" style="padding-top: 2px;min-width: 33px;"