瀏覽代碼

对接试做接口

chen 3 年之前
父節點
當前提交
999677b090
共有 2 個文件被更改,包括 60 次插入55 次删除
  1. 29 48
      pages2/bank/detail.vue
  2. 31 7
      pages2/bank/questionBankTest.vue

+ 29 - 48
pages2/bank/detail.vue

@@ -30,23 +30,24 @@
 		</view>
 		<view class="title-list"  v-if="current == 1">
 			<view class="content">
-				<view class="list" v-for="(item1,index1) in bankList">
-					<template v-if="item1.type==3">
-						<view class="module" @click="clickModule" :data-id="item1.id" :data-index="index1">
+				<view class="list" v-for="(item1,index1) in bankList" :key="'index1'+index1">
+					<template v-if="item1.type==1">
+						<view class="module" @click="clickModule" :data-id="item1.majorId" :data-index="index1">
 							{{item1.name}} {{item1.subjectName}}
 						</view>
 						
 						<template v-if="item1.showList">
-							<view class="section" v-for="(item2,index2) in item1.list" @click="changeItem" :data-index1="index1" :data-index2="index2" :data-id="item2.id" :data-type="item1.type">
+							<view class="section" v-for="(item2,index2) in item1.list" :key="'childIndex2'+index2" @click="changeItem" :data-index1="index1" :data-index2="index2" :data-id="item2.chapterExamId" :data-type="item1.type">
 								<u-icon name="arrow-down" v-if="item2.showList"></u-icon>
 								<u-icon name="arrow-up" v-if="!item2.showList"></u-icon>
 								{{item2.name}}
+								{{item2.list}}
 							</view>
 							<view v-if="item2.showList" >
-								<view class="article" v-for="(article,index1) in item2.list">
+								<view class="article" v-for="(article,index3) in item2.list" :key="'index3'+index3">
 									<view class="flex">{{article.name}}</view>
-									<navigator :url="'/pages2/bank/questionBankTest?id='+article.id">
-										<view v-if="index1 == 0" class="btn">试做</view>
+									<navigator :url="'/pages2/bank/questionBankTest?id='+article.majorId">
+										<view v-if="index3 == 0" class="btn">试做</view>
 									</navigator>
 								</view>
 							</view>
@@ -56,15 +57,15 @@
 					</template>
 					
 					<template v-if="item1.type ==2">
-						<view class="section" :data-index1="index1" @click="changeItem" :data-type="item1.type">
+						<view class="section" :data-index1="index1" :data-id="item1.majorId" @click="changeItem" :data-type="item1.type">
 							<u-icon name="arrow-down" v-if="item1.showList"></u-icon>
 							<u-icon name="arrow-up" v-if="!item1.showList"></u-icon>
-							2Z106010 施工承发包的模式-2Z106020 施工合同...
+							{{item1.name}}
 						</view>
 						<view v-if="item1.showList" >
-							<view class="article" :class="{active:index1 == 0}" v-for="(article,index1) in item1.list">
-								施工承发包模式-施工合同与物资采购合同二
-								<navigator :url="'/pages2/bank/questionBankTest'+article.id">
+							<view class="article" :class="{active:index2 == 0}"  :key="'parentIndex2'+index3" v-for="(article,index2) in item1.list">
+								{{item1.name}}
+								<navigator :url="'/pages2/bank/questionBankTest?id='+article.majorId">
 									<view v-if="index1 == 0" class="btn">试做</view>
 								</navigator>
 								
@@ -72,11 +73,11 @@
 						</view>
 					</template>
 					
-					<template v-if="item1.type ==1">
+					<template v-if="item1.type ==3">
 						<view class="article active" >
 							{{item1.name}}
 							
-							<navigator :url="'/pages2/bank/questionBankTest?id='+item1.id">
+							<navigator :url="'/pages2/bank/questionBankTest?id='+item1.majorId">
 								<view class="btn">试做</view>
 							</navigator>
 							
@@ -150,25 +151,13 @@ export default {
 			}).then(res => {
 				console.log(res)
 				this.bankList = res.data.data;
-				res.data.data.forEach(bank => {
-					// if(bank.type == 3) {
-					// 	this.goodsChapterList(bank,bank.id)
-					// }
-					
-				})
-				
-				
 			})
 		},
 		goodsChapterList(bank,id) {
 			this.$api.goodsChapterList({
 				moduleExamId:id
 			}).then(res => {
-				this.$set(bank,'list',[{
-					name:'章卷',
-					showList:false,
-					id:1
-				}])
+				this.$set(bank,'list',res.data.data)
 				 
 			})
 		},
