Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wyf/tjty-app

tjty-app/pages_daily_answer/tjty_dailyAnswer/tjty_dailyAnswer.vue

@@ -147,7 +147,8 @@
 				timer: null,
 				hour: 0,
 				minutes: 0,
-				seconds: 0
+				seconds: 0,
+				questionScore:''
 			};
 		},
 		methods: {
@@ -214,9 +215,9 @@
 				this.selectItem = item.substr(0, 1)
 				if (this.question[this.questionNumber].answer === this.selectItem) {
 					this.selectColor = 'color: #36b25b;'
-					this.score += 10
+					this.score += this.questionScore
 					this.rightNumber++
-					this.cumulativeScore += 10
+					this.cumulativeScore += this.questionScore
 				} else {
 					this.selectColor = 'color: #e02424;'
 				}
@@ -332,6 +333,7 @@
 							}
 						})
 						this.total = res.data[0].questionsNum
+						this.questionScore = res.data[0].score/res.data[0].questionsNum
 						//将取到的题目id集合反转
 						questionId = questionId.reverse()
 						for (let i = 0; i < res.data.length / 4; i++) {
@@ -414,6 +416,7 @@
 						this.flagTime = res.data[0].examTime
 						// this.flagTime = formatDate(res.data[0].examTime, 'yyyy-MM-dd')
 						this.examTime = res.data[0].examTime //今天的日期
+						this.questionScore = res.data[0].score/res.data[0].questionsNum
 						// this.examTime = formatDate(res.data[0].examTime, 'yyyy-MM-dd') //今天的日期
 						// this.day = this.getDaysBetween(res.data[0].activityStart, res.data[0]
 						// 	.examTime) //今天是答题活动的第几天