Skip to content

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

新增prp学习系统

上级 fd660984 bdf85846
隐藏空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 42 行删除
.config.dev.js
浏览文件 @ 1a7349e1
module.exports = {
domain: 'dev.ezijing.com',
url: 'https://learn-api.ezijing.com/api',
apiBaseURL: 'https://learn-api.ezijing.com',
url: 'https://learn-api2.ezijing.com/api',
apiBaseURL: 'https://learn-api2.ezijing.com',
others: {
url: '/app/learn/course',
loginUrl: 'https://login.ezijing.com/wmp/login/index'
loginUrl: 'https://login2.ezijing.com/sofia/login/index',
messageBaseURL: 'https://test-microservices-message-service-api.ezijing.com'
},
webpack: {
externals: {
......
.config.pro.js
浏览文件 @ 1a7349e1
......@@ -5,7 +5,8 @@ module.exports = {
// apiBaseURL: '/',
others: {
url: '/app/learn/course',
loginUrl: 'https://login.ezijing.com/wmp/login/index'
loginUrl: 'https://login.ezijing.com/sofia/login/index',
messageBaseURL: ''
},
webpack: {
externals: {
......
.config.test.js
浏览文件 @ 1a7349e1
......@@ -5,7 +5,8 @@ module.exports = {
// apiBaseURL: '/',
others: {
url: '/app/learn/course',
loginUrl: 'https://login2.ezijing.com/wmp/login/index'
loginUrl: 'https://login2.ezijing.com/sofia/login/index',
messageBaseURL: 'https://test-microservices-message-service-api.ezijing.com'
},
isUploadStatic: false,
webpack: {
......
package-lock.json
浏览文件 @ 1a7349e1
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
浏览文件 @ 1a7349e1
......@@ -72,16 +72,17 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"@ckeditor/ckeditor5-build-classic": "^24.0.0",
"@ckeditor/ckeditor5-build-classic": "^25.0.0",
"@ckeditor/ckeditor5-vue2": "^1.0.5",
"axios": "^0.21.0",
"core-js": "^3.8.1",
"@ezijing/web-message-sdk": "^0.2.1",
"axios": "^0.21.1",
"core-js": "^3.9.0",
"cross-env": "^7.0.3",
"element-ui": "^2.14.1",
"element-ui": "^2.15.1",
"js-cookie": "^2.2.1",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"qrcode.vue": "^1.7.0",
"qs": "^6.9.4",
"qs": "^6.9.6",
"vue": "^2.6.12",
"vue-i18n": "^8.22.2",
"vue-loader": "^15.9.5",
......
src/api/base_api.js
浏览文件 @ 1a7349e1
......@@ -38,7 +38,7 @@ export default class API {
/* 具体执行请求失败后业务逻辑前，先执行该方法 */
const beforeFail = _config.beforeFail ? _config.beforeFail : this._reqFail
const headers = {
tenant: 'wmp',
tenant: 'prp',
version: window.G.VERSION,
'Content-Type': 'application/x-www-form-urlencoded'
}
......
src/assets/images/bank-logo2.png
查看替换文件 @ fd660984 浏览文件 @ 1a7349e1
src/assets/images/bank-logo2.png

9.5 KB | W: | H:

src/assets/images/bank-logo2.png

6.0 KB | W: | H:

src/assets/images/bank-logo2.png
src/assets/images/bank-logo2.png
src/assets/images/bank-logo2.png
src/assets/images/bank-logo2.png
  • 2-up
  • Swipe
  • Onion skin
src/assets/languages/zh-CN.json
浏览文件 @ 1a7349e1
......@@ -3,9 +3,9 @@
"action": {
"courseAction": {
"all": "全部",
"mustLearn": "教材学习",
"changeLearn": "必修课程",
"repeatLearn": "拓展课程",
"mustLearn": "先导课程",
"changeLearn": "核心课程",
"repeatLearn": "选修课程",
"changeStatus": "选修状态",
"noChange": "未选修",
"alreadyChange": "已选修",
......
src/components/learnSysLayout/navigation.vue
浏览文件 @ 1a7349e1
......@@ -2,11 +2,11 @@
<div class="menu">
<div class="nav-left">
<div class="logo-box">
<img class="bank-logol" src="@/assets/images/bank-logo1.png" alt="logo" />
<img class="bank-logol" src="https://zws-imgs-pub.ezijing.com/pc/base/logo.svg" />
<img class="bank-logor" src="@/assets/images/bank-logo2.png" alt="logo" />
</div>
</div>
<div class="bank-title" @click="setStatus">高级财富管理师·在线学习系统</div>
<div class="bank-title" @click="setStatus">私人财富风险管理师</div>
<!-- <s-language></s-language> -->
<div class="nav-right">
<div class="logo-name">{{ name }},欢迎您回到在线学习系统</div>
......@@ -57,6 +57,7 @@ export default {
<style scoped lang="scss">
.menu {
height: 60px;
display: flex;
align-items: center;
justify-content: space-between;
......@@ -118,14 +119,14 @@ export default {
}
.logo-box {
display: flex;
.bank-logor {
margin-left: auto;
}
align-items: center;
padding: 0 40px;
.bank-logol {
width: 52%;
height: 50px;
}
img {
width: 46%;
.bank-logor {
margin-left: 40px;
height: 34px;
}
}
......
src/components/learnSysLayout/sidebar.vue
浏览文件 @ 1a7349e1
......@@ -72,16 +72,16 @@ export default {
UserInfo: (_global && _global.UserInfo) || {},
defaultActive: defaultActive,
headerData: [
{
name: '学员须知',
iconClass: 'el-icon-self-xuexi-',
index: '1',
children: [
{ name: '学习须知', index: '1-1' },
{ name: '考前须知', index: '1-2' }
// { name: this.$t('components.learnSysLayout.sideBar.header1Child3'), index: '1-3' }
]
},
// {
// name: '学员须知',
// iconClass: 'el-icon-self-xuexi-',
// index: '1',
// children: [
// { name: '学习须知', index: '1-1' },
// { name: '考前须知', index: '1-2' }
// // { name: this.$t('components.learnSysLayout.sideBar.header1Child3'), index: '1-3' }
// ]
// },
// {
// name: this.$t('components.learnSysLayout.sideBar.header2'),
// iconClass: 'el-icon-self-grade',
......@@ -110,7 +110,7 @@ export default {
},
mounted () {
this.defineEvent()
this.showHeaderData()
// this.showHeaderData()
},
methods: {
arrHeader(arr) {
......
src/modules/offices/components/pay.vue
浏览文件 @ 1a7349e1
......@@ -43,19 +43,25 @@ export default {
computed: {
qrcodeValue() {
return this.order.url
},
pid() {
return this.$route.params.id
},
notifyUrl() {
return `${webConf.apiBaseURL}/api/lms/v2/lobby/update-status-api/${this.pid}`
}
},
methods: {
// 创建微信订单
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
return response
})
},
// 创建支付宝订单
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
return response
})
......
src/modules/offices/src/reportPaper/edit.vue
浏览文件 @ 1a7349e1
......@@ -111,9 +111,9 @@ export default {
email: [{ required: true, message: '请输入邮寄地址', trigger: 'blur' }]
},
productList: [
{ label: '1份—￥126元', value: '1', product_id: '6747325185390542848' },
{ label: '2份—￥201元', value: '2', product_id: '6747325279879823360' },
{ label: '3份—￥276元', value: '3', product_id: '6747325351686307840' }
{ label: '1份—￥127元', value: '1', product_id: '6747325185390542848' },
{ label: '2份—￥203元', value: '2', product_id: '6747325279879823360' },
{ label: '3份—￥278元', value: '3', product_id: '6747325351686307840' }
],
payVisible: false
}
......
src/modules/viewer/components/work/courseWork.vue
浏览文件 @ 1a7349e1
......@@ -5,7 +5,7 @@
<el-step :title="$t('viewerWork.workStep1')" status="process">
<template v-slot:description>
<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>
</el-step>
<el-step :title="$t('viewerWork.workStep2')" status="process">
......@@ -40,7 +40,7 @@
</template>
</el-step>
<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>
<div class="work-bottom" v-if="detail">
<div class="info">
......
src/style.scss
浏览文件 @ 1a7349e1
......@@ -5,7 +5,7 @@ body {
margin: 0;
height: 100%;
width: 100%;
background: #eee;
background: #f9f9f9;
}
/* 统一字体样式 */
* {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论