提交

src/pages/questionBank/questionBank.vue

@@ -50,26 +50,12 @@
 			if (op && op.navTitle) {
 				this.navTitle = op.navTitle
 				const param = {}
-				if (this.navTitle === '顺序答题' || this.navTitle === '精简500题') {
+				if (this.navTitle === '顺序答题') {
 					if(this.subject=='1'){
 						this.questionArr = [...this.orderQuestion_subject1]
 					}else if(this.subject=='4'){
 						this.questionArr = [...this.orderQuestion_subject4]
-					}
-					if (this.needVip === 'true') {
-						if (this.token) {
-							await this.searchUserVip()
-							const res = this.vipOnList.some(item => item.subjects == this.subject)
-							if (!res) {
-								this.questionArr = this.questionArr.slice(0, 3)
-								this.isShowAll = false
-							}
-						} else {
-							uni.redirectTo({
-								url: '/pages/login/login'
-							});
-						}
-					}
+					}	
 					this.$refs.question.getQuestionList(JSON.stringify(this.questionArr))
 				} else {
 					if (this.navTitle === '错题本') {
@@ -92,9 +78,34 @@
 					if(op.isNew&&op.isNew=='1'){
 						param.isNew=Number(op.isNew)
 					}
-					queryQuestion(param).then(res => {
+					if(op.type){
+						param.type=op.type
+					}
+					if(op.isImage){
+						param.isImage=op.isImage
+					}
+					if(op.isVip){
+						param.isVip=op.isVip
+					}
+					param.subject=this.subject
+					param.carTypeId=storage.get('carType') || '1001'
+					queryQuestion(param).then(async (res) => {
 						if (res.code == '0000') {
 							this.questionArr = res.data
+							if (this.needVip === 'true') {
+								if (this.token) {
+									await this.searchUserVip()
+									const res = this.vipOnList.some(item => item.subjects == this.subject)
+									if (!res) {
+										this.questionArr = this.questionArr.slice(0, 3)
+										this.isShowAll = false
+									}
+								} else {
+									uni.redirectTo({
+										url: '/pages/login/login'
+									});
+								}
+							}
 							this.$refs.question.getQuestionList(JSON.stringify(this.questionArr))
 						}
 					})
@@ -120,7 +131,7 @@
 					this.$refs.question.getQuestionList(JSON.stringify(list))
 				} else {
 					this.$refs.question.isShowBest(false)
-					this.$refs.question.getQuestionList(JSON.stringify(this.questionArr))
+					this.$refs.question.getQuestionList()
 				}
 			},
 			rightClick() {