From b58ff53eb5bf3fd7f473743d8ad8a4b4c8060bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kaizheng=28=E9=83=91=E5=87=AF=29?= <kaizheng@upchina.com>
Date: Wed, 26 Feb 2025 21:33:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routers.js                         | 29 ++++++
 .../circle/detail/components/newsList.vue     |  2 +-
 src/views/course/detail/index.vue             | 10 +-
 src/views/personalHomepage/index.vue          | 51 +++++-----
 src/views/personalHomepage/indexTg.vue        | 96 +++----------------
 src/views/personalHomepage/indexYx.vue        | 27 +++---
 src/views/serial/detail/index.vue             |  9 ++
 7 files changed, 103 insertions(+), 121 deletions(-)

diff --git a/src/router/routers.js b/src/router/routers.js
index 2d5b04f..04ede8e 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -96,6 +96,35 @@ export const constantRouterMap = [
       }
     ]
   },
+  // 合集
+  {
+    path: "/serial",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    children: [
+      {
+        path: "detail/:id",
+        component: () => import("@/views/serial/detail/index.vue"),
+        name: "合集详情",
+        meta: { title: "合集详情" }
+      }
+    ]
+  },
+  {
+    path: "/course",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    children: [
+      {
+        path: "detail/:id",
+        component: () => import("@/views/course/detail/index"),
+        name: "课程详情",
+        meta: { title: "课程详情" }
+      }
+    ]
+  },
   {
     path: "/user",
     component: Layout,
diff --git a/src/views/circle/detail/components/newsList.vue b/src/views/circle/detail/components/newsList.vue
index 7bb792d..f27ccbe 100644
--- a/src/views/circle/detail/components/newsList.vue
+++ b/src/views/circle/detail/components/newsList.vue
@@ -25,7 +25,7 @@
                 >
                 <div v-if="item.userType !== 2">
                   <span
-                    ><i v-if="item.readCount">{{ item.readCount }}</i
+                    ><i v-if="item.readCount !== null">{{ item.readCount }}</i
                     ><i>{{ item.totalCount ? `/${item.totalCount}` : "人" }}</i
                     >已读</span
                   >
diff --git a/src/views/course/detail/index.vue b/src/views/course/detail/index.vue
index f8a8ad1..b93f61c 100644
--- a/src/views/course/detail/index.vue
+++ b/src/views/course/detail/index.vue
@@ -749,7 +749,15 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
-
+.head-container {
+  h3 {
+    font-size: 20px;
+  }
+  p {
+    font-size: 16px;
+    line-height: 32px;
+  }
+}
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
diff --git a/src/views/personalHomepage/index.vue b/src/views/personalHomepage/index.vue
index 7e9338d..b644d9c 100644
--- a/src/views/personalHomepage/index.vue
+++ b/src/views/personalHomepage/index.vue
@@ -21,15 +21,17 @@
       <div>
         <el-button
           v-for="(item, index) in buttonText"
+          :key="index"
+          @click="selected(item.productType)"
           :class="{ selected: selectedButton === item.productType }"
           plain
-          @click="selected(item.productType)"
-        >{{ item.showName }}</el-button>
-        <el-button
-          class="custom-button selected"
-          type="primary"
-          @click="copyUrl($event)"
-        >复制投顾主页链接</el-button>
+          >{{ item.showName }}</el-button
+        >
+      </div>
+
+      <div class="custom-button">
+        <el-button type="primary" @click="customDialog()">自定义tab</el-button>
+        <!-- <el-button type="primary" @click="copyUrl($event)">复制投顾主页链接</el-button> -->
       </div>
     </div>
     <div class="content-box">
@@ -43,11 +45,11 @@
       title="自定义tab"
       append-to-body
     >
-      <div ref="contentContainer" class="dialog-content">
+      <div class="dialog-content" ref="contentContainer">
         <div
+          class="dialog-content-item"
           v-for="(item, index) in buttonTextEdit"
           :key="item.productType"
-          class="dialog-content-item"
           draggable="true"
         >
           <div class="dialog-content-item-left">{{ item.showName }}</div>
@@ -56,25 +58,24 @@
               v-model="item.status"
               :active-value="1"
               :inactive-value="2"
-            />
+            >
+            </el-switch>
             <i
               class="el-icon-edit-outline"
-              style="font-size: 24px;margin-left: 10px;cursor: pointer;"
               @click="openEditTab(item)"
-            />
+              style="font-size: 24px;margin-left: 10px;cursor: pointer;"
+            ></i>
             <i
               class="el-icon-set-up"
               style="font-size: 24px;margin-left: 10px;cursor: pointer;"
-            />
+            ></i>
           </div>
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="editTab()"
-        >提交</el-button>
+        <el-button size="mini" type="primary" @click="editTab()"
+          >提交</el-button
+        >
         <el-button size="mini" @click="cancelTab()">取消</el-button>
       </div>
     </el-dialog>
@@ -94,18 +95,17 @@
         </el-form-item>
         <el-form-item>
           <el-button
+            @click="editItem.showName = JSON.parse(JSON.stringify(item))"
             v-for="(item, index) in buttonTextEditList[editItem.productType]"
             :key="index"
-            @click="editItem.showName = JSON.parse(JSON.stringify(item))"
-          >{{ item }}</el-button>
+            >{{ item }}</el-button
+          >
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="submitEditDialog()"
-        >提交</el-button>
+        <el-button size="mini" type="primary" @click="submitEditDialog()"
+          >提交</el-button
+        >
         <el-button size="mini" @click="cancelEditDialog()">取消</el-button>
       </div>
     </el-dialog>
@@ -334,6 +334,7 @@ export default {
   .button-box {
     padding: 20px 0;
     display: inline-flex;
+    align-items: center;
     .custom-button {
       margin-left: 40px;
     }
diff --git a/src/views/personalHomepage/indexTg.vue b/src/views/personalHomepage/indexTg.vue
index e922369..f06f74b 100644
--- a/src/views/personalHomepage/indexTg.vue
+++ b/src/views/personalHomepage/indexTg.vue
@@ -1,35 +1,21 @@
 <template>
   <div class="centent app-container">
-    <div class="menu-container">
-      <el-tabs
-        v-model="editableTabsValue"
-        type="card"
-        @tab-click="selectedTab()"
-      >
-        <el-tab-pane
-          v-for="(item, index) in tgList"
-          :key="item.name"
-          :label="item.name"
-          :name="item.name"
-        >
-          {{ item.content }}
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-
     <div class="button-box">
       <div>
         <el-button
           v-for="(item, index) in buttonText"
+          :key="index"
           :class="{ selected: selectedButton === item.productType }"
           plain
           @click="selected(item.productType)"
-        >{{ item.showName }}</el-button>
+          >{{ item.showName }}</el-button
+        >
         <el-button
           class="custom-button selected"
           type="primary"
           @click="copyUrl($event)"
-        >复制投顾主页链接</el-button>
+          >复制投顾主页链接</el-button
+        >
       </div>
     </div>
     <div class="content-box">
@@ -70,11 +56,9 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="editTab()"
-        >提交</el-button>
+        <el-button size="mini" type="primary" @click="editTab()"
+          >提交</el-button
+        >
         <el-button size="mini" @click="cancelTab()">取消</el-button>
       </div>
     </el-dialog>
@@ -97,15 +81,14 @@
             v-for="(item, index) in buttonTextEditList[editItem.productType]"
             :key="index"
             @click="editItem.showName = JSON.parse(JSON.stringify(item))"
-          >{{ item }}</el-button>
+            >{{ item }}</el-button
+          >
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="submitEditDialog()"
-        >提交</el-button>
+        <el-button size="mini" type="primary" @click="submitEditDialog()"
+          >提交</el-button
+        >
         <el-button size="mini" @click="cancelEditDialog()">取消</el-button>
       </div>
     </el-dialog>
@@ -117,7 +100,7 @@ import LiveTab from "./components/LiveTab.vue";
 import CourseTab from "./components/CourseTab.vue";
 import ShortTab from "./components/ShortTab.vue";
 import { mapGetters } from "vuex";
-import { tgList, mainTabInfoList, mainTabInfoSave } from "@/api/adviser";
+import { mainTabInfoList, mainTabInfoSave } from "@/api/adviser";
 import { handleClipboard } from "@/views/liveBroadcast/manage/config";
 import { urlResize } from "@/api/videoLive";
 export default {
@@ -127,7 +110,6 @@ export default {
       editableTabsValue: "",
       selectedButton: null,
       buttonText: [],
-      tgList: [],
       advisorId: null,
       dialogTab: false,
       sortable: null,
@@ -151,7 +133,6 @@ export default {
     };
   },
   mounted() {
-    // this.getTgList()
     this.advisorId = this.user.advisorInfo.id;
     this.editableTabsValue = this.user.advisorInfo.name;
   },
@@ -159,34 +140,6 @@ export default {
     ...mapGetters(["user"])
   },
   watch: {
-    // editableTabsValue(value) {
-    //   if(value === '0' && value === null) return
-    //   this.$nextTick(()=>{
-    //     if(this.selectedButton === 3 && this.$refs.liveTab){
-    //       this.$refs.liveTab.getList(value)
-    //     }else if(this.selectedButton === 32 && this.$refs.courseTab){
-    //         const selectTg = this.tgList.find(item => item.name === value);
-    //         this.advisorId = selectTg.id
-    //         this.$refs.courseTab.getList(this.advisorId)
-    //     }
-    //   })
-
-    // },
-    // selectedButton(value){
-    //   if(value){
-    //     this.$nextTick(()=>{
-    //       if(this.selectedButton === 3 && this.$refs.liveTab){
-    //           this.$refs.liveTab.getList(this.editableTabsValue)
-
-    //       }else if(this.selectedButton === 32 && this.$refs.courseTab){
-    //         const selectTg = this.tgList.find(item => item.name === this.editableTabsValue);
-    //           this.advisorId = selectTg.id
-    //           this.$refs.courseTab.getList(this.advisorId)
-    //       }
-    //     })
-    //   }
-
-    // },
     advisorId(value) {
       if (value) {
         this.getMainTabInfoList();
@@ -221,26 +174,6 @@ export default {
         }
       });
     },
-    async getTgList() {
-      const ret = await tgList({
-        current: 1,
-        name: this.user.user.name,
-        showName: "",
-        size: 100000,
-        staffNo: "",
-        status: 3,
-        deptId: this.user.user.deptId
-      });
-      if (ret.code === 0) {
-        this.tgList = ret.data.list;
-        if (this.tgList.lenght > 0) {
-          this.advisorId = this.tgList[0].id;
-          this.editableTabsValue = this.tgList[0].name;
-        }
-
-        // 进来获取当前投顾的tab列表
-      }
-    },
     selectedTab() {
       const selectTg = this.tgList.find(
         item => item.name === this.editableTabsValue
@@ -334,6 +267,7 @@ export default {
   .button-box {
     padding: 20px 0;
     display: inline-flex;
+    align-items: center;
     .custom-button {
       margin-left: 40px;
     }
diff --git a/src/views/personalHomepage/indexYx.vue b/src/views/personalHomepage/indexYx.vue
index 93e87d2..8903b6a 100644
--- a/src/views/personalHomepage/indexYx.vue
+++ b/src/views/personalHomepage/indexYx.vue
@@ -21,15 +21,18 @@
       <div>
         <el-button
           v-for="(item, index) in buttonText"
+          :key="index"
           :class="{ selected: selectedButton === item.productType }"
           plain
           @click="selected(item.productType)"
-        >{{ item.showName }}</el-button>
+          >{{ item.showName }}</el-button
+        >
         <el-button
           class="custom-button selected"
           type="primary"
           @click="copyUrl($event)"
-        >复制投顾主页链接</el-button>
+          >复制投顾主页链接</el-button
+        >
       </div>
     </div>
     <div class="content-box">
@@ -70,11 +73,9 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="editTab()"
-        >提交</el-button>
+        <el-button size="mini" type="primary" @click="editTab()"
+          >提交</el-button
+        >
         <el-button size="mini" @click="cancelTab()">取消</el-button>
       </div>
     </el-dialog>
@@ -97,15 +98,14 @@
             v-for="(item, index) in buttonTextEditList[editItem.productType]"
             :key="index"
             @click="editItem.showName = JSON.parse(JSON.stringify(item))"
-          >{{ item }}</el-button>
+            >{{ item }}</el-button
+          >
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button
-          size="mini"
-          type="primary"
-          @click="submitEditDialog()"
-        >提交</el-button>
+        <el-button size="mini" type="primary" @click="submitEditDialog()"
+          >提交</el-button
+        >
         <el-button size="mini" @click="cancelEditDialog()">取消</el-button>
       </div>
     </el-dialog>
@@ -333,6 +333,7 @@ export default {
   .button-box {
     padding: 20px 0;
     display: inline-flex;
+    align-items: center;
     .custom-button {
       margin-left: 40px;
     }
diff --git a/src/views/serial/detail/index.vue b/src/views/serial/detail/index.vue
index 4ac7950..b41281a 100644
--- a/src/views/serial/detail/index.vue
+++ b/src/views/serial/detail/index.vue
@@ -603,6 +603,15 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.head-container {
+  h3 {
+    font-size: 20px;
+  }
+  p {
+    font-size: 16px;
+    line-height: 32px;
+  }
+}
 
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;