mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-mobile.git
synced 2025-12-07 01:46:44 +08:00
Merge remote-tracking branch 'yx/master-0715-lyc' into 104-master-0626
# Conflicts: # unpackage/dist/build/h5/index.html # unpackage/dist/build/h5/static/js/pages-login-loading.02553b67.js
This commit is contained in:
@@ -83,6 +83,10 @@
|
||||
scoreShow:false,
|
||||
lastScore:0,
|
||||
timerValue:0,
|
||||
examPaper:{
|
||||
json:{},//试题的json格式
|
||||
items:[],//试题内容
|
||||
},
|
||||
noAnswers:[] //有未答完的试题
|
||||
}
|
||||
},
|
||||
@@ -114,12 +118,15 @@
|
||||
this.info=res.result;
|
||||
this.loadStudyItemId();
|
||||
if(this.info.paperType==2){
|
||||
apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
|
||||
// apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
|
||||
apiExamPaper.getPcPaperContent(this.info.id).then(rs=>{
|
||||
if(rs.status==200){
|
||||
//console.log(rs.result)
|
||||
let paperItems=JSON.parse(rs.result);
|
||||
//console.log(this.examPaper.json,'this.examPaper.json');
|
||||
let qitems=this.convertToItems(paperItems);
|
||||
//console.log(rs.result)// 判断 result 是否是字符串,如果是才 parse
|
||||
// let paperItems=JSON.parse(rs.result);
|
||||
|
||||
this.examPaper.json=rs.result;
|
||||
console.log(this.examPaper.json,'this.examPaper.json');
|
||||
let qitems=this.convertToItems(this.examPaper.json);
|
||||
this.paper ={items:qitems};
|
||||
this.total=qitems.length;
|
||||
this.curItem=qitems[this.curIndex];
|
||||
|
||||
Reference in New Issue
Block a user