diff --git a/src/api/index.js b/src/api/index.js index 3abb6e2..6de39a0 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -181,6 +181,7 @@ export default { fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件 fileupload: `${uploadURL}oss/manage/fileupload`, // 文件上传 getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证 + getPlayAuthNakadai: `nakadai/nakadai/oss/getPlayAuth`, // 获取播放凭证 queryProvince: `nakadai/nakadai/province/queryProvince`, //查询省份 queryCity: `nakadai/nakadai/city/queryCity`, //查询城市 diff --git a/src/assets/img/entry.png b/src/assets/img/entry.png index abf3fbb..fefe9ae 100644 Binary files a/src/assets/img/entry.png and b/src/assets/img/entry.png differ diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue index c128970..9a6a143 100644 --- a/src/components/breadcrumb/index.vue +++ b/src/components/breadcrumb/index.vue @@ -3,15 +3,13 @@
@@ -21,44 +19,53 @@ \ No newline at end of file diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 3ee5238..0a6d699 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -151,7 +151,7 @@ export default { }, initSocket ({ id, account }) { // 实例化socket - this.socket = new WebSocket(`wss://${Setting.isDev ? '121.37.12.51' : location.host}/nakadai/websocket/${id}/${account}`) + this.socket = new WebSocket(`${Setting.isTest ? 'ws' : 'wss'}://${Setting.isDev ? '121.37.12.51' : location.host}/nakadai/websocket/${id}/${account}`) // this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`) // 监听socket连接 this.socket.onopen = this.open; diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue index 0423736..422183f 100644 --- a/src/layouts/navbar/index.vue +++ b/src/layouts/navbar/index.vue @@ -268,12 +268,19 @@ export default { } } } -@media (max-width: 1380px) { +@media (max-width: 1440px) { .nav { - left: 58%; + left: 53%; & > li { padding: 0 10px; } } } +@media (max-width: 1360px) { + .nav { + & > li { + padding: 0 4px; + } + } +} \ No newline at end of file diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index 4afb955..cdc2947 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -490,30 +490,32 @@ export default { this.invitationCode = ""; }, goSubSystem () { - let token = util.local.get(Setting.tokenKey) + const token = util.local.get(Setting.tokenKey) const classId = this.classId const classItem = this.classList.find(e => e.id == classId) - let curriculumId = this.curRow.curriculumId + const row = this.curRow + const { curriculumId, mallId } = row util.cookies.set("token", token) util.cookies.set("assessmentId", this.assessmentId) util.cookies.set("classId", classId) util.cookies.set("className", classItem ? encodeURI(classItem.className) : '') util.cookies.set("projectId", this.projectId) util.cookies.set("courseId", this.cid) - util.cookies.set("curriculumName", escape(this.curRow.sysName)); - util.cookies.set("startTime", this.curRow.startTime) - util.cookies.set("stopTime", this.curRow.stopTime) + util.cookies.set("curriculumName", escape(row.sysName)); + util.cookies.set("startTime", row.startTime) + util.cookies.set("stopTime", row.stopTime) util.cookies.set("systemId", this.systemId); + util.cookies.set('mallId', mallId) util.cookies.set('fromManager', '', -1) util.cookies.set('competitionId', '', -1) util.cookies.set('isSubmit', '', -1) util.cookies.set('language', '', -1) let href = '' if (curriculumId == 11) { - href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`; + href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&mallId=${mallId}&assessmentId=${this.assessmentId}&classId=${classId}&stopTime=${this.stopTime}`; } else if (curriculumId == 12) { // 众筹系统 - window.open(`http://120.78.139.126:8879?systemId=${this.systemId}&courseId=${this.cid}&projectId=${this.projectId}&token=${token}&userId=${this.userId}&assessmentId=${this.assessmentId}&classId=${this.curRow.classId}`); + window.open(`http://120.78.139.126:8879?systemId=${this.systemId}&courseId=${this.cid}&projectId=${this.projectId}&token=${token}&userId=${this.userId}&assessmentId=${this.assessmentId}&classId=${classId}&mallId=${mallId}`); } else { if (process.env.NODE_ENV === 'development') { href = 'http://192.168.31.125:8085/#/' diff --git a/src/pages/course/details/index.vue b/src/pages/course/details/index.vue index f952055..c07ecd1 100644 --- a/src/pages/course/details/index.vue +++ b/src/pages/course/details/index.vue @@ -1,74 +1,117 @@ \ No newline at end of file diff --git a/src/setting.js b/src/setting.js index bd109d5..70d8efa 100644 --- a/src/setting.js +++ b/src/setting.js @@ -28,7 +28,7 @@ if (isPro) { uploadURL = `http://121.37.12.51/` host = "http://121.37.12.51/"; // 测试服 // host = 'https://www.occupationlab.com/' // 正式服 - host = "http://192.168.31.152:9000/"; // 榕 + // host = "http://192.168.31.152:9000/"; // 榕 // host = "http://192.168.31.51:9000/"; // 赓 } diff --git a/src/styles/page/station.scss b/src/styles/page/station.scss index e48d274..22dac21 100644 --- a/src/styles/page/station.scss +++ b/src/styles/page/station.scss @@ -29,6 +29,9 @@ color: rgba(0, 0, 0, 0.45); font-size: 14px; } + /deep/img { + max-width: 95%; + } } .action { display: inline-flex; @@ -121,10 +124,17 @@ align-items: center; padding-bottom: 10px; margin: -22px 0 20px; - font-size: 20px; + font-size: 15px; color: #007eff; border-bottom: 1px dashed #bfbfbf; } + .des { + p, + span, + em { + font-size: 14px !important; + } + } .withdraw { margin-right: 10px; font-size: 13px;