修复bug

pages2/bank/questionBankContinue.vue

@@ -93,7 +93,10 @@
 							<view v-if="!bank.ques">
 								<view v-for="(item, index) in judge" :key="index" class="lisSty" @click="judgeSelect(index,bankIndex)">
 									<view class="activeTI">{{ ast[index] }}</view>
-									{{ item }}
+									<view class="flex_auto">
+										{{ item }}
+									</view>
+									
 								</view>
 							</view>
 							<view v-if="bank.ques">

pages2/bank/questionBankExplain.vue

@@ -73,7 +73,9 @@
 							<view>
 								<view v-for="(item, index) in judge" :key="index" class="lisSty">
 									<text :class="{right:(index == bank.ques) || (index == bank.ans),wrong:(index == bank.ques) && (bank.ques != bank.ans)}"  class="activeTI">{{ ast[index] }}</text>
-									{{ item }}
+									<view class="flex_auto">
+										{{ item }}
+									</view>
 								</view>
 							</view> 
 						</view>
@@ -131,7 +133,9 @@
 									<view>
 										<view v-for="(option, childIndex) in ansItem.optionsList" :key="childIndex" class="lisSty">
 											<text :class="{right:(option.optionsId == bank.ques[ansIndex]) || (option.optionsId == bank.ans[ansIndex]),wrong:(option.optionsId == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childIndex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
 										</view>
 									</view> 
 								</view>
@@ -161,7 +165,10 @@
 									<view>
 										<view v-for="(option, childindex) in ansItem.optionsList" :key="childindex" class="lisSty">
 											<text :class="{right:right(bankIndex,ansIndex,option),wrong:wrong(bankIndex,ansIndex,option)}"  class="activeTI">{{ ast[childindex] }}</text>
-											<rich-text :nodes="option.content"></rich-text>
+											<view class="flex_auto">
+												<rich-text :nodes="option.content"></rich-text>
+											</view>
+											
 										</view>
 									</view> 
 								</view>
@@ -193,7 +200,10 @@
 									<view>
 										<view v-for="(option, childindex) in judge" :key="childindex" class="lisSty">
 											<text :class="{right:(childindex == bank.ques[ansIndex]) || (childindex == bank.ans[ansIndex]),wrong:(childindex == bank.ques[ansIndex]) && (bank.ques[ansIndex] != bank.ans[ansIndex])}"  class="activeTI">{{ ast[childindex] }}</text>
-											{{ option }}
+											<view class="flex_auto">
+												{{ option }}
+											</view>
+											
 										</view>
 									</view>
 								</view>

pages2/bank/question_detail.vue

@@ -94,7 +94,7 @@
 						</view>
 						<view v-if="item1.showList">
 							<view class="article active" style="margin-left:64rpx;" v-for="(article, index2) in item1.list" :key="index2">
-								<view class="flex_auto">{{ item1.name }}</view>
+								<view class="flex_auto">{{ article.examName }}</view>
 								<view class="btn" @click="toDo(article.examId, goodsData.goodsId, 0, item1.majorId)" v-if="article.recordStatus == -1">做题</view>
 								<view class="btn" @click="continueDo(article.recordId,article.examId, goodsData.goodsId, 0, item1.majorId)" v-if="article.recordStatus == 0 && article.doType == 1">继续</view>
 								<view class="btn" @click="doRepeat(article.recordId,article.examId, goodsData.goodsId, item1.majorId,0)" v-if="article.recordStatus == 1 || (article.recordStatus == 0 && article.doType == 2)">重做</view>

pages2/exam/exam_appointment.vue

