Преглед изворни кода

每日一练试卷类型为练习

xuqiaoying пре 3 година
родитељ
комит
aa1e0ec6db
3 измењених фајлова са 11 додато и 1 уклоњено
  1. 3 0
      common/request.js
  2. 5 1
      pages2/bank/questionBank.vue
  3. 3 0
      pages3/course/detail.vue

+ 3 - 0
common/request.js

@@ -72,6 +72,7 @@ export const myRequest = (options) => {
 						if (!uni.getStorageSync('user_account')) {
 							var pages = getCurrentPages() // 获取栈实例
 							let currentRoute  = pages[pages.length-1].route; // 获取当前页面路由
+							console.log('request-->1111:', currentRoute);
 							if(currentRoute != 'pages4/login/login') {
 								uni.navigateTo({
 									url: '/pages4/login/login'
@@ -86,6 +87,7 @@ export const myRequest = (options) => {
 						uni.removeStorageSync('user_account');
 						var pages = getCurrentPages() // 获取栈实例
 						let currentRoute  = pages[pages.length-1].route; // 获取当前页面路由
+						console.log('request-->2222:', currentRoute);
 						if(currentRoute != 'pages4/login/login') {
 							uni.navigateTo({
 								url: '/pages4/login/login'
@@ -139,6 +141,7 @@ export const myRequest = (options) => {
 		} else {
 			var pages = getCurrentPages() // 获取栈实例
 			let currentRoute  = pages[pages.length-1].route; // 获取当前页面路由
+			console.log('request-->333:', currentRoute);
 			if(currentRoute != 'pages4/login/login') {
 				uni.navigateTo({
 					url: '/pages4/login/login'

+ 5 - 1
pages2/bank/questionBank.vue

@@ -1023,7 +1023,11 @@ export default {
     bankExam() {
       return new Promise((resolve) => {
         this.$api.bankExam(this.id).then((res) => {
-          this.bankType = res.data.data.doType;
+          if (this.entryType == 'daily') { // 每日一练类型都是为练习
+            this.bankType = 1
+          } else {
+            this.bankType = res.data.data.doType;
+          }
           this.examData = res.data.data;
           if (this.bankType == 2) {
             this.needBack = true;

+ 3 - 0
pages3/course/detail.vue

@@ -290,6 +290,9 @@ export default {
 			this.id = option.id
 			this.goodsType = option.goodsType
 		}
+		// if (this.$method.isGoLogin()) { // 扫二维码进来的没登录需要跳到登录页,登录后返回
+		// 	return;
+		// }
 		this.getDetail()
 		this.goodsCourseList()
 		this.appCommonGoodsCourseModuleFreeExamList();