admin/zbAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: bug修复

Browse Source
This commit is contained in:
kaizheng(郑凯) 2025-02-26 21:33:04 +08:00
parent f088060092
commit b58ff53eb5
7 changed files with 103 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/router/routers.js
View File

@ -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", path: "/user",
component: Layout, component: Layout,

2
src/views/circle/detail/components/newsList.vue
View File

@ -25,7 +25,7 @@
> >
<div v-if="item.userType !== 2"> <div v-if="item.userType !== 2">
<span <span
><i v-if="item.readCount">{{ item.readCount }}</i ><i v-if="item.readCount !== null">{{ item.readCount }}</i
><i>{{ item.totalCount ? `/${item.totalCount}` : "人" }}</i ><i>{{ item.totalCount ? `/${item.totalCount}` : "人" }}</i
>已读</span >已读</span
> >

10
src/views/course/detail/index.vue
View File

@ -749,7 +749,15 @@ export default {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
.head-container {
h3 {
font-size: 20px;
}
p {
font-size: 16px;
line-height: 32px;
}
}
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;
border-radius: 6px; border-radius: 6px;

51
src/views/personalHomepage/index.vue
View File

@ -21,15 +21,17 @@
<div> <div>
<el-button <el-button
v-for="(item, index) in buttonText" v-for="(item, index) in buttonText"
:key="index"
@click="selected(item.productType)"
:class="{ selected: selectedButton === item.productType }" :class="{ selected: selectedButton === item.productType }"
plain plain
@click="selected(item.productType)" >{{ item.showName }}</el-button
>{{ item.showName }}</el-button> >
<el-button </div>
class="custom-button selected"
type="primary" <div class="custom-button">
@click="copyUrl($event)" <el-button type="primary" @click="customDialog()">自定义tab</el-button>
>复制投顾主页链接</el-button> <!-- <el-button type="primary" @click="copyUrl($event)">复制投顾主页链接</el-button> -->
</div> </div>
</div> </div>
<div class="content-box"> <div class="content-box">
@ -43,11 +45,11 @@
title="自定义tab" title="自定义tab"
append-to-body append-to-body
> >
<div ref="contentContainer" class="dialog-content"> <div class="dialog-content" ref="contentContainer">
<div <div
class="dialog-content-item"
v-for="(item, index) in buttonTextEdit" v-for="(item, index) in buttonTextEdit"
:key="item.productType" :key="item.productType"
class="dialog-content-item"
draggable="true" draggable="true"
> >
<div class="dialog-content-item-left">{{ item.showName }}</div> <div class="dialog-content-item-left">{{ item.showName }}</div>
@ -56,25 +58,24 @@
v-model="item.status" v-model="item.status"
:active-value="1" :active-value="1"
:inactive-value="2" :inactive-value="2"
/> >
</el-switch>
<i <i
class="el-icon-edit-outline" class="el-icon-edit-outline"
style="font-size: 24px;margin-left: 10px;cursor: pointer;"
@click="openEditTab(item)" @click="openEditTab(item)"
/> style="font-size: 24px;margin-left: 10px;cursor: pointer;"
></i>
<i <i
class="el-icon-set-up" class="el-icon-set-up"
style="font-size: 24px;margin-left: 10px;cursor: pointer;" style="font-size: 24px;margin-left: 10px;cursor: pointer;"
/> ></i>
</div> </div>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button size="mini" type="primary" @click="editTab()"
size="mini" >提交</el-button
type="primary" >
@click="editTab()"
>提交</el-button>
<el-button size="mini" @click="cancelTab()">取消</el-button> <el-button size="mini" @click="cancelTab()">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -94,18 +95,17 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button
@click="editItem.showName = JSON.parse(JSON.stringify(item))"
v-for="(item, index) in buttonTextEditList[editItem.productType]" v-for="(item, index) in buttonTextEditList[editItem.productType]"
:key="index" :key="index"
@click="editItem.showName = JSON.parse(JSON.stringify(item))" >{{ item }}</el-button
>{{ item }}</el-button> >
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button size="mini" type="primary" @click="submitEditDialog()"
size="mini" >提交</el-button
type="primary" >
@click="submitEditDialog()"
>提交</el-button>
<el-button size="mini" @click="cancelEditDialog()">取消</el-button> <el-button size="mini" @click="cancelEditDialog()">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -334,6 +334,7 @@ export default {
.button-box { .button-box {
padding: 20px 0; padding: 20px 0;
display: inline-flex; display: inline-flex;
align-items: center;
.custom-button { .custom-button {
margin-left: 40px; margin-left: 40px;
} }

96
src/views/personalHomepage/indexTg.vue
View File

@ -1,35 +1,21 @@
<template> <template>
<div class="centent app-container"> <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 class="button-box">
<div> <div>
<el-button <el-button
v-for="(item, index) in buttonText" v-for="(item, index) in buttonText"
:key="index"
:class="{ selected: selectedButton === item.productType }" :class="{ selected: selectedButton === item.productType }"
plain plain
@click="selected(item.productType)" @click="selected(item.productType)"
>{{ item.showName }}</el-button> >{{ item.showName }}</el-button
>
<el-button <el-button
class="custom-button selected" class="custom-button selected"
type="primary" type="primary"
@click="copyUrl($event)" @click="copyUrl($event)"
>复制投顾主页链接</el-button> >复制投顾主页链接</el-button
>
</div> </div>
</div> </div>
<div class="content-box"> <div class="content-box">
@ -70,11 +56,9 @@
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button size="mini" type="primary" @click="editTab()"
size="mini" >提交</el-button
type="primary" >
@click="editTab()"
>提交</el-button>
<el-button size="mini" @click="cancelTab()">取消</el-button> <el-button size="mini" @click="cancelTab()">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -97,15 +81,14 @@
v-for="(item, index) in buttonTextEditList[editItem.productType]" v-for="(item, index) in buttonTextEditList[editItem.productType]"
:key="index" :key="index"
@click="editItem.showName = JSON.parse(JSON.stringify(item))" @click="editItem.showName = JSON.parse(JSON.stringify(item))"
>{{ item }}</el-button> >{{ item }}</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button size="mini" type="primary" @click="submitEditDialog()"
size="mini" >提交</el-button
type="primary" >
@click="submitEditDialog()"
>提交</el-button>
<el-button size="mini" @click="cancelEditDialog()">取消</el-button> <el-button size="mini" @click="cancelEditDialog()">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -117,7 +100,7 @@ import LiveTab from "./components/LiveTab.vue";
import CourseTab from "./components/CourseTab.vue"; import CourseTab from "./components/CourseTab.vue";
import ShortTab from "./components/ShortTab.vue"; import ShortTab from "./components/ShortTab.vue";
import { mapGetters } from "vuex"; 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 { handleClipboard } from "@/views/liveBroadcast/manage/config";
import { urlResize } from "@/api/videoLive"; import { urlResize } from "@/api/videoLive";
export default { export default {
@ -127,7 +110,6 @@ export default {
editableTabsValue: "", editableTabsValue: "",
selectedButton: null, selectedButton: null,
buttonText: [], buttonText: [],
tgList: [],
advisorId: null, advisorId: null,
dialogTab: false, dialogTab: false,
sortable: null, sortable: null,
@ -151,7 +133,6 @@ export default {
}; };
}, },
mounted() { mounted() {
// this.getTgList()
this.advisorId = this.user.advisorInfo.id; this.advisorId = this.user.advisorInfo.id;
this.editableTabsValue = this.user.advisorInfo.name; this.editableTabsValue = this.user.advisorInfo.name;
}, },
@ -159,34 +140,6 @@ export default {
...mapGetters(["user"]) ...mapGetters(["user"])
}, },
watch: { 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) { advisorId(value) {
if (value) { if (value) {
this.getMainTabInfoList(); 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() { selectedTab() {
const selectTg = this.tgList.find( const selectTg = this.tgList.find(
item => item.name === this.editableTabsValue item => item.name === this.editableTabsValue
@ -334,6 +267,7 @@ export default {
.button-box { .button-box {
padding: 20px 0; padding: 20px 0;
display: inline-flex; display: inline-flex;
align-items: center;
.custom-button { .custom-button {
margin-left: 40px; margin-left: 40px;
} }

27
src/views/personalHomepage/indexYx.vue
View File

@ -21,15 +21,18 @@
<div> <div>
<el-button <el-button
v-for="(item, index) in buttonText" v-for="(item, index) in buttonText"
:key="index"
:class="{ selected: selectedButton === item.productType }" :class="{ selected: selectedButton === item.productType }"
plain plain
@click="selected(item.productType)" @click="selected(item.productType)"
>{{ item.showName }}</el-button> >{{ item.showName }}</el-button
>
<el-button <el-button
class="custom-button selected" class="custom-button selected"
type="primary" type="primary"
@click="copyUrl($event)" @click="copyUrl($event)"
>复制投顾主页链接</el-button> >复制投顾主页链接</el-button
>
</div> </div>
</div> </div>
<div class="content-box"> <div class="content-box">
@ -70,11 +73,9 @@
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button size="mini" type="primary" @click="editTab()"
size="mini" >提交</el-button
type="primary" >
@click="editTab()"
>提交</el-button>
<el-button size="mini" @click="cancelTab()">取消</el-button> <el-button size="mini" @click="cancelTab()">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -97,15 +98,14 @@
v-for="(item, index) in buttonTextEditList[editItem.productType]" v-for="(item, index) in buttonTextEditList[editItem.productType]"
:key="index" :key="index"
@click="editItem.showName = JSON.parse(JSON.stringify(item))" @click="editItem.showName = JSON.parse(JSON.stringify(item))"
>{{ item }}</el-button> >{{ item }}</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button <el-button size="mini" type="primary" @click="submitEditDialog()"
size="mini" >提交</el-button
type="primary" >
@click="submitEditDialog()"
>提交</el-button>
<el-button size="mini" @click="cancelEditDialog()">取消</el-button> <el-button size="mini" @click="cancelEditDialog()">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
@ -333,6 +333,7 @@ export default {
.button-box { .button-box {
padding: 20px 0; padding: 20px 0;
display: inline-flex; display: inline-flex;
align-items: center;
.custom-button { .custom-button {
margin-left: 40px; margin-left: 40px;
} }

9
src/views/serial/detail/index.vue
View File

@ -603,6 +603,15 @@ export default {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
} }
.head-container {
h3 {
font-size: 20px;
}
p {
font-size: 16px;
line-height: 32px;
}
}
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9; border: 1px dashed #d9d9d9;