Skip to content

L
learn-online-pc
提交 1cba4dc7 authored 作者: 王鹏飞's avatar 王鹏飞
浏览文件
操作

merge...

上级 52d9e383 370b3e71
显示空白字符变更
内嵌 并排
正在显示 包含 28 行增加 和 55 行删除
src/components/beforeEnter/Before.js
浏览文件 @ 1cba4dc7
......@@ -9,10 +9,11 @@ export default class Before {
this.isMobile = /iphone/i.test(UA) || (/android/i.test(UA) && /mobile/i.test(UA))
this.isIe = window.ActiveXObject || 'ActiveXObject' in window
this.isChrome = !!window.chrome && (!!window.chrome.webstore || !!window.chrome.runtime)
this.chromeVersion = 0
if (this.isChrome) {
this.chromeVersion = parseFloat(UA.match(/Chrome\/([\d.]+)/)[1])
}
// this.chromeVersion = 0
// if (this.isChrome) {
// const temp = UA.match(/Chrome\/([\d.]+)/)
// this.chromeVersion = temp ? parseFloat(temp[1]) : 0
// }
// this.notSupport = !this.isMobile && (this.isIe || (this.isChrome && this.chromeVersion < 70))
this.notSupport = !this.isMobile && this.isIe
// https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
......
src/index.html
浏览文件 @ 1cba4dc7
......@@ -8,59 +8,22 @@
<title></title>
<meta
name="viewport"
id="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no"
/>
<!-- 直接引入aliyun播放插件 CSS -->
<link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.9.1/skins/default/aliplayer-min.css" />
<link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.9.3/skins/default/aliplayer-min.css" />
</head>
<body>
<div id="app"></div>
<!-- es5 兼容 新方法 -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-shim.min.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/es5-sham.min.js"></script> -->
<!-- 三方插件引入 -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/ckeditor/ckeditor.js"></script>
<script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/videoJs/videoJs.js"></script> -->
<!-- common -->
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js"
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/md5.js"
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/jQuery-2.1.4.min.js"
></script>
<script
type="text/javascript"
src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"
></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/base64.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/jQuery-2.1.4.min.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/common/runtime.js"></script>
<!-- 直接引入aliyun播放插件 JS -->
<script
type="text/javascript"
charset="utf-8"
src="https://g.alicdn.com/de/prismplayer/2.9.1/aliplayer-min.js"
></script>
<script
type="text/javascript"
charset="utf-8"
src="https://player.alicdn.com/aliplayer/presentation/js/aliplayercomponents.min.js"
></script>
<script charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.9.3/aliplayer-min.js"></script>
<!-- 解决iframe嵌套，CC视频在safri中打开免登陆兼容问题 -->
<script src="//view.csslcloud.net/js/_fix_.js"></script>
<script src="//view.csslcloud.net/js/jquery-1.9.0.min.js" type="text/javascript"></script>
<script src="//view.csslcloud.net/js/sdk/3.1.0/liveSDK.js" type="text/javascript"></script>
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/notify/notification.js"></script> -->
<!-- <script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/errorCollection/collection.js"></script> -->
<!--[if lt IE 9]>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script>
<![endif]-->
<!-- <script src="//view.csslcloud.net/js/sdk/3.1.0/liveSDK.js" type="text/javascript"></script> -->
</body>
</html>
src/modules/offices/src/reportPaper/edit.vue
浏览文件 @ 1cba4dc7
......@@ -50,7 +50,7 @@
<el-form-item label="支付方式" style="margin: 0" v-if="detail.pay !== -1">
{{ payText }}
</el-form-item>
<el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1">
<el-form-item label="支付状态" style="margin: 0" v-if="detail.pay !== -1 && ruleForm.payment !== '3'">
{{ payStatusText }}
</el-form-item>
<el-form-item label="审批状态" style="margin: 0">
......
src/modules/offices/src/reportPaper/list.vue
浏览文件 @ 1cba4dc7
......@@ -35,6 +35,15 @@ export default {
this.$router.push({ name: 'pareportView', params: { id: row.id }, query: { id: row.affair_id } })
}
},
{
label: '支付',
isShow(row) {
return row.pay === 0
},
onClick: row => {
this.$router.push({ name: 'pareportEdit', params: { id: row.id }, query: { id: row.affair_id } })
}
},
{
label: '编辑',
isShow(row) {
......
src/pages/grade/credit.vue
浏览文件 @ 1cba4dc7
......@@ -86,12 +86,12 @@ export default {
tableHead: [
{ prop: 'index', label: this.$t('pages.grade.credit.serialNumber'), width: '60px' },
{ prop: 'semester_name', label: this.$t('pages.grade.credit.semester') },
{ prop: 'class_name', label: this.$t('pages.grade.credit.class') },
{ prop: 'class_name', label: this.$t('pages.grade.credit.class'), width: '200px' },
{ prop: 'course_name', label: this.$t('pages.grade.credit.course') },
{ prop: 'course_credit', label: this.$t('pages.grade.credit.courseCredits') },
{ prop: 'passed', label: this.$t('pages.grade.credit.status') },
{ prop: 'credit', label: this.$t('pages.grade.credit.credit') },
{ prop: 'score', label: this.$t('pages.grade.credit.grade') },
{ prop: 'course_credit', label: this.$t('pages.grade.credit.courseCredits'), width: '100px' },
{ prop: 'passed', label: this.$t('pages.grade.credit.status'), width: '100px' },
{ prop: 'credit', label: this.$t('pages.grade.credit.credit'), width: '100px' },
{ prop: 'score', label: this.$t('pages.grade.credit.grade'), width: '100px' },
// { prop: '', label: this.$t('pages.grade.credit')'', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数
{
prop: 'operate-x',
......
src/pages/mobile/list.vue
浏览文件 @ 1cba4dc7
<template>
<div class="pages">
<div class="head">
<img class="logo" src="../../assets/images/logo-header.png" />
<img class="logo" src="https://zws-imgs-pub.ezijing.com/pc/base/logo.svg" />
<div class="language" style="overflow: hidden">
<language-switch style="float: right" />
</div>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论