Merge branch 'master-20251023-tag' into test1024

# Conflicts:
#	src/views/portal/course/Index.vue

src/views/portal/course/Index.vue

@@ -2,7 +2,7 @@
   <div id="couser-list-content" class="couser-list-content">
     <div class="course-banner">
       <portal-header current="course" textColor="#fff" :keywords="keyword" @emitInput="emitInput"
-                     @showClass="showClass"></portal-header>
+        @showClass="showClass"></portal-header>
     </div>
     <div style="padding-top:30px">
       <div class="xcontent2">
@@ -11,7 +11,7 @@
           <span v-if="navTitle.length">></span>
           <template v-if="navTitle.length">
             <div class="oneTitle" v-for="(item, index) in navTitle" :key="item.id"
-                 @click="handleOptionClick(item, index)">
+              @click="handleOptionClick(item, index)">
               <span class="titleName">&nbsp;{{ item.name }}&nbsp;</span>
               <span v-if="index !== navTitle.length - 1">></span>
             </div>
@@ -35,15 +35,15 @@
             <div class="course-one" v-for="one in oneList" :key="one.id" @click.stop="handleOptionClick(one, 1, oneList)">
               <div class="course-one-content">{{ one.name }}</div>
               <div class="course-two" v-for="(twoList, twoIndex) in one.children" :key="twoList.id"
-                   @click.stop="handleOptionClick(twoList, 2, one.children)"
-                   :class="{ courseTwoActive: twoList.id == twoId || twoList.checked }" @mouseleave.stop="leaveIndex"
-                   @mouseenter.stop="changeIndex(twoList.id)">
+                @click.stop="handleOptionClick(twoList, 2, one.children)"
+                :class="{ courseTwoActive: twoList.id == twoId || twoList.checked }" @mouseleave.stop="leaveIndex"
+                @mouseenter.stop="changeIndex(twoList.id)">
                 <!-- 三级分类 -->
                 <el-popover class="popover" popper-class='coursePopperClass' placement="right-start" width="536"
-                            :disabled="!twoList.children.length" :open-delay="0" :close-delay="0" trigger="hover"
-                            :visible-arrow="false" @hide="leaveIndex" @show="changeIndex(twoList.id)" transition="none">
+                  :disabled="!twoList.children.length" :open-delay="0" :close-delay="0" trigger="hover"
+                  :visible-arrow="false" @hide="leaveIndex" @show="changeIndex(twoList.id)" transition="none">
                   <div class="course-two-content" slot="reference">{{
-                      twoList.name }}</div>-
+                    twoList.name }}</div>-
                   <!-- 内容 -->
                   <div class="course-three-box">
                     <div class="course-three-box-title">
@@ -51,8 +51,8 @@
                     </div>
                     <div style="padding: 0 40px;display: flex;flex-wrap: wrap;">
                       <div :class="threeList.checked ? 'threeActive' : ''" v-for="threeList in twoList.children"
-                           :key="threeList.id" @click.stop="handleOptionClick(threeList, 3, twoList.children)"
-                           class="course-three">
+                        :key="threeList.id" @click.stop="handleOptionClick(threeList, 3, twoList.children)"
+                        class="course-three">
                         <span>{{ threeList.name }}</span>
                       </div>
                     </div>
@@ -285,70 +285,70 @@
           <div class="topNav" v-if="!newData">
             <div class="search-div nav" style="flex: 1;height: auto;">
               <div class="nav-primary">
