Skip to content

L
learn-online-pc
提交 ac278393 authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

Merge branch 'master' of https://gitlab.ezijing.com/zhangyanxin/learn-mbaOnline

上级 7a2b1776 e4324321
隐藏空白字符变更
内嵌 并排
正在显示 包含 44 行增加 和 39 行删除
client/src/components/comTable/tableList.vue
浏览文件 @ ac278393
......@@ -61,6 +61,7 @@
:page-size="page.size"
layout="total, prev, pager, next, jumper"
:total="page.total"
:hide-on-single-page="true"
@current-change="handleCurrentChange"
></el-pagination>
</div>
......@@ -154,8 +155,8 @@ export default {
// 分页
if (this.hasPage) {
this.dataList = response.list
this.page.total = parseInt(response.count)
this.dataList = response.list || []
this.page.total = parseInt(response.count) || 0
}
})
},
......
client/src/pages/mobileLive/list.vue
浏览文件 @ ac278393
......@@ -33,7 +33,7 @@
<div class="live-item-content__time">{{subitem.start_time}}</div>
<div
class="live-item-content__status"
v-if="subitem.enable_record"
v-if="!(subitem.live_status === 103 && !subitem.enable_record)"
>{{calcTimeText(subitem.start_time, subitem.live_status)}}</div>
</div>
</div>
......@@ -65,7 +65,7 @@ export default {
methods: {
/* 退出登录 - 跳转方法 */
logout() {
cAction.Others.outLogin()
cAction.Other.outLogin()
.then(str => {
window.G.UserInfo = {}
this.$router.push({ path: '/login/index' })
......@@ -96,9 +96,10 @@ export default {
this.dataList = response.data
}
})
.catch(e => {
this.$message.error(e.message)
})
// 取消报错提醒
// .catch(e => {
// this.$message.error(e.message)
// })
.finally(() => {
if (this.loading) {
this.loading.close()
......@@ -182,6 +183,7 @@ export default {
openCloudLive(data, message) {
// https://doc.bokecc.com/live/Appendix_1.html
const liveStatus = data.live_status
data.viewer_name = data.viewer_name || this.nickName
if (liveStatus === 1) {
// 进行中
const url = `https://view.csslcloud.net/api/view/index?roomid=${data.room_id}&userid=${data.user_id}&autoLogin=true&viewername=${data.viewer_name}&viewertoken=${data.viewer_token}`
......@@ -258,7 +260,7 @@ export default {
this.timer = setInterval(() => {
this.getNewLiveMsg()
this.getLiveList()
}, 3000)
}, 10000)
},
beforeDestroy() {
this.timer && clearInterval(this.timer)
......@@ -292,7 +294,11 @@ body {
padding: 0.2rem 0.2rem 0.16rem;
}
.head .logo {
height: 0.3rem;
width: 0.9rem;
/* height: 0.3rem; */
}
.head .logo:nth-child(2) {
margin-left: 0.1rem;
}
.head .user {
display: flex;
......@@ -379,7 +385,7 @@ body {
font-size: 0.12rem;
color: #333;
}
.live-item-content__time {
.live-item-content__status {
color: #b01c3d;
}
</style>
server/package.json
浏览文件 @ ac278393
......@@ -18,7 +18,6 @@
"devDependencies": {
"babel-core": "^6.26.3",
"babel-eslint": "^8.2.6",
"cross-env": "^5.2.0",
"eslint": "^4.19.1",
"eslint-config-standard": "^11.0.0",
"eslint-plugin-import": "^2.14.0",
......@@ -37,6 +36,7 @@
"express": "^4.16.4",
"form-data": "^2.5.0",
"multer": "^1.4.1",
"promise.prototype.finally": "^3.1.1"
"promise.prototype.finally": "^3.1.1",
"cross-env": "^5.2.0"
}
}
server/server/config.js
浏览文件 @ ac278393
......@@ -2,8 +2,12 @@ const state = process.env.NODE_ENV
let conf = {}
if (state === 'test') {
conf.agentApiUrl = 'https://api2.ezijing.com/'
conf.apiKey = 'mwLyCymyEVCcKTn7nKDjYIMPBwScbugX'
conf.host = 'lms-api2.ezijing.com'
} else if (state === 'production') {
conf.agentApiUrl = 'https://zapi.ezijing.com/'
conf.apiKey = 'mwLyCymyEVCcKTn7nKDjYIMPBwScbugX'
conf.host = 'lms-api.ezijing.com'
}
global.app = null
......
server/server/controller/ProxyMonitor.js
浏览文件 @ ac278393
......@@ -36,15 +36,15 @@ const agentProcessor = () => {
params: req.query
}
options.url = options.url.replace(/tenant\//gi, '')
headers['apikey'] = 'mwLyCymyEVCcKTn7nKDjYIMPBwScbugX'
headers['apikey'] = conf.apiKey
if (/user_center/gi.test(options.url)) {
headers['Host'] = 'sso.ezijing.com'
headers['host'] = 'sso.ezijing.com'
} else {
// headers['Host'] = 'lms-api.ezijing.com'
// headers['host'] = 'lms-api.ezijing.com'
headers['Host'] = 'lms-worklobby-api.ezijing.com'
headers['host'] = 'lms-worklobby-api.ezijing.com'
headers['Host'] = conf.host
headers['host'] = conf.host
}
/* 测试 */
// if (/\/essay/gi.test(options.url) && /post/gi.test(req.method)) {
......@@ -118,14 +118,12 @@ const agentProcessor = () => {
'base64'
)
} catch (e) {
res
.status(500)
.json({
message:
'文档上传出错，错误原因：请不要直接修改后缀“.doc”为“.docx”或者正文内容必须大于400字',
errMsg: 'err',
code: 500
})
res.status(500).json({
message:
'文档上传出错，错误原因：请不要直接修改后缀“.doc”为“.docx”或者正文内容必须大于400字',
errMsg: 'err',
code: 500
})
return
}
}
......@@ -135,8 +133,8 @@ const agentProcessor = () => {
/* check-access接口 */
// headers['Host'] = 'lms-api.ezijing.com'
// headers['host'] = 'lms-api.ezijing.com'
headers['Host'] = 'lms-worklobby-api.ezijing.com'
headers['host'] = 'lms-worklobby-api.ezijing.com'
headers['Host'] = conf.host
headers['host'] = conf.host
axios.defaults.headers = headers
axios({
timeout: 30 * 1000,
......@@ -215,13 +213,11 @@ const agentProcessor = () => {
JSON.stringify(e.response.data)
)
} else {
res
.status(500)
.json({
message: '系统错误，请稍后重试或联系管理员',
errMsg: 'Error Proxy Request or BackData Excute Error',
code: 500
})
res.status(500).json({
message: '系统错误，请稍后重试或联系管理员',
errMsg: 'Error Proxy Request or BackData Excute Error',
code: 500
})
console.error(_logJson._uuid, e)
}
})
......@@ -239,13 +235,11 @@ const agentProcessor = () => {
})
})
} catch (e) {
res
.status(500)
.json({
message: '系统错误，请稍后重试或联系管理员',
errMsg: 'Network Server Excute Error',
code: 500
})
res.status(500).json({
message: '系统错误，请稍后重试或联系管理员',
errMsg: 'Network Server Excute Error',
code: 500
})
console.error(_logJson._uuid, e)
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论