Skip to content

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

merge...

上级 e1dc663a 1da2e139
显示空白字符变更
内嵌 并排
正在显示 包含 58 行增加 和 39 行删除
.config.dev.js
浏览文件 @ f6b2a9c8
...@@ -4,7 +4,8 @@ module.exports = { ...@@ -4,7 +4,8 @@ module.exports = {
apiBaseURL: 'https://learn-api2.ezijing.com', apiBaseURL: 'https://learn-api2.ezijing.com',
others: { others: {
url: '/app/learn/course', url: '/app/learn/course',
loginUrl: 'https://login2.ezijing.com/bluestar/login/index' loginUrl: 'https://login2.ezijing.com/sofia/login/index',
messageBaseURL: 'https://test-microservices-message-service-api.ezijing.com'
}, },
webpack: { webpack: {
externals: { externals: {
......
.config.pro.js
浏览文件 @ f6b2a9c8
...@@ -5,7 +5,8 @@ module.exports = { ...@@ -5,7 +5,8 @@ module.exports = {
// apiBaseURL: '/', // apiBaseURL: '/',
others: { others: {
url: '/app/learn/course', url: '/app/learn/course',
loginUrl: 'https://login.ezijing.com/bluestar/login/index' loginUrl: 'https://login.ezijing.com/sofia/login/index',
messageBaseURL: ''
}, },
webpack: { webpack: {
externals: { externals: {
......
.config.test.js
浏览文件 @ f6b2a9c8
...@@ -5,7 +5,8 @@ module.exports = { ...@@ -5,7 +5,8 @@ module.exports = {
// apiBaseURL: '/', // apiBaseURL: '/',
others: { others: {
url: '/app/learn/course', url: '/app/learn/course',
loginUrl: 'https://login2.ezijing.com/bluestar/login/index' loginUrl: 'https://login2.ezijing.com/sofia/login/index',
messageBaseURL: 'https://test-microservices-message-service-api.ezijing.com'
}, },
isUploadStatic: false, isUploadStatic: false,
webpack: { webpack: {
......
package-lock.json
浏览文件 @ f6b2a9c8
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
浏览文件 @ f6b2a9c8
...@@ -72,16 +72,17 @@ ...@@ -72,16 +72,17 @@
"webpack-merge": "^4.2.2" "webpack-merge": "^4.2.2"
}, },
"dependencies": { "dependencies": {
"@ckeditor/ckeditor5-build-classic": "^24.0.0", "@ckeditor/ckeditor5-build-classic": "^25.0.0",
"@ckeditor/ckeditor5-vue2": "^1.0.5", "@ckeditor/ckeditor5-vue2": "^1.0.5",
"axios": "^0.21.0", "@ezijing/web-message-sdk": "^0.2.1",
"core-js": "^3.8.1", "axios": "^0.21.1",
"core-js": "^3.9.0",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"element-ui": "^2.14.1", "element-ui": "^2.15.1",
"js-cookie": "^2.2.1", "js-cookie": "^2.2.1",
"lodash": "^4.17.20", "lodash": "^4.17.21",
"qrcode.vue": "^1.7.0", "qrcode.vue": "^1.7.0",
"qs": "^6.9.4", "qs": "^6.9.6",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-i18n": "^8.22.2", "vue-i18n": "^8.22.2",
"vue-loader": "^15.9.5", "vue-loader": "^15.9.5",
......
src/components/learnSysLayout/navigation.vue
浏览文件 @ f6b2a9c8
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
<div class="text-title" @click="setStatus">{{ $t('components.learnSysLayout.navigation.title') }}</div> <div class="text-title" @click="setStatus">{{ $t('components.learnSysLayout.navigation.title') }}</div>
</div> </div>
<div class="nav-right"> <div class="nav-right">
<div class="notify" @click="goNotify()"> <div class="nav-message"></div>
<!-- <div class="notify" @click="goNotify()">
{{ $t('components.learnSysLayout.navigation.tip') }} {{ $t('components.learnSysLayout.navigation.tip') }}
<div class="num" v-if="this.$store.getters.myMsg != 0">{{ this.$store.getters.myMsg }}</div> <div class="num" v-if="this.$store.getters.myMsg != 0">{{ this.$store.getters.myMsg }}</div>
</div> </div> -->
<!-- <language-switch /> --> <!-- <language-switch /> -->
</div> </div>
</div> </div>
...@@ -16,8 +17,8 @@ ...@@ -16,8 +17,8 @@
<script> <script>
import LanguageSwitch from '@/components/languageSwitch/index.vue' import LanguageSwitch from '@/components/languageSwitch/index.vue'
import cAction from '../../action' // import cAction from '../../action'
import Message from '@ezijing/web-message-sdk'
export default { export default {
components: { LanguageSwitch }, components: { LanguageSwitch },
data() { data() {
...@@ -26,14 +27,15 @@ export default { ...@@ -26,14 +27,15 @@ export default {
} }
}, },
mounted() { mounted() {
cAction.Other.getNavMsg() // cAction.Other.getNavMsg()
.then(data => { // .then(data => {
this.$store.commit('myMsg', data.num) // this.$store.commit('myMsg', data.num)
}) // })
.catch(e => { // .catch(e => {
this.$message.error(e.message) // this.$message.error(e.message)
}) // })
.finally(() => {}) // 新版通知
Message({ container: '.nav-message', source: 'SOFIA_WEB', baseURL: webConf.others.messageBaseURL })
}, },
methods: { methods: {
goNotify() { goNotify() {
......
src/index.html
浏览文件 @ f6b2a9c8
...@@ -25,5 +25,9 @@ ...@@ -25,5 +25,9 @@
<!-- 解决iframe嵌套，CC视频在safri中打开免登陆兼容问题 --> <!-- 解决iframe嵌套，CC视频在safri中打开免登陆兼容问题 -->
<script src="//view.csslcloud.net/js/_fix_.js"></script> <script src="//view.csslcloud.net/js/_fix_.js"></script>
<!-- <script src="//view.csslcloud.net/js/sdk/3.1.0/liveSDK.js" type="text/javascript"></script> --> <!-- <script src="//view.csslcloud.net/js/sdk/3.1.0/liveSDK.js" type="text/javascript"></script> -->
<!-- 日志采集 -->
<script src="https://zws-imgs-pub.ezijing.com/static/plugin/mqtt_msg.godzyx-1.0.3.js"></script>
<script src="https://zws-imgs-pub.ezijing.com/static/plugin/error.godzyx-1.0.3.js"></script>
</body> </body>
</html> </html>
src/modules/offices/components/pay.vue
浏览文件 @ f6b2a9c8
...@@ -43,19 +43,25 @@ export default { ...@@ -43,19 +43,25 @@ export default {
computed: { computed: {
qrcodeValue() { qrcodeValue() {
return this.order.url return this.order.url
},
pid() {
return this.$route.params.id
},
notifyUrl() {
return `${webConf.apiBaseURL}/api/lms/v2/lobby/update-status-api/${this.pid}`
} }
}, },
methods: { methods: {
// 创建微信订单 // 创建微信订单
createWxPayOrder(productId, num = 1) { createWxPayOrder(productId, num = 1) {
return api.createWxpayOrder('ezijing', productId, { num }).then(response => { return api.createWxpayOrder('ezijing', productId, { num, notify_url: this.notifyUrl }).then(response => {
this.order = response this.order = response
return response return response
}) })
}, },
// 创建支付宝订单 // 创建支付宝订单
createAliPayOrder(productId, num = 1) { createAliPayOrder(productId, num = 1) {
return api.createAlipayOrder(productId, { type: 2, num }).then(response => { return api.createAlipayOrder(productId, { type: 2, num, notify_url: this.notifyUrl }).then(response => {
this.order = response this.order = response
return response return response
}) })
......
src/modules/offices/mixins/list.js
浏览文件 @ f6b2a9c8
...@@ -2,7 +2,7 @@ import TableList from '@/components/comTable/tableList' ...@@ -2,7 +2,7 @@ import TableList from '@/components/comTable/tableList'
import * as api from '../api' import * as api from '../api'
export default { export default {
props: { affairId: { type: String, required: true } }, props: { affairId: { type: String, required: true }, hasAdd: { type: Boolean, default: true } },
components: { TableList }, components: { TableList },
data() { data() {
return { return {
......
src/modules/offices/src/activity/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请新的活动</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请新的活动</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/offices/src/certSchool/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请索菲亚在读证明</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请索菲亚在读证明</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/offices/src/certStudy/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请紫荆在读证明</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请紫荆在读证明</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/offices/src/index.vue
浏览文件 @ f6b2a9c8
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</div> </div>
<Tap :tapParam="tapParam" @tapParam="tapIndexs"></Tap> <Tap :tapParam="tapParam" @tapParam="tapIndexs"></Tap>
<div class="con-box" v-if="affairId"> <div class="con-box" v-if="affairId">
<component :is="currentComponent" :affairId="affairId"></component> <component :is="currentComponent" :affairId="affairId" :hasAdd="hasAdd"></component>
</div> </div>
</div> </div>
</template> </template>
...@@ -64,6 +64,9 @@ export default { ...@@ -64,6 +64,9 @@ export default {
affairId() { affairId() {
return this.active ? this.active.id : '' return this.active ? this.active.id : ''
}, },
hasAdd() {
return this.active ? this.active.close !== '1' : false
},
currentComponent() { currentComponent() {
const components = { const components = {
symposium: 'ActivityList', symposium: 'ActivityList',
......
src/modules/offices/src/reportE/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请电子成绩单</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请电子成绩单</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/offices/src/reportPaper/edit.vue
浏览文件 @ f6b2a9c8
...@@ -111,9 +111,9 @@ export default { ...@@ -111,9 +111,9 @@ export default {
email: [{ required: true, message: '请输入邮寄地址', trigger: 'blur' }] email: [{ required: true, message: '请输入邮寄地址', trigger: 'blur' }]
}, },
productList: [ productList: [
{ label: '1份—￥126元', value: '1', product_id: '6747325185390542848' }, { label: '1份—￥127元', value: '1', product_id: '6747325185390542848' },
{ label: '2份—￥201元', value: '2', product_id: '6747325279879823360' }, { label: '2份—￥203元', value: '2', product_id: '6747325279879823360' },
{ label: '3份—￥276元', value: '3', product_id: '6747325351686307840' } { label: '3份—￥278元', value: '3', product_id: '6747325351686307840' }
], ],
payVisible: false payVisible: false
} }
......
src/modules/offices/src/reportPaper/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请纸质成绩单</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请纸质成绩单</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/offices/src/retake/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请重修</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请重修</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/offices/src/share/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请新乐分享</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请新乐分享</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/offices/src/studyContinue/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请复学</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请复学</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/offices/src/studyPause/list.vue
浏览文件 @ f6b2a9c8
<template> <template>
<div> <div>
<el-button type="primary" @click="handleAdd">申请休学</el-button> <el-button type="primary" @click="handleAdd" v-if="hasAdd">申请休学</el-button>
<div style="height: 20px"></div> <div style="height: 20px"></div>
<table-list :remote="remote" :columns="columns" ref="tableList"></table-list> <table-list :remote="remote" :columns="columns" ref="tableList"></table-list>
</div> </div>
......
src/modules/viewer/components/work/courseWork.vue
浏览文件 @ f6b2a9c8
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<el-step :title="$t('viewerWork.workStep1')" status="process"> <el-step :title="$t('viewerWork.workStep1')" status="process">
<template v-slot:description> <template v-slot:description>
<div v-html="data.curriculum.curriculum_essay"></div> <div v-html="data.curriculum.curriculum_essay"></div>
<p>{{ $t('viewerWork.workDeadline') }}：{{ data.end_date }}</p> <p>{{ $t('viewerWork.workDeadline') }}：{{ data.essay_date }}</p>
</template> </template>
</el-step> </el-step>
<el-step :title="$t('viewerWork.workStep2')" status="process"> <el-step :title="$t('viewerWork.workStep2')" status="process">
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</template> </template>
</el-step> </el-step>
<el-step :title="$t('viewerWork.workStep3')" status="process"> <el-step :title="$t('viewerWork.workStep3')" status="process">
<template #title>{{ $t('viewerWork.workStep3') }}（{{ data.end_date }}）</p></template> <template #title>{{ $t('viewerWork.workStep3') }}（{{ data.essay_date }}）</p></template>
<template v-slot:description> <template v-slot:description>
<div class="work-bottom" v-if="detail"> <div class="work-bottom" v-if="detail">
<div class="info"> <div class="info">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论