-                  <div @click="handleTypeAllClick(1)" class="option-item" style="font-weight: bold;position: relative;margin-right: 20px;" :class="{ 'option-active': ctypeTagAll }">
-                    <a>全部</a>
-                    <span :class="ctypeTagAll ? 'nav-bottbor' : ''"></span>
-                  </div>
-                  <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item" style="font-weight: bold"
-                       :class="{ 'option-active': ctypeList[0].checked }">
-                    <a>录播课</a>
-                    <span :class="ctypeList[0].checked ? 'nav-bottbor' : ''"></span>
-                  </div>
-                  <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item" style="font-weight: bold"
-                       :class="{ 'option-active': ctypeList[1].checked }">
-                    <a>线下课</a>
-                    <span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>
-                  </div>
-                  <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item" style="font-weight: bold"
-                       :class="{ 'option-active': ctypeList[2].checked }">
-                    <a>学习项目</a>
-                    <span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>
-                  </div>
-                  <a class="option-item">
+                <div @click="handleTypeAllClick(1)" class="option-item" style="font-weight: bold;position: relative;margin-right: 20px;" :class="{ 'option-active': ctypeTagAll }">
+                  <a>全部</a>
+                  <span :class="ctypeTagAll ? 'nav-bottbor' : ''"></span>
+                </div>
+                <div @click="handleTypeClick(ctypeList[0], ctypeList)" class="option-item" style="font-weight: bold"
+                     :class="{ 'option-active': ctypeList[0].checked }">
+                  <a>录播课</a>
+                  <span :class="ctypeList[0].checked ? 'nav-bottbor' : ''"></span>
+                </div>
+                <div @click="handleTypeClick(ctypeList[1], ctypeList)" class="option-item" style="font-weight: bold"
+                     :class="{ 'option-active': ctypeList[1].checked }">
+                  <a>线下课</a>
+                  <span :class="ctypeList[1].checked ? 'nav-bottbor' : ''"></span>
+                </div>
+                <div @click="handleTypeClick(ctypeList[2], ctypeList)" class="option-item" style="font-weight: bold"
+                     :class="{ 'option-active': ctypeList[2].checked }">
+                  <a>学习项目</a>
+                  <span :class="ctypeList[2].checked ? 'nav-bottbor' : ''"></span>
+                </div>
+                <a class="option-item">
                     <span @click="uClassClick" class="Uxtext" style="font-weight: bold"> U选小课堂
                       <span class="uxicon">
                         <svg-icon icon-class="hot" style="font-size:22px"></svg-icon>
                       </span>
                     </span>
-                  </a>
+                </a>
               </div>
-                <!-- 修改热点标签区域 -->
-                <div style="margin-top:10px;flex: 1;">
-                  <!-- 修改热点标签容器，支持换行 -->
+              <!-- 修改热点标签区域 -->
+              <div style="margin-top:10px;flex: 1;">
+                <!-- 修改热点标签容器，支持换行 -->
+                <div class="hot-tags-wrapper">
                   <div class="hot-tags-wrapper">
-                    <div class="hot-tags-wrapper">
-                      <div
-                        class="option-item"        style="font-weight: bold; padding-top: 2px;"
-                        :class="{ 'option-active': isAllHotTagsSelected }"
-                        @click="handleClearHotTags"
-                      >
-                        <span>全部</span>
-                        <span :class="isAllHotTagsSelected ? 'nav-bottbor' : ''"></span>
-                      </div>
+                    <div
+                      class="option-item"        style="font-weight: bold; padding-top: 2px;"
+                      :class="{ 'option-active': isAllHotTagsSelected }"
+                      @click="handleClearHotTags"
+                    >
+                      <span>全部</span>
+                      <span :class="isAllHotTagsSelected ? 'nav-bottbor' : ''"></span>
+                    </div>
 
-                      <div
-                        class="option-item"        style="font-weight: bold; padding-top: 2px;"
-                        v-for="tag in hotTagsList"
-                        :key="tag.id"
-                        @click="handleTagClick(tag, hotTagsList,1)"
-                        :class="{ 'option-active': tag.checked }"
-                      >
-                        <span>{{tag.tagName}}</span>
-                        <span :class="tag.checked ? 'nav-bottbor' : ''"></span>
-                      </div>
+                    <div
+                      class="option-item"        style="font-weight: bold; padding-top: 2px;"
+                      v-for="tag in hotTagsList"
+                      :key="tag.id"
+                      @click="handleTagClick(tag, hotTagsList,1)"
+                      :class="{ 'option-active': tag.checked }"
+                    >
+                      <span>{{tag.tagName}}</span>
+                      <span :class="tag.checked ? 'nav-bottbor' : ''"></span>
                     </div>
                   </div>
                 </div>
