Преглед на файлове

修复题库详情超出

Tang преди 3 години
родител
ревизия
745495768a

+ 1 - 2
pages.json

@@ -357,7 +357,6 @@
 				"path": "bank/questionBankExplain",
 				"style": {
 					"navigationBarTitleText": "试卷",
-					"navigationStyle": "custom", // 隐藏系统导航栏
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
@@ -371,7 +370,7 @@
 					"app-plus": {
 						"titleNView": false, //禁用原生导航栏 
 						"bounce": "none"
-					}
+					} 
 				}
 			},
 			

+ 3 - 4
pages2/bank/collectById.vue

@@ -17,8 +17,7 @@
 			<view class="wrongHead">
 				<view class="title">收藏统计</view>
 				<view class="progress">
-					<text v-if="type == 1">{{testList.total}}</text>
-					<text v-if="type == 2">{{typeList.total}}</text>
+					<text>{{total}}</text>
 				</view>
 			</view>
 			<view class="wrongList" v-if="type == 1">
@@ -114,7 +113,7 @@ export default {
 				this.testList = res.data 
 				let total = 0;
 				this.testList.rows.forEach(item => {
-					total += item.num;
+					total += item.questionNum;
 				})
 				
 				this.total = total
@@ -128,7 +127,7 @@ export default {
 				this.typeList = res.data 
 				let total = 0;
 				this.typeList.rows.forEach(item => {
-					total += item.num;
+					total += item.questionNum;
 				})
 				
 				this.total = total

+ 5 - 5
pages2/bank/detail.vue

@@ -66,11 +66,11 @@
 							<u-icon  v-if="item1.showList" name="arrow-down"></u-icon> -->
 							<text style="margin-left:34rpx;">{{ item1.name }}</text>
 						</view>
-						<view v-if="item1.showList">
-							<view class="article" :class="{ active: showTest(article.examId) }" :key="index2" v-for="(article, index2) in item1.list">
-								<view class="flex_auto">{{ item1.name }}</view>
-								<navigator hover-class="none" :url="'/pages2/bank/questionBankTest?id=' + article.majorId + '&num=' + showTest(article.examId).num">
-									<view class="btn" v-if="showTest(article.examId)">试做</view>
+						<view v-if="item1.showList" >
+							<view class="article" :class="{active:showTest(article.examId)}"  :key="index2" v-for="(article,index2) in item1.list">
+								<view class="flex_auto">{{item1.name}}</view>
+								<navigator  hover-class="none" :url="'/pages2/bank/questionBankTest?id='+article.examId+'&num='+showTest(article.examId).num">
+									<view class="btn"  v-if="showTest(article.examId)">试做</view>
 								</navigator>
 							</view>
 						</view>

+ 1 - 8
pages2/bank/questionBankContinue.vue

@@ -478,7 +478,6 @@ export default {
 		 * 点击后退按钮
 		 */
 		clickLeft() {
-			if(this.isContinue) {
 				
 				let ansCount = this.questionOverNum(true); //已答题数
 				this.lastCount = this.questionList.length - ansCount; //统计未答完的题数
@@ -493,12 +492,6 @@ export default {
 					// this.isLastCount = true;
 				}
 				this.showpopups = true;   
-			} else {
-				uni.navigateBack({
-					delta:1
-				})
-			}
-			
 		},
 		/**
 		 * 获取已经回答的题目数
@@ -573,7 +566,7 @@ export default {
 		goodsQuestionList() {
 			//继续答题
 				
-			console.log(this.isContinue,"继续做题")
+			console.log("继续做题")
 			this.$api.examReport(this.recordId).then(res => {
 				let json = JSON.parse(res.data.data.historyExamJson)
 				

Файловите разлики са ограничени, защото са твърде много
+ 30 - 867
pages2/bank/questionBankExplain.vue


+ 6 - 1
pages2/bank/question_detail.vue

@@ -182,7 +182,12 @@ export default {
 						})
 			        } else if (res.cancel) {
 						uni.navigateTo({
-							url:'/pages2/bank/questionBankExplain?explain=1&recordId='+recordId +'&id=' +examId +'&goodsid=' +goodsId +'&moduleId='+moduleId+'&chapterId=' +chapterExamId
+							url:'/pages2/bank/questionBankAllExplain?id=' + examId +
+									'&goodsid=' + goodsId +
+									'&moduleId=' + moduleId +
+									'&chapterId=' + chapterExamId +
+									'&recordId='+ recordId
+							
 						})
 			            console.log('查看上次答题');
 			        }

+ 0 - 71
pages2/bank/question_statistics.vue

@@ -62,24 +62,6 @@
 												</view>
 											</view>
 										</view>
-										<!-- <navigator
-											:url="
-												'/pages2/bank/questionBankExplain?continue=1&recordId=' +
-													article.recordId +
-													'&id=' +
-													article.examId +
-													'&goodsid=' +
-													article.goodsId +
-													'&moduleId=' +
-													article.moduleExamId +
-													'&chapterId=' +
-													article.chapterExamId +
-													''
-											"
-										>
-											<view class="btn" v-if="article.recordStatus == 0">继续</view>
-										</navigator>
-										<view class="btn" v-if="article.recordStatus == 1" @click="doRepeat(article.recordId,article.examId,article.goodsId,article.moduleExamId,article.chapterExamId)">重做</view> -->
 										<navigator  hover-class="none" :url="'/pages2/bank/questionBankExplainDetail?goodsId='+article.goodsId+'&examId='+article.examId">
 											<view class="btn">详情</view>
 										</navigator>
@@ -113,23 +95,6 @@
 										</view>
 									</view>
 								</view>
-								<!-- <navigator
-									:url="
-										'/pages2/bank/questionBankExplain?continue=1&recordId=' +
-											article.recordId +
-											'&id=' +
-											article.examId +
-											'&goodsid=' +
-											article.goodsId +
-											'&moduleId=0&chapterId=' +
-											article.chapterExamId +
-											''
-									"
-								>
-									<view class="btn" v-if="article.recordStatus == 0">继续</view>
-								</navigator>
-								
-								<view class="btn" v-if="article.recordStatus == 1" @click="doRepeat(article.recordId,article.examId,article.goodsId,0,article.chapterExamId)">重做</view> -->
 								<navigator  hover-class="none" :url="'/pages2/bank/questionBankExplainDetail?goodsId='+article.goodsId+'&examId='+article.examId">
 									<view class="btn">详情</view>
 								</navigator>
@@ -152,20 +117,6 @@
 									</view>
 								</view>
 							</view>
-							<!-- <navigator
-								:url="
-									'/pages2/bank/questionBankExplain?continue=1&recordId=' +
-										item1.recordId +
-										'&id=' +
-										item1.majorId +
-										'&goodsid=' +
-										item1.goodsId +
-										'&moduleId=0&chapterId=0'
-								"
-							>
-								<view class="btn" v-if="item1.recordStatus == 0">继续</view>
-							</navigator>
-								<view class="btn" v-if="item1.recordStatus == 1" @click="doRepeat(item1.recordId,item1.majorId,item1.goodsId,0,0)">重做</view> -->
 							<navigator  hover-class="none" :url="'/pages2/bank/questionBankExplainDetail?goodsId='+item1.goodsId+'&examId='+item1.majorId">
 								<view class="btn">详情</view>
 							</navigator>
@@ -236,28 +187,6 @@ export default {
 		});
 	},
 	methods: {
-		doRepeat(recordId,examId,goodsId,chapterExamId) {
-			uni.showModal({
-			    title: '提示',
-			    content: '是否清空答案重做?',
-				cancelText:'查看上次',
-				cancelColor:'',
-				confirmText:'重做',
-				confirmColor:'',
-			    success: (res) => {
-			        if (res.confirm) {
-						uni.navigateTo({
-							url:'/pages2/bank/questionBank?id=' +examId +'&goodsid=' +goodsId +'&moduleId=0&chapterId=' +chapterExamId
-						})
-			        } else if (res.cancel) {
-						uni.navigateTo({
-							url:'/pages2/bank/questionBankExplain?isHistory=1&recordId='+recordId +'&id=' +examId +'&goodsid=' +goodsId +'&moduleId=0&chapterId=' +chapterExamId
-						})
-			            console.log('查看上次答题');
-			        }
-			    }
-			});
-		},
 		goodsBankDolist() {
 			this.$api
 				.goodsBankDolist({

Някои файлове не бяха показани, защото твърде много файлове са промени