From 0550164092a07211012f4299b48e43e6e97ebb25 Mon Sep 17 00:00:00 2001 From: 夏洋涛 Date: Wed, 6 Aug 2025 10:36:20 +0800 Subject: [PATCH] feat:视频播放修改 --- src/App.vue | 40 +++++++++------------------------------- src/router/index.js | 344 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------ src/views/Service/ServiceKQ.vue | 143 ----------------------------------------------------------------------------------------------------------------------------------------------- src/views/dayStudy/studyList.vue | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------ src/views/dayStudy/summerVacation.vue | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------ src/views/dayStudy/video.vue | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 345 insertions(+), 462 deletions(-) create mode 100644 src/views/dayStudy/video.vue diff --git a/src/App.vue b/src/App.vue index 3fa9229..8234e8d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,42 +12,20 @@ export default { } }, watch: { - $route(to, from) { - console.log('zheliban 》》》 ', to, from) - this.$zwlogPvGlobal({ url: to.meta.pagePath, enterPageTime: new Date() }) - this.$zwlogPvGlobal({ - url: from.meta.pagePath, - leavePageTime: new Date(), - }) - }, + // $route(to, from) { + // console.log('zheliban 》》》 ', to, from) + // this.$zwlogPvGlobal({ url: to.meta.pagePath, enterPageTime: new Date() }) + // this.$zwlogPvGlobal({ + // url: from.meta.pagePath, + // leavePageTime: new Date(), + // }) + // }, }, mounted() { - ZWJSBridge.onReady(() => { - console.log('初始化完成后，执行bridge方法') - }) const isElder = localStorage.getItem('isElder') if (isElder) { this.isElder = true - } else { - ZWJSBridge.getUiStyle({}) - .then((result) => { - console.log(result) - if (result.uiStyle == 'elder') { - this.isElder = true - localStorage.setItem('isElder', 1) - } - }) - //浙里办APP 6.11.0 版本以下版本标准模式兼容 - .catch((error) => { - console.log(error) - }) - } - // 健康地址调用 - this.yxAxios.get(`https://ocp.sxsedu.net/szsh/health/check`).then((res) => { - console.log('健康地址:', JSON.stringify(res.data)) - const bodyElement = document.getElementsByTagName('body')[0] - bodyElement.append(JSON.stringify(res.data)) - }) + } }, methods: { setElder(e) { diff --git a/src/router/index.js b/src/router/index.js index 930efc9..1fe2756 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,7 +23,6 @@ import StudentDetail from '@/views/Home/StudentDetail.vue' //学生信息 import payneed from '@/views/Service/payneed.vue' //购买须知 import protocol from '@/views/Service/protocol.vue' //用户协议 - import schoolFollow from '@/views/Travel/schoolFollow.vue' //已关注学校列表 import schoolAttestation from '@/views/Travel/schoolAttestation.vue' //已认证学校列表 import classAttestation from '@/views/Travel/classAttestation.vue' //已集团权限年级班级列表 @@ -44,328 +43,337 @@ import studyList from '@/views/dayStudy/studyList.vue' //每日一习主页面 import summerVacation from '@/views/dayStudy/summerVacation.vue' //每日一习主页面 import ans_question from '@/views/answerRank/ans_question.vue' //答题 import switchUser from '@/views/answerRank/switchUser.vue' //切换 +import video from '@/views/dayStudy/video.vue' //视频播放 import store from '../store' Vue.use(VueRouter) -const [routerPush, routerReplace] = [VueRouter.prototype.push, VueRouter.prototype.replace]; -VueRouter.prototype.push = function push (to) { - return routerPush.call(this, to).catch(err => err) +const [routerPush, routerReplace] = [VueRouter.prototype.push, VueRouter.prototype.replace] +VueRouter.prototype.push = function push(to) { + return routerPush.call(this, to).catch((err) => err) +} +VueRouter.prototype.replace = function replace(location) { + return routerReplace.call(this, location).catch((error) => error) } -VueRouter.prototype.replace = function replace (location) { - return routerReplace.call(this, location).catch(error => error); -}; -const routes = [{ +const routes = [ + { path: '/', name: 'ServiceKQ', component: ServiceKQ, meta: { - title: '红色网上游' - } -}, { + title: '红色网上游', + }, + }, + { path: '/home', name: 'Home', component: Home, meta: { - title: '红色网上游' - } -}, -{ + title: '红色网上游', + }, + }, + { path: '/home_user_info', name: 'HomeUserInfo', component: HomeUserInfo, meta: { - title: '红色网上游' - } -}, -{ + title: '红色网上游', + }, + }, + { path: '/abroad_detail', name: 'ServiceAbroadDetail', component: ServiceAbroadDetail, meta: { - title: '红色网上游' - } -}, + title: '红色网上游', + }, + }, - -{ + { path: '/service_orderXST', name: 'ServiceOrderXST', component: ServiceOrderXST, meta: { - title: '我的评价' - } -}, -{ + title: '我的评价', + }, + }, + { path: '/evaluateCourse', name: 'evaluateCourse', component: evaluateCourse, meta: { - title: '评价' - } -}, -{ + title: '评价', + }, + }, + { path: '/evaluateBase', name: 'evaluateBase', component: evaluateBase, meta: { - title: '基地评价' - } -}, -{ + title: '基地评价', + }, + }, + { path: '/evaluateDetail', name: 'evaluateDetail', component: evaluateDetail, meta: { - title: '评价详情' - } -}, -{ + title: '评价详情', + }, + }, + { path: '/service_abroad_evaluate', name: 'ServiceAbroadEvaluate', component: ServiceAbroadEvaluate, meta: { - title: '评价' - } -}, -{ + title: '评价', + }, + }, + { path: '/YanxueCode', name: 'YanxueCode', component: YanxueCode, meta: { - title: '研学码' - } -}, -{ + title: '研学码', + }, + }, + { path: '/YanxueInfo', name: 'YanxueInfo', component: YanxueInfo, meta: { - title: '研学码信息' - } -}, -{ + title: '研学码信息', + }, + }, + { path: '/chooseSchool', name: 'chooseSchool', component: chooseSchool, meta: { - title: '选择学校' - } -}, -{ + title: '选择学校', + }, + }, + { path: '/select_contact', name: 'SelectContact', component: SelectContact, meta: { - title: '选择出行人' - } -}, -{ + title: '选择出行人', + }, + }, + { path: '/edit_contact', name: 'EditContact', component: EditContact, meta: { - title: '修改出行人' - } -}, -{ + title: '修改出行人', + }, + }, + { path: '/MyClassList', name: 'MyClassList', component: MyClassList, meta: { - title: '基地签到' - } -}, -{ + title: '基地签到', + }, + }, + { path: '/StudentDetail', name: 'StudentDetail', component: StudentDetail, meta: { - title: '学生信息' - } -}, -{ + title: '学生信息', + }, + }, + { path: '/payneed', name: 'payneed', component: payneed, meta: { - title: '购买须知' - } -}, -{ + title: '购买须知', + }, + }, + { path: '/protocol', name: 'protocol', component: protocol, meta: { - title: '用户协议' - } -}, -{ + title: '用户协议', + }, + }, + { path: '/schoolFollow', name: 'schoolFollow', component: schoolFollow, meta: { - title: '关注学校' - } -}, -{ + title: '关注学校', + }, + }, + { path: '/schoolAttestation', name: 'schoolAttestation', component: schoolAttestation, meta: { - title: '已认证学校' - } -}, -{ + title: '已认证学校', + }, + }, + { path: '/classAttestation', name: 'classAttestation', component: classAttestation, meta: { - title: '集团认领' - } -}, -{ + title: '集团认领', + }, + }, + { path: '/YanxuePage', name: 'YanxuePage', component: YanxuePage, meta: { - title: '每日一习' - } -}, -{ + title: '每日一习', + }, + }, + { path: '/achievements', name: 'achievements', component: achievements, meta: { - title: '研学成果' - } -}, -{ + title: '研学成果', + }, + }, + { path: '/achievementsOne', name: 'achievementsOne', component: achievementsOne, meta: { - title: '研学成果' - } -}, -{ + title: '研学成果', + }, + }, + { path: '/chooseSchoolOne', name: 'chooseSchoolOne', component: chooseSchoolOne, meta: { - title: '选择学校' - } -}, -{ + title: '选择学校', + }, + }, + { path: '/pageDetails', name: 'pageDetails', component: pageDetails, meta: { - title: '研学成果' - } -}, -{ + title: '研学成果', + }, + }, + { path: '/rank', name: 'rank', component: rank, meta: { - title: '排行榜' - } -}, -{ + title: '排行榜', + }, + }, + { path: '/ans_rank', name: 'ans_rank', component: ans_rank, meta: { - title: '排行榜' - } -}, -{ + title: '排行榜', + }, + }, + { path: '/brush_questions', name: 'brush_questions', component: brush_questions, meta: { - title: '刷题记录' - } -}, -{ + title: '刷题记录', + }, + }, + { path: '/category', name: 'category', component: category, meta: { - title: '题库' - } -}, -{ + title: '题库', + }, + }, + { path: '/stars', name: 'stars', component: stars, meta: { - title: '五星少年' - } -}, -{ + title: '五星少年', + }, + }, + { path: '/dayStudy', name: 'dayStudy', component: dayStudy, meta: { - title: '每日一习' - } -}, -{ + title: '每日一习', + }, + }, + { path: '/studyList', name: 'studyList', component: studyList, meta: { - title: '每日一习' - } -}, -{ + title: '每日一习', + }, + }, + { path: '/summerVacation', name: 'summerVacation', component: summerVacation, meta: { - title: '每日一习' - } -}, -{ + title: '每日一习', + }, + }, + { + path: '/video', + name: 'video', + component: video, + meta: { + title: '视频', + }, + }, + { path: '/ans_question', name: 'ans_question', component: ans_question, meta: { - title: '答题' - } -}, -{ + title: '答题', + }, + }, + { path: '/switchUser', name: 'switchUser', component: switchUser, meta: { - title: '切换用户' - } -}, -{ + title: '切换用户', + }, + }, + { path: '/YanxueDetail', name: 'YanxueDetail', component: YanxueDetail, - meta: {} -}, - + meta: {}, + }, ] const router = new VueRouter({ - mode: 'hash', - // base: process.env.BASE_URL+'/center', - base: process.env.BASE_URL, - routes + mode: 'hash', + // base: process.env.BASE_URL+'/center', + base: process.env.BASE_URL, + routes, }) router.beforeEach((to, from, next) => { - /* 路由发生变化修改页面title */ - if (to.meta.title) { - // document.title = to.meta.title - ZWJSBridge.setTitle({ - "title": to.meta.title - }) - } - next() + /* 路由发生变化修改页面title */ + if (to.meta.title) { + // document.title = to.meta.title + ZWJSBridge.setTitle({ + title: to.meta.title, + }) + } + next() }) -export default router \ No newline at end of file +export default router diff --git a/src/views/Service/ServiceKQ.vue b/src/views/Service/ServiceKQ.vue index f299336..cc00bc2 100644 --- a/src/views/Service/ServiceKQ.vue +++ b/src/views/Service/ServiceKQ.vue @@ -13,151 +13,8 @@ export default { } }, mounted() { - console.log('xst mounted') - // this.checkAuth() - //二次回退 - const sUserAgent = window.navigator.userAgent.toLowerCase() - const bIsAlipayMini = sUserAgent.indexOf('miniprogram') > -1 && sUserAgent.indexOf('alipay') > -1 - if (bIsAlipayMini) { - console.log('我来自支付宝,popstate') - window.addEventListener('popstate', this.listenerPopstate, true) - } else { - console.log('我来自浙里办,popstate') - window.addEventListener('popstate', this.listenerPopstate, true) - } - }, - //销毁监听 - destroyed() { - console.log('销毁支付宝监听') - window.removeEventListener('popstate', this.listenerPopstate, true) }, methods: { - //支付宝二次回退方法，addEventListener和removeEventListener一定要调用方法，不然无效 - listenerPopstate() { - ZWJSBridge.close() - }, - checkAuth() { - let centerNo = localStorage.getItem('centerNo') - let ticket = this.common.getUrlParam('ticket') //浙里办app访问 - let ticketId = this.common.getUrlParam('ticketId') //浙里办微信小程序访问 - if (centerNo) { - // alert('有中台编号：' + centerNo) - this.centerNo = centerNo - localStorage.setItem('centerNo', centerNo) - this.getUserInfo() - } else if (ticket && ticket.indexOf('debug') == -1) { - // ZWJSBridge.alert({ - // message: '有ticket：' + ticket, - // }) - this.getCenterByTicket(ticket) - } else if (ticketId && ticketId.indexOf('debug') == -1) { - // ZWJSBridge.alert({ - // message: '有ticketId：' + ticketId, - // }) - this.getCenterByTicketId(ticketId) - localStorage.setItem('isWechat', 1) - } else { - const sUserAgent = window.navigator.userAgent.toLowerCase() - const dtdreamweb = sUserAgent.indexOf('dtdreamweb') > -1 - const miniprogram = sUserAgent.indexOf('miniprogram') > -1 && sUserAgent.indexOf('alipay') > -1 - if (dtdreamweb) { - // alert('浙里办') - window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc` - } else if (miniprogram) { - // alert('支付宝') - window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=82a7a71edb794fc285895f9e33290ddc` - } else { - alert('非浙里办渠道访问，显示测试用户数据') - console.log('非浙里办渠道访问，显示测试用户数据', userData) - this.centerNo = '2022031508525674030748540013076' - localStorage.setItem('centerNo', '2022031508525674030748540013076') - let userInfo = JSON.stringify(userData) - localStorage.setItem('userInfo', userInfo) - this.getUserInfo() - } - } - }, - // 通过ticket获取centerNo - getCenterByTicket(ticket) { - this.yxAxios.get(`${this.proxyUrl}/api/third/getCenterNo?ticket=${ticket}`).then((res) => { - if (res.data.code == 200) { - console.log('通过ticket获取centerNo成功:', res.data) - this.centerNo = res.data.message - localStorage.setItem('centerNo', res.data.message) - this.getUserInfo() - } else { - console.log('通过ticket获取centerNo失败:', res.data.code) - this.reLoad() - } - }) - }, - // 通过ticketId获取centerNo - getCenterByTicketId(ticketId) { - // alert(ticketId) - this.yxAxios.get(`${this.proxyUrl}/api/third/getCenterNoWx?ticket=${ticketId}`).then((res) => { - if (res.data.code == 200) { - console.log('通过ticketId获取centerNo成功:', res.data) - this.centerNo = res.data.message - localStorage.setItem('centerNo', res.data.message) - this.getUserInfo() - } else { - console.log('通过ticketId获取centerNo失败:', res.data.code) - this.reLoad() - } - }) - }, - reLoad() { - console.log('reload') - const sUserAgent = window.navigator.userAgent.toLowerCase() - const dtdreamweb = sUserAgent.indexOf('dtdreamweb') > -1 - const miniprogram = sUserAgent.indexOf('miniprogram') > -1 && sUserAgent.indexOf('alipay') > -1 - // if (localStorage.getItem('reloadCount') == 2) { - // localStorage.setItem('reloadCount', 1) - // ZWJSBridge.confirm({ - // title: '警告', - // buttonLabels: ['重新载入'], - // message: '用户身份验证失败，请重新加载', - // }).then((res) => { - // if (dtdreamweb) { - // // alert('浙里办') - // window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc` - // } else if (miniprogram) { - // // alert('支付宝') - // window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=82a7a71edb794fc285895f9e33290ddc` - // } else { - // // alert('浙里办') - // window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc` - // } - // }) - // } else { - // localStorage.setItem('reloadCount', 2) - if (miniprogram) { - // alert('支付宝') - window.location.href = `https://puser.zjzwfw.gov.cn/sso/alipay.do?action=ssoLogin&servicecode=82a7a71edb794fc285895f9e33290ddc` - } else { - // alert('浙里办') - window.location.href = `https://puser.zjzwfw.gov.cn/sso/mobile.do?action=oauth&scope=1&servicecode=82a7a71edb794fc285895f9e33290ddc` - } - // } - }, - // 获取用户信息 - getUserInfo() { - this.centerNo = localStorage.getItem('centerNo') - // alert('getUserInfo:' + this.centerNo) - this.yxAxios.post(`${this.proxyUrl}/user/info/getPortalUserByNumV2?userNum=${localStorage.getItem('centerNo')}`).then((res) => { - console.log('获取用户信息getPortalUserByNum:', res) - if (res.data.code == 200) { - let userInfo = res.data.data.userInfo - localStorage.setItem('userInfo', JSON.stringify(userInfo)) - this.userInfo = userInfo - localStorage.setItem('_user_nick', userInfo.travelerName) - this.$zwlogPvGlobal({ loadTime: new Date() }) - this.$nextTick(() => { - this.$zwlogPvGlobal({ responseTime: new Date() }) - }) - } - }) - }, }, components: { ServiceBasekq, diff --git a/src/views/dayStudy/studyList.vue b/src/views/dayStudy/studyList.vue index 45d771f..7880dd7 100644 --- a/src/views/dayStudy/studyList.vue +++ b/src/views/dayStudy/studyList.vue @@ -1,76 +1,79 @@ \ No newline at end of file + diff --git a/src/views/dayStudy/summerVacation.vue b/src/views/dayStudy/summerVacation.vue index 278c95f..87560ed 100644 --- a/src/views/dayStudy/summerVacation.vue +++ b/src/views/dayStudy/summerVacation.vue @@ -1,76 +1,79 @@ \ No newline at end of file + diff --git a/src/views/dayStudy/video.vue b/src/views/dayStudy/video.vue new file mode 100644 index 0000000..05908c2 --- /dev/null +++ b/src/views/dayStudy/video.vue @@ -0,0 +1,34 @@ + + + + + -- libgit2 0.21.0