+              </div>
             </div>
-            <!--            <div id="fixd-box" class="upload" style="margin-left: 26px;">
-                          <div v-if="identity == 2 || identity == 3 || identity == 5">
-                            <div class="portal-model-btn pointer" style="margin-bottom: 0px;height: 100px;line-height: 100px;"
-                              @click="toNeedCourse">
-                              <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="upCourse"></svg-icon>
-                              上传课程
-                            </div>
-                          </div>
-                        </div>-->
+<!--            <div id="fixd-box" class="upload" style="margin-left: 26px;">
+              <div v-if="identity == 2 || identity == 3 || identity == 5">
+                <div class="portal-model-btn pointer" style="margin-bottom: 0px;height: 100px;line-height: 100px;"
+                  @click="toNeedCourse">
+                  <svg-icon style="margin-right: 10px;font-size: 24px;" icon-class="upCourse"></svg-icon>
+                  上传课程
+                </div>
+              </div>
+            </div>-->
           </div>
           <!-- 清除 -->
           <div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0;margin-bottom: 20px;">
@@ -370,11 +370,11 @@
             <div class="order-div" v-if="!newData">
               <span class="quyer-tag">
                 <el-button type="text" class="order-class" @click="orderChange('studys')"
-                           :class="{ actice: course.orderField == 'studys' }">最热</el-button>
+                  :class="{ actice: course.orderField == 'studys' }">最热</el-button>
                 <el-button type="text" class="order-class" @click="orderChange('publishTime')"
-                           :class="{ actice: course.orderField == 'publishTime' }">最新</el-button>
+                  :class="{ actice: course.orderField == 'publishTime' }">最新</el-button>
                 <el-button type="text" class="order-class" @click="orderChange('score')"
-                           :class="{ actice: course.orderField == 'score' }">好评率</el-button>
+                  :class="{ actice: course.orderField == 'score' }">好评率</el-button>
               </span>
               <span class="order-count">
                 共找到<span>{{ count }}</span>个结果
@@ -407,7 +407,7 @@
                     <div class="keywordInfo-every">
                       <div class="keywordInfo" v-for="(keyword, index) in cinfo.keywordsActive" :key="index">
                         <el-tooltip popper-class="keywordInfo-class" :visible-arrow="false"
-                                    :disabled="!keyword.showTitle">
+                          :disabled="!keyword.showTitle">
                           <template #content>
                             <span v-html="keyword.title"></span>
                           </template>
@@ -431,7 +431,7 @@
                       <div class="course-info-score">
                         <div style="display: flex;">
                           <interactBar :type="1" nodeWidth="20px" :data="cinfo" :courseExclusive="true" :comments="false"
-                                       :praises="false" :shares="false" :views="false"></interactBar>
+                            :praises="false" :shares="false" :views="false"></interactBar>
                           <div v-if="cinfo.score">
                             <span class="course-score-value">{{ toScore(cinfo.score) }}分</span>
                           </div>
@@ -476,7 +476,7 @@
               </span>
               <div v-if="courseList.length > 0">
                 <pagination :size="course.pageSize" :total="count" :page="course.pageIndex"
-                            layout="total, prev, pager, next, jumper" @change-page="currentChange"></pagination>
+                  layout="total, prev, pager, next, jumper" @change-page="currentChange"></pagination>
               </div>
             </div>
           </div>
@@ -755,7 +755,7 @@ export default {
       }
     })
     //初始化:获取最新前10个热点标签
-    apiCourseTag.getHotTagList(null).then(rs => {
+      apiCourseTag.getHotTagList(null).then(rs => {
       if (rs.status == 200) {
         this.hotTagsList = rs.result.map(tag => ({
           ...tag,