@@ -177,7 +166,6 @@ export default {
 			let index = e.currentTarget.dataset.index;
 			let id = e.currentTarget.dataset.id;
 			
-			console.log(this.bankList)
 			
 			if(this.bankList[index].list) {
 				this.$set(this.bankList[index],'showList',!this.bankList[index].showList)
@@ -187,12 +175,11 @@ export default {
 			this.$api.goodsChapterList({
 				moduleExamId:id
 			}).then(res => {
+				res.data.data.forEach(item => {
+					item.list = [];
+				})
 				this.$set(this.bankList[index],'showList',true)
-				this.$set(this.bankList[index],'list',[{
-					name:'章卷',
-					showList:false,
-					id:1
-				}])
+				this.$set(this.bankList[index],'list',res.data.data)
 				 
 			})
 		},
@@ -234,13 +221,13 @@ export default {
 			let id = e.currentTarget.dataset.id
 			let type = e.currentTarget.dataset.type
 			
-			if(type == 3) {
-				if(this.bankList[index1].list[index2].list) {
+			if(type == 1) {
+				if(this.bankList[index1].list[index2].list.length) {
 					this.$set(this.bankList[index1].list[index2],'showList',!this.bankList[index1].list[index2].showList)
-					this.$set(this.bankList[index1].list[index2],'list',[{
-						name:'试卷',
-						id:2,
-					}])
+					// this.$set(this.bankList[index1].list[index2],'list',[{
+					// 	name:'试卷',
+					// 	id:2,
+					// }])
 					return;
 				}
 				
@@ -254,16 +241,13 @@ export default {
 					// this.bankList = res.data.data;
 					
 					this.$set(this.bankList[index1].list[index2],'showList',true)
-					this.$set(this.bankList[index1].list[index2],'list',[{
-						name:'试卷',
-						id:2,
-					}])
+					this.$set(this.bankList[index1].list[index2],'list',res.data.data)
 					
 					 
 				})
 				
 			} else if(type == 2) {
-				if(this.bankList[index1].list) {
+				if(this.bankList[index1].list.length) {
 					this.$set(this.bankList[index1],'showList',!this.bankList[index1].showList)
 					return;
 				}
@@ -278,10 +262,7 @@ export default {
 					// this.bankList = res.data.data;
 					
 					this.$set(this.bankList[index1],'showList',true)
-					this.$set(this.bankList[index1],'list',[{
-						name:'试卷',
-						id:2,
-					}])
+					this.$set(this.bankList[index1],'list',res.data.data)
 					
 					 
 				})

+ 31 - 7
pages2/bank/questionBankTest.vue

@@ -1,7 +1,7 @@
 <template>
 	<view id="questionBank">
 		<swiper class="swiper" :current="current" @change="swiperChange" :interval="interval">
-			<swiper-item v-for="(bank,bankIndex) in bankList">
+			<swiper-item v-for="(bank,bankIndex) in questionList">
 				<view class="pageContent">
 					<view class="pad_8 titBox">
 						<view class="firstLetter">
@@ -12,10 +12,29 @@
 							<view style="color: #666;font-size: 28rpx;">03:25:06</view>
 							<view class="leftLetters"></view>
 						</view>
-						<view class="titles">建造师执业资格注册的有效期一般为( )年。</view>
+						<view class="titles">
+							<rich-text :nodes="bank.content"></rich-text>
+						</view>
 						<view class="">
+							<template v-if="bank.type == 4">
+								<view v-if="ques[bankIndex]">
+									<view v-for="(item, index) in bank.jsonStr[0].optionsList" :key="index" 
+										 
+										class="lisSty">
+										<view :class="{right:(item.value == ques[bankIndex]) && (ques[bankIndex] == ans[bankIndex]),wrong:(item.value == ques[bankIndex]) && (ques[bankIndex] != ans[bankIndex])}" class="activeTI">{{ ast[index] }}</view>
+										{{ item.content }}
+									</view>
+								</view>
+								<!-- <view v-if="!ques[bankIndex]">
+									<view v-for="(item, index) in bank.jsonStr[0].optionsList" :key="index" @click="click" :data-value="item.value" class="lisSty">
+										<text class="activeTI">{{ ast[index] }}</text>
+										{{ item.content }}
+									</view>
+								</view> -->
+							</template>
+							
 							<view v-if="ques[bankIndex] ">
-								<view v-for="(item, index) in bank" :key="index" 
+								<view v-for="(item, index) in bank.jsonStr" :key="index" 
 									 
 									class="lisSty">
 									<view :class="{right:(item.value == ques[bankIndex]) && (ques[bankIndex] == ans[bankIndex]),wrong:(item.value == ques[bankIndex]) && (ques[bankIndex] != ans[bankIndex])}" class="activeTI">{{ ast[index] }}</view>
@@ -23,7 +42,7 @@
 								</view>
 							</view>
 							<view v-if="!ques[bankIndex]">
-								<view v-for="(item, index) in bank" :key="index" @click="click" :data-value="item.value" class="lisSty">
+								<view v-for="(item, index) in bank.jsonStr" :key="index" @click="click" :data-value="item.value" class="lisSty">
 									<text class="activeTI">{{ ast[index] }}</text>
 									{{ item.label }}
 								</view>
@@ -39,7 +58,7 @@
 						<view class="pad_8 answerInfos">
 							<view class="answerTitle">答案解析</view>
 							<view class="answerContent">
-								建造师执业资格注册有效期一般为3年,有效期满前3个月,持证者应到原注册管理机构办理再次注册手续。在注册有效期内,变更执业单位者,应当及时办理变更手续。
+								<rich-text :nodes="bank.analysisContent"></rich-text>
 							</view>
 						</view>
 					</view>
@@ -62,7 +81,7 @@
 				<view class="popupContent">
 					<scroll-view scroll-y="true" style="height: 506rpx;">
 						<view class="boxSty">
-							<view v-for="(item, index) in 10" :key="index" :data-index="index" @click="changeIndex" :class="{disabled:index>=5}" class="liListSty">{{ index + 1 }}</view>
+							<view v-for="(item, index) in questionList" :key="index" :data-index="index" @click="changeIndex" :class="{disabled:index>=5}" class="liListSty">{{ index + 1 }}</view>
 						</view>
 					</scroll-view>
 				</view>
@@ -82,6 +101,7 @@ export default {
 		return {
 			id:'',
 			current:0,
+			questionList:[],
 			ast: ['A', 'B', 'C', 'D',],
 			ans:[1,2,3,4,1],
 			ques:['','','','',''],
@@ -191,8 +211,12 @@ export default {
 				examId:this.id
 			}).then(res => {
 				console.log(res)
+				res.data.data.forEach(item => {
+					item.jsonStr = JSON.parse(item.jsonStr)
+				})
+				this.questionList = res.data.data;
 				
-				
+				console.log(this.questionList[0])
 			})
 		},
 		openFooterTab() {