myxiaowei
/
fanruan-edu-cas
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity
Browse Source

update:DP-872 

feat:DP-367
pull/2/head
Wangwei 2 years ago
parent
798e7f9729
commit
6fd2c961cc
5 changed files with 609 additions and 663 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/components/Footer.vue
  2. 169
      src/components/Header.vue
  3. 39
      src/views/live/live_play.vue
  4. 2
      src/views/studypath/fineDataLink.vue
  5. 2
      src/views/studypath/jiandaoyun.vue

4
src/components/Footer.vue
Unescape View File

@ -89,7 +89,7 @@
</el-popover>
</div>
<el-dialog title="提交页面反馈" v-model="showFeedback" width="800px">
<el-dialog title="提交页面反馈" v-model="showFeedback" width="800px" custom-class="foot-dialog-feedback">
<div class="flex-1 dia-msg-til">
<span style="color: #FFA940; margin: 3px 6px 0 0;">
<svg viewBox="64 64 896 896" focusable="false" data-icon="info-circle" width="1em" height="1em" fill="currentColor" aria-hidden="true">
@ -210,7 +210,7 @@ export default {
margin-top: 6px;
color: #333;
}
.el-dialog {
.foot-dialog-feedback {
.el-dialog__body {
padding: 0 !important;
}

169
src/components/Header.vue
Unescape View File

@ -1,22 +1,16 @@
<template>
<header class="header" id="myheader">
<div class="wrapper">
<!-- left -->
<nav class="nav">
<a class="nav-item item-lf" v-for="item in leftMenu" :key="item.id" :href="item.url"
:class="{active:item.name==='学院'}">{{item.name}}</a>
<a class="nav-item item-lf" v-for="item in leftMenu" :key="item.id" :href="item.url" :class="{ active: item.name === '学院' }">{{ item.name }}</a>
</nav>
<!-- center -->
<div class="search-box flex-1">
<form class="searchform" method="get" autocomplete="off" action="https://search.fanruan.com/?q=" target="_blank"
v-if="is_search">
<form class="searchform" method="get" autocomplete="off" action="https://search.fanruan.com/?q=" target="_blank" v-if="is_search">
<div class="el-input el-input--small el-input--suffix topsearch flex-1">
<input class="el-input__inner" name="q" type="text" autocomplete="off" tabindex="" aria-label=""
placeholder="请输入关键词" @focus="isfocus('focus')" @blur="isfocus('blur')" v-on:input="isinput">
<input class="el-input__inner" name="q" type="text" autocomplete="off" tabindex="" aria-label="" placeholder="请输入关键词" @focus="isfocus('focus')" @blur="isfocus('blur')" v-on:input="isinput" />
<button class="el-input__suffix search_sub" type="submit" :class="{ active_btn: kwbtn }">
<span class="el-input__suffix-inner search_btn">
<i class="iconfont icon-icon_icon-53 icon-ss" :class="{ active: kwfocus }"></i>
@ -25,7 +19,6 @@
</div>
</form>
<div class="searchform" v-else>
<div class="el-input el-input--small el-input--suffix topsearch flex-1">
<div class="el-input__inner" style="color: #B5C1D0; line-height: 30px;">登录后方可搜索</div>
@ -36,7 +29,6 @@
</button>
</div>
</div>
</div>
<!-- rigt -->
@ -47,9 +39,7 @@
</template>
<template v-else>
<el-dropdown :show-timeout="0">
<span class="el-dropdown-link item-rt">
{{ item.name }}<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<span class="el-dropdown-link item-rt"> {{ item.name }}<i class="el-icon-arrow-down el-icon--right"></i> </span>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item v-for="child in item.children" :key="child.id" style="padding: 0;">
@ -86,7 +76,6 @@
</el-dropdown>
</div> -->
<div class="notice_box">
<el-dropdown trigger="hover">
<el-badge :is-dot="is_dot" class="item badge" type="danger">
@ -112,7 +101,6 @@
</span>
<template #dropdown>
<el-dropdown-menu class="avatar_down">
<el-dropdown-item v-for="(item, i) in avatarMenu.baseMenu" :key="i" :icon="item.icon">
<a class="item-nav" :href="item.url">{{ item.name }}</a>
</el-dropdown-item>
@ -134,18 +122,14 @@
<el-dropdown-item v-for="(item, i) in avatarMenu.footerMenu" :key="i" :icon="item.icon">
<a class="item-nav" :href="item.url">{{ item.name }}</a>
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<div v-else class="loginReg flex-1">
<a class="loginbtn"
:href="com_id_url+'/cas/login?service='+com_edu_url+'/v1/user/cas/edu/login/?redirect='+$route.fullPath">登录</a>
<a class="loginbtn" :href="com_id_url + '/cas/login?service=' + com_edu_url + '/v1/user/cas/edu/login/?redirect=' + $route.fullPath">登录</a>
</div>
</nav>
</div>
</header>
<div class="edu-nav-box" v-if="isPc">
@ -154,8 +138,7 @@
<router-link class="logo" to="/"><img src="@/assets/logo.png"/></router-link>
<div class="edu-nav">
<router-link to="/">首页</router-link>
<router-link to="/studypath/finereport" :class="$route.meta.active == 'studypath' ? 'active':'' ">学习路径
</router-link>
<router-link to="/studypath/finereport" :class="$route.meta.active == 'studypath' ? 'active' : ''">学习路径 </router-link>
<router-link to="/video" :class="$route.meta.active == 'video' ? 'active' : ''">视频课</router-link>
<router-link to="/class" :class="$route.meta.active == 'class' ? 'active' : ''">学习班</router-link>
<router-link to="/live" :class="$route.meta.active == 'live' ? 'active' : ''">直播</router-link>
@ -168,15 +151,12 @@
<!-- 移动端 -->
<div class="edu-nav-box-m dn" v-else>
<!-- search -->
<div class="ss-main-box dn" :class="{ showss: ssOpen }">
<div class="search-box-m">
<form class="searchform" method="get" autocomplete="off" action="https://search.fanruan.com/?q=" target="_blank"
v-if="is_search">
<form class="searchform" method="get" autocomplete="off" action="https://search.fanruan.com/?q=" target="_blank" v-if="is_search">
<div class="el-input el-input--small el-input--suffix topsearch flex-1">
<input class="el-input__inner" name="q" type="text" autocomplete="off" tabindex="" aria-label=""
placeholder="请输入关键词" @focus="isfocus('focus')" @blur="isfocus('blur')" v-on:input="isinput">
<input class="el-input__inner" name="q" type="text" autocomplete="off" tabindex="" aria-label="" placeholder="请输入关键词" @focus="isfocus('focus')" @blur="isfocus('blur')" v-on:input="isinput" />
<button class="el-input__suffix search_sub" type="submit" :class="{ active_btn: kwbtn }">
<span class="el-input__suffix-inner search_btn">
<i class="iconfont icon-search icon-ss" :class="{ active: kwfocus }"></i>
@ -195,13 +175,11 @@
</button>
</div>
</div>
</div>
</div>
<div class="m-box flex-2">
<div class="flex-3 flex-1">
<!-- left -->
<div @click="drawer = true">
<i class="iconfont icon-zhankai1 ff18" style="margin-right: 10px;"></i>
@ -210,21 +188,25 @@
<!-- right -->
<div class="flex-1">
<!-- search-btn -->
<div class="ss-btn-m">
<i v-if="!ssOpen" class="iconfont icon-search ff18 col617 cur-p" @click="funssOpen(false)"></i>
<i v-else class="iconfont icon-cuohao1 ff18 col617 cur-p" @click="funssOpen(true);isfocus('blur');"></i>
<i
v-else
class="iconfont icon-cuohao1 ff18 col617 cur-p"
@click="
funssOpen(true);
isfocus('blur');
"
></i>
</div>
<el-dropdown v-if="com_user_token" class="personal" ref="userDropdown" trigger="click"
style="margin-left: 26px;">
<el-dropdown v-if="com_user_token" class="personal" ref="userDropdown" trigger="click" style="margin-left: 26px;">
<span class="el-dropdown-link">
<el-avatar :src="avatarUrl + uid" :size="32" fit="cover" icon="el-icon-user-solid"></el-avatar>
</span>
<template #dropdown>
<el-dropdown-menu class="avatar_down">
<el-dropdown-item v-for="(item, i) in avatarMenu.baseMenu" :key="i" :icon="item.icon">
<a class="item-nav" :href="item.url">{{ item.name }}</a>
</el-dropdown-item>
@ -246,19 +228,14 @@
<el-dropdown-item v-for="(item, i) in avatarMenu.footerMenu" :key="i" :icon="item.icon">
<a class="item-nav" :href="item.url">{{ item.name }}</a>
</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
<div v-else class="loginReg flex-1">
<a class="loginbtn" :href="com_id_url+'/login/signin/'+'?referrer='+wwwUrl"
v-if="com_node_env==='dist'">登录</a>
<a class="loginbtn" :href="com_id_url+'/signin/'+'?isfridapp=inapp&referrer='+wwwUrl" v-else>登录</a>
<a class="loginbtn" :href="com_login_url">登录</a>
</div>
</div>
</div>
</div>
</div>
@ -267,9 +244,7 @@
<div class="lf-nav-box-m">
<el-scrollbar style="height: 100%; width: 99%; position: absolute;">
<el-menu default-active="2-1" class="el-menu-lf" @open="handleOpen" @close="handleClose">
<li v-for="item in allMenu" :key="item.id">
<el-submenu index="item.id" v-if="item.ident === 'edu'">
<template #title>
<span class="col008 f16">
@ -282,34 +257,22 @@
<router-link to="/" class="lfnav-item" @click="drawer = false">学院首页</router-link>
</el-menu-item>
<el-menu-item index="2-2">
<router-link to="/studypath/finereport" @click="drawer=false" class="lfnav-item"
:class="$route.meta.active == 'studypath' ? 'active':'' ">学习路径
</router-link>
<router-link to="/studypath/finereport" @click="drawer = false" class="lfnav-item" :class="$route.meta.active == 'studypath' ? 'active' : ''">学习路径 </router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/video" @click="drawer=false" class="lfnav-item"
:class="$route.meta.active == 'video' ? 'active':'' ">视频课
</router-link>
<router-link to="/video" @click="drawer = false" class="lfnav-item" :class="$route.meta.active == 'video' ? 'active' : ''">视频课 </router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/class" @click="drawer=false" class="lfnav-item"
:class="$route.meta.active == 'class' ? 'active':'' ">学习班
</router-link>
<router-link to="/class" @click="drawer = false" class="lfnav-item" :class="$route.meta.active == 'class' ? 'active' : ''">学习班 </router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/live" @click="drawer=false" class="lfnav-item"
:class="$route.meta.active == 'live' ? 'active':'' ">直播
</router-link>
<router-link to="/live" @click="drawer = false" class="lfnav-item" :class="$route.meta.active == 'live' ? 'active' : ''">直播 </router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/cityclass" @click="drawer=false" class="lfnav-item"
:class="$route.meta.active == 'cityclass' ? 'active':'' ">
城市课堂</router-link>
<router-link to="/cityclass" @click="drawer = false" class="lfnav-item" :class="$route.meta.active == 'cityclass' ? 'active' : ''"> 城市课堂</router-link>
</el-menu-item>
<el-menu-item>
<router-link to="/more" @click="drawer=false" class="lfnav-item"
:class="$route.meta.active == 'more' ? 'active':'' ">资源导航
</router-link>
<router-link to="/more" @click="drawer = false" class="lfnav-item" :class="$route.meta.active == 'more' ? 'active' : ''">资源导航 </router-link>
</el-menu-item>
</el-menu-item-group>
</el-submenu>
@ -330,28 +293,23 @@
</el-menu-item>
</el-menu-item-group>
</el-submenu>
</li>
</el-menu>
</el-scrollbar>
</div>
</el-drawer>
</template>
<script>
import { defineComponent, reactive, toRefs, ref, getCurrentInstance } from "vue";
import teacherApplyModal from '@/components/TeacherApply/TeacherApplyModal';
import teacherApplyModal from "@/components/TeacherApply/TeacherApplyModal";
import { getMenuList } from "@/api/nav";
import { getNotice, avatarMenu } from "@/api/user";
import store from '@/store';
import { onBeforeRouteUpdate } from 'vue-router'
import store from "@/store";
import { onBeforeRouteUpdate } from "vue-router";
export default defineComponent({
components: {
teacherApplyModal
teacherApplyModal,
},
name: "Header",
setup() {
@ -370,17 +328,17 @@
is_search: false,
drawer: false,
ssOpen: false,
avatarUrl: 'https://bbs.fanruan.com/uc_server/avatar.php?uid=',
avatarUrl: "https://bbs.fanruan.com/uc_server/avatar.php?uid=",
uid: 0,
wwwUrl: ''
wwwUrl: "",
});
state.wwwUrl = window.location.href;
onBeforeRouteUpdate((to) => {
state.wwwUrl = proxy.$root.com_edu_url + to.path;
})
});
window.addEventListener('resize', function() {
window.addEventListener("resize", function() {
state.isPc = document.body.clientWidth > 1200;
});
@ -415,7 +373,7 @@
if (res.code === 200) {
state.u_notice = res.data.system;
if (state.u_notice > 0) {
state.is_dot = true
state.is_dot = true;
}
}
};
@ -441,9 +399,9 @@
function isinput(e) {
const { value } = e.target;
if (value) {
state.kwbtn = 1
state.kwbtn = 1;
} else {
state.kwbtn = 0
state.kwbtn = 0;
}
}
@ -457,7 +415,7 @@
return {
...toRefs(state),
input: ref(''),
input: ref(""),
isfocus,
isinput,
funssOpen,
@ -482,7 +440,6 @@
font-size: 16px;
}
}
}
.qrcode-box {
@ -498,7 +455,7 @@
height: 40px;
a {
color: #8C8C8C;
color: #8c8c8c;
margin-left: 12px;
}
}
@ -507,7 +464,7 @@
height: 40px;
a {
color: #FF7A45;
color: #ff7a45;
margin-left: 8px;
}
}
@ -531,7 +488,6 @@
min-width: 400px;
}
.nav {
position: relative;
height: 100%;
@ -596,12 +552,11 @@
}
}
.search-box {
height: 48px;
margin: 0 auto;
width: 40%;
transition: all .2s;
transition: all 0.2s;
.searchform {
width: 100%;
@ -634,23 +589,21 @@
}
}
.el-input__inner {
border: none;
border: 1px solid #EEF3FA;
background-color: #EEF3FA;
border: 1px solid #eef3fa;
background-color: #eef3fa;
border-radius: 100px;
font-size: 14px;
}
.el-input__inner:focus {
border: 1px solid #0082FC;
border: 1px solid #0082fc;
background-color: #fff;
}
::placeholder {
color: #8496AB !important;
color: #8496ab !important;
}
}
}
@ -696,10 +649,10 @@
.el-popper {
.nav-item {
padding: 0 20px;
color: #8496AB;
color: #8496ab;
&:hover {
color: #0082FC;
color: #0082fc;
}
}
}
@ -737,7 +690,7 @@
font-size: 14px;
color: #fff;
padding: 5px 20px;
background: linear-gradient(270deg, #0082FC 0%, #00BBFE 100%);
background: linear-gradient(270deg, #0082fc 0%, #00bbfe 100%);
@keyframes gradientBG {
0% {
@ -755,22 +708,18 @@
&:hover {
color: #fff;
background: linear-gradient(60deg, #0070d8, #0082FC, #00BBFE, #0ec4fc, #0082FC, #0070d8);
background: linear-gradient(60deg, #0070d8, #0082fc, #00bbfe, #0ec4fc, #0082fc, #0070d8);
background-size: 400% 400%;
animation: gradientBG 4s ease infinite;
}
}
a {
color: #8496ab;
}
a:hover {
color: #0082FC;
color: #0082fc;
}
}
@ -791,7 +740,7 @@
}
::v-deep .el-badge__content {
background-color: #FF3D23 !important;
background-color: #ff3d23 !important;
border: none;
margin: 6px 4px 0 0;
}
@ -812,14 +761,14 @@
.edu-nav a {
margin-left: 40px;
font-size: 18px
font-size: 18px;
}
.edu-nav-box {
background: #fff;
box-shadow: 0px 4px 6px -3px rgba(179, 193, 211, 0.3);
z-index: 6;
position: relative
position: relative;
}
.el-dropdown-menu__item {
@ -840,7 +789,6 @@
.m-box {
height: 50px;
padding: 0 20px;
}
.ss-main-box {
@ -848,14 +796,14 @@
background-color: #fff;
width: 100%;
padding: 0 20px;
transition: all .3s;
transition: all 0.3s;
margin-top: 0;
box-shadow: 0px 4px 6px -3px rgba(179, 193, 211, 0.3);
z-index: -1px;
}
.showss {
transition: all .3s;
transition: all 0.3s;
margin-top: 50px;
display: block !important;
}
@ -864,7 +812,7 @@
height: 48px;
padding-top: 3px;
width: 100%;
transition: all .2s;
transition: all 0.2s;
.searchform {
width: 100%;
@ -897,22 +845,21 @@
}
}
.el-input__inner {
border: none;
border: 1px solid #EEF3FA;
background-color: #EEF3FA;
border: 1px solid #eef3fa;
background-color: #eef3fa;
border-radius: 100px;
font-size: 14px;
}
.el-input__inner:focus {
border: 1px solid #0082FC;
border: 1px solid #0082fc;
background-color: #fff;
}
::placeholder {
color: #8496AB !important;
color: #8496ab !important;
}
}

39
src/views/live/live_play.vue
Unescape View File

@ -1,5 +1,5 @@
<template>
<div v-wechat-title="'正在直播：' +play_title"></div>
<div v-wechat-title="play_title + ' - ' + $route.meta.title"></div>
<appHeader />
<div v-if="!com_user_token">
@ -17,28 +17,25 @@
</div>
<div class="playbox" v-else>
<iframe scrolling="no" border="0" frameborder='0' allowfullscreen='true'
:src="'https://live.vhall.com/webinar/inituser/'+live.webinar_id+'?email='+live.uid+'@vhall.com&name='+live.liveUserName+'&k='+live.livekey"
width="100%" height="100%">
</iframe>
<!-- <iframe scrolling="no" border="0" frameborder="0" allowfullscreen="true" :src="'https://live.vhall.com/webinar/inituser/' + live.webinar_id + '?email=' + live.uid + '@vhall.com&name=' + live.liveUserName + '&k=' + live.livekey" width="100%" height="100%"> </iframe> -->
<iframe id="iframe_live" border="0" frameborder="0" allowfullscreen="true" :src="'https://live.polyv.cn/watch/' + live.webinar_id + '?userid=' + live.uid + '&ts=' + live.ts + '&sign=' + live.sign" width="100%" height="100%"> </iframe>
</div>
</template>
<script>
import appHeader from "@/components/Header";
import { useRoute } from 'vue-router'
import { useRoute } from "vue-router";
import { livePlay } from "@/api/live";
import { toRefs, reactive, getCurrentInstance } from 'vue';
import { toRefs, reactive, getCurrentInstance } from "vue";
export default {
name: 'live_play',
name: "live_play",
components: {
appHeader,
},
setup() {
const { proxy } = getCurrentInstance()
const route = useRoute()
const { proxy } = getCurrentInstance();
const route = useRoute();
const liveid = route.params.liveid;
const state = reactive({
isAuth: 1,
@ -48,8 +45,8 @@
playcur: 0,
logid: 0,
videoid: 0,
play_title: '',
})
play_title: "",
});
const reslivePlay = async () => {
const res = await livePlay(liveid);
@ -67,13 +64,19 @@
reslivePlay();
}
// setTimeout(function() {
// let iframeDocument = document.getElementById("iframe_live").contentWindow;
// console.log("iframeDocument=====", iframeDocument);
// iframeDocument.body.style.backgroundColor = "blue";
// }, 500);
return {
...toRefs(state),
liveid,
}
}
}
};
},
};
</script>
<style lang="scss" scoped>
@ -86,14 +89,10 @@
background-color: #000;
overflow: hidden;
}
</style>
<style lang="scss">
/*响应式-移动端*/
@media screen and (max-width: 800px) {
.header,
.edu-nav-box {
display: none;

2
src/views/studypath/fineDataLink.vue
Unescape View File

@ -66,7 +66,7 @@
<div class="w1200">
<div class="boxtil flex-1">
<div class="yinhao"></div>
<div class="txt">FineDatalLink学习路径</div>
<div class="txt">FineDataLink学习路径</div>
</div>
<div class="f24 col849 pt10">系统性自学 少走弯路</div>

2
src/views/studypath/jiandaoyun.vue
Unescape View File

@ -116,7 +116,7 @@
</div>
<div class="flex-6" style="margin: 10px 0 8px;">
<a class="btn-jdy f14 newbtn3" href="/video/387" target="_blank">数据分析</a>
<a class="btn-jdy f14 newbtn3" href="/video/442" target="_blank">数据分析</a>
<a class="btn-jdy f14 newbtn3" href="/video/108" target="_blank">智能助手</a>
</div>

Write Preview
Loading…
Cancel
Save