浏览代码

接口传参paperid

xuqiaoying 2 年之前
父节点
当前提交
0847db78d2
共有 3 个文件被更改,包括 20 次插入16 次删除
  1. 7 7
      common/httpList/goods.js
  2. 6 9
      pages/questionBank/index.vue
  3. 7 0
      pages2/bank/question_detail.vue

+ 7 - 7
common/httpList/goods.js

@@ -34,13 +34,13 @@ export default {
 			data: data,
 		})
 	},
-	goodsBank(data) {
-		return myRequest({
-			url: '/goods/bank/list',
-			method: 'get',
-			data: data,
-		})
-	},
+	// goodsBank(data) {
+	// 	return myRequest({
+	// 		url: '/goods/bank/list',
+	// 		method: 'get',
+	// 		data: data,
+	// 	})
+	// },
 	
 	bankExamExamList(data) {
 		return myRequest({

+ 6 - 9
pages/questionBank/index.vue

@@ -40,7 +40,7 @@
 				</view>
 
 				<template v-if="questionLists.length">
-					<view v-for="(item, index) in questionLists" :key="index" class="course_item">
+					<view v-for="(item, index) in questionLists" :key="index" class="course_item" @click="studyques(item)">
 						<view>
 							<view class="cou_titles">{{ item.goodsName }}</view>
 							<view v-if="item.serviceStartTime && item.serviceEndTime" class="learn_ranges">
@@ -63,9 +63,6 @@
 											<u-line-progress :show-percent="false" height="22" active-color="#ff9900" :percent="(item.doNum/item.totalNum)*100"></u-line-progress>
 										</view>
 									</view>
-									<!-- <view class="progress_down">
-										<view class="enter_into" @click="studyques(item,index)">进入练习</view>
-									</view> -->
 								</view>
 							</view>
 						</view>
@@ -73,8 +70,7 @@
 						<view class="study_btns">
 							<view v-for="(child, c_index) in item.paperVos" :key="c_index" class="exam_word intos"
 							 @click.stop="toDailyPractice(item, child)">{{ child.paperName }}</view>
-							<!-- <view class="exam_word intos" @click.stop="toRandomPractice(item)">随机联系</view> -->
-							<view class="exam_word intos" @click="studyques(item)">章节练习</view>
+							<!-- <view class="exam_word intos" @click="studyques(item)">章节练习</view> -->
 						</view>
 					</view>
 				</template>
@@ -155,11 +151,11 @@ export default {
 					url: '/pages2/randomPractice/index?goodsId=' + item.goodsId + '&orderGoodsId=' + item.orderGoodsId
 				})
 			} else {
-				this.studyques(item)
+				this.studyques(item, child)
 			}
 		},
 		// 进入练习
-		studyques(item){
+		studyques(item, child){
 			let sysTime = this.$method.timest()
 			if (item.serviceStartTime && item.serviceEndTime && (sysTime <= item.serviceStartTime || sysTime >= item.serviceEndTime)) {
 				uni.showToast({
@@ -168,8 +164,9 @@ export default {
 				})
 				return;
 			}
+			let paperId = child && child.paperId || ''
 			uni.navigateTo({
-				url:'/pages2/bank/question_detail?id='+item.goodsId+'&orderGoodsId='+item.orderGoodsId
+				url:'/pages2/bank/question_detail?id='+item.goodsId+'&orderGoodsId='+item.orderGoodsId + '&paperId=' + paperId
 			})
 		},
 	},

+ 7 - 0
pages2/bank/question_detail.vue

@@ -133,6 +133,7 @@ export default {
 			},
 			orderGoodsId:'',
 			firstEnter:true,
+			paperId: ''
 		};
 	},
 	onUnload() {
@@ -147,6 +148,7 @@ export default {
 	onLoad(option) {
 		this.orderGoodsId = option.orderGoodsId
 		this.id = option.id;
+		this.paperId = option.paperId || ''
 		this.getDetail();
 		this.getLock()
 		this.timer = setInterval(this.getLock,10000)
@@ -246,6 +248,7 @@ export default {
 		 */
 		goodsBank() {
 			this.$api.goodsBank({
+				paperId: this.paperId,
 				orderGoodsId:this.orderGoodsId,
 				goodsId: this.id
 			}).then(res => {
@@ -267,6 +270,7 @@ export default {
 				if(this.bankList[i].type == 1) { //第一个是模块直接展开,再展开章下面的节
 					this.$api
 						.goodsChapterList({
+							paperId: this.paperId,
 							moduleExamId: this.bankList[i].majorId
 						})
 						.then(res => {
@@ -392,6 +396,7 @@ export default {
 
 			this.$api
 				.goodsChapterList({
+					paperId: this.paperId,
 					moduleExamId: id,
           orderGoodsId: this.orderGoodsId,
 					goodsId: this.id
@@ -410,6 +415,7 @@ export default {
 
 				this.$api
 					.bankExamExamList({
+						paperId: this.paperId,
 						moduleExamId:moduleExamId,
           orderGoodsId: this.orderGoodsId,
 						chapterExamId: id,
@@ -431,6 +437,7 @@ export default {
 
 				this.$api
 					.bankExamExamList({
+						paperId: this.paperId,
 						moduleExamId:moduleExamId,
           orderGoodsId: this.orderGoodsId,
 						chapterExamId: id,