diff --git a/components/course-exam/course-exam.vue b/components/course-exam/course-exam.vue
index 04c15fb..a8d4797 100644
--- a/components/course-exam/course-exam.vue
+++ b/components/course-exam/course-exam.vue
@@ -94,9 +94,11 @@
this.loadRecord();
},
watch:{
- studyId(newVal){
+ content(newObj){
+ this.loadExamInfo();
this.loadRecord();
- }
+ },
+ deep:true
},
methods: {
loadExamInfo(){
@@ -125,24 +127,25 @@
if(this.studyId==''){
return;
}
- this.loadExamContent();
- if(this.records.length==0){
- let params={
- studyId:this.studyId,
- contentId:this.content.id
- }
- apiStudy.myExamList2(params).then(examRs=>{
- if(examRs.status==200){
- this.records=examRs.result;
- let len=examRs.result.length;
- if(this.info.times>len){
- this.allowSubmit=true;
- }else{
- this.allowSubmit=false;
+ this.records=[];
+ this.loadExamContent();
+ //if(this.records.length==0){
+ let params={
+ studyId:this.studyId,
+ contentId:this.content.id
}
- }
- })
- }
+ apiStudy.myExamList2(params).then(examRs=>{
+ if(examRs.status==200){
+ this.records=examRs.result;
+ let len=examRs.result.length;
+ if(this.info.times>len){
+ this.allowSubmit=true;
+ }else{
+ this.allowSubmit=false;
+ }
+ }
+ })
+ //}
},
startTest(){
//转向详细页面
diff --git a/components/course-homework/course-homework.vue b/components/course-homework/course-homework.vue
index 0fd2b46..9e15831 100644
--- a/components/course-homework/course-homework.vue
+++ b/components/course-homework/course-homework.vue
@@ -92,14 +92,12 @@
this.loadHomeworkInfo();
},
watch:{
- studyId(newVal){
- this.loadHomeworkInfo();
- },
content(newVal,oldVal){
if(newVal.id!=oldVal.id){
this.loadHomeworkInfo();
}
- }
+ },
+ deep:true
},
methods: {
loadHomeworkInfo(){
diff --git a/config/index.js b/config/index.js
index c59bd6e..2c62f6b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -9,6 +9,7 @@ let tokenName='';
let appId=''
let fileUrl='';
let version=1;
+let scormPlayer='';
if(process.env.NODE_ENV === 'development'){
//本地开发环境
@@ -16,8 +17,9 @@ if(process.env.NODE_ENV === 'development'){
oldApiBaseUrl = '/uboeApi';
statApiBaseUrl='/statApi';
socialApiBaseUrl='/socialApi';
- fileUrl = 'http://192.168.0.11:9090/cdn/upload';
+ fileUrl = 'http://127.0.0.1:9090/cdn/upload';
loginPath='/pages/login/login';
+ scormPlayer='http://localhost:9083/scorm-player';
}else if(process.env.ENV_TYPE === 'preview'){
// 预发布环境,当前配置未使用上
context='/mobile-release';
@@ -27,6 +29,7 @@ if(process.env.NODE_ENV === 'development'){
socialApiBaseUrl='/socialApi';
fileUrl = 'https://u.boe.com/upload';
loginPath='https://u.boe.com/m/loginuser';
+ scormPlayer='https://u.boe.com/newscorm/scorm-player';
}else if(process.env.ENV_TYPE === 'testing'){
// 测试环境
apiBaseUrl = '/systemapi';
@@ -35,6 +38,7 @@ if(process.env.NODE_ENV === 'development'){
socialApiBaseUrl='/socialApi';
fileUrl = 'https://u-pre.boe.com/upload';
loginPath='https://u-pre.boe.com/m/loginuser';
+ scormPlayer='https://u-pre.boe.com/newscorm/scorm-player';
}else{
// 生产环境
apiBaseUrl = '/systemapi';
@@ -43,6 +47,7 @@ if(process.env.NODE_ENV === 'development'){
socialApiBaseUrl='/socialApi';
fileUrl = 'https://u.boe.com/upload';
loginPath='https://u.boe.com/m/loginuser';
+ scormPlayer='https://u.boe.com/newscorm/scorm-player';
}
export default {
@@ -55,4 +60,5 @@ export default {
loginPath:loginPath,
fileUrl:fileUrl,
version:version,
+ scormPlayer:scormPlayer
}
\ No newline at end of file
diff --git a/pages/exam/exam.vue b/pages/exam/exam.vue
index ac99bce..3dd19ea 100644
--- a/pages/exam/exam.vue
+++ b/pages/exam/exam.vue
@@ -21,8 +21,11 @@
{{tipText}}
-
- {{btnText}}
+
+
+ {{btnText}}
+
+ 此考试已下架
考试已结束
@@ -62,7 +65,12 @@
- [{{getQuestionType(curItem.type)}}]{{curItem.title}}
+
+ [{{getQuestionType(curItem.type)}}]{{curItem.title}}
+
+
+
+
+
+
+
{{toLetter(optIdx+1)}}.{{opt.content}}
+
+
+
@@ -123,6 +137,7 @@