@@ -188,9 +188,11 @@ export default {
 		isShowFun(times) {
 			var timestamp = parseInt(new Date().getTime() / 1000);
 			var newDataAge = parseInt(new Date(new Date().toLocaleDateString()).getTime() / 1000);
+			//报名开放时间”过了“结束时间点”，【取消预约】按钮隐藏
 			if (times.applyEndTime <= timestamp) {
 				return false;
 			} else {
+				//报名开放时间-进行中，【前培标记：已开通】，【取消预约】按钮隐藏
 				if (times.beforeStatus === 1) {
 					console.log(1);
 					return false;

pages2/wd/class.vue

@@ -3,7 +3,6 @@
 		<view class="class" v-for="(item, index) in goodsList" :key="index">
 			
 				<view class="class_item" @click.stop="studyIn(item.goodsId,item.gradeId,item)">
-					<!-- <navigator  hover-class="none" :url="`/pages2/wd/course?id=${item.goodsId}&gid=${item.gradeId}`"> -->
 						<image :src="$method.splitImgHost(item.coverUrl, true)" class="class_img"></image>
 						<view class="class_text">
 							<view class="class_title">{{ item.goodsName }}</view>
@@ -23,15 +22,16 @@
 								<text class="content">{{ $method.timestampToTime(item.validityStartTime) }} - {{ $method.timestampToTime(item.validityEndTime) }}</text>
 							</view>
 						</view>
-					<!-- </navigator> -->
-					<view class="class-warm" v-if="item.classEndTime && (item.classEndTime < sysTime) ">
-						<u-icon class="class-warm__icon" size="30" color="#FF3B30" name="error-circle-fill"></u-icon>
-						<view class="class-warm__text">
-							<view class="date">班级有效期：{{$method.timestampToTime(item.classStartTime)}} - {{$method.timestampToTime(item.classEndTime)}}</view>
-							<view class="state">班级状态：已过期，有疑问请联系 <text @click="call">020-87085982</text></view>
-						</view>
-					</view>
-					
+						
+						<template v-if="item.classEndTime && (item.classEndTime < sysTime) ">
+							<view class="class-warm">
+								<u-icon class="class-warm__icon" size="30" color="#FF3B30" name="error-circle-fill"></u-icon>
+								<view class="class-warm__text">
+									<view class="date">班级有效期：{{$method.timestampToTime(item.classStartTime)}} - {{$method.timestampToTime(item.classEndTime)}}</view>
+									<view class="state">班级状态：已过期，有疑问请联系 <text @click="call">020-87085982</text></view>
+								</view>
+							</view>
+						</template>
 				</view>
 			
 			
@@ -275,6 +275,13 @@ export default {
 			});
 		},
 		okPopup() {
+			if(this.gradeValue == -1) {
+				uni.showToast({
+					icon:'none',
+					title:'请选择班级'
+				})
+				return;
+			}
 			this.$api.changeGrade({
 			  goodsId: this.selectItem.goodsId,
 			  gradeId: this.gradeValue,

pages3/polyv/detail.vue

@@ -306,9 +306,11 @@ export default {
 		//相机授权
 		this.getCameraSetting()
 		this.$api.getbaseprofiletplists({ goodsId: self.goodsId }).then(res => {
+			console.log(res,'res')
 			if (res.data.code === 200 && res.data.rows.length) {
 				if (res.data.rows[0].keyValue) {
 					self.$api.getbaseprofiletpgetInfo({ goodsId: self.goodsId }).then(result => {
+						console.log(result,'result')
 						if (result.data.code === 200) {
 							if (!result.data.data || (result.data.data.status === 3 && result.data.data.changeStatus === 1)) {								
 								if (!result.data.data) {
@@ -344,8 +346,9 @@ export default {
 										}
 									});
 								}
-							} else if (result.data.data.status === 1 && res.data.rows[0].keyValue2) {
+							} else if (result.data.data.status === 1 && JSON.parse(res.data.rows[0].keyValue2)[0]) {
 								self.$api.getbaseprofileStampgetInfo({ goodsId: self.goodsId }).then(k => {
+									
 									if (k.data.code === 200) {
 										if (!k.data.data || (k.data.data.status === 3 && k.data.data.changeStatus === 1)) {
 											if (!k.data.data) {