提示和bug修复

pages/examPage/examInfo.vue

@@ -21,7 +21,6 @@
 		<uni-section>
 			<uni-card class="box-card" v-if="exams.length===0&&!enter">
 				<uni-row>
-
 					<uni-col :span="4">
 					</uni-col>
 					<uni-col :span="16">

pages/examPage/examStart.vue

@@ -53,6 +53,9 @@
 						<view v-if="scantron.questionType!==7&&scantron.questionType!==8" id="scantronNodes"
 							style="height: 45vh;">
 						</view>
+						<view v-if="scantron.questionType==7||scantron.questionType==8" id="scantronNodes"
+							style="height: 5vh;">
+						</view>
 						<template v-if="scantron.questionType===1||scantron.questionType===3">
 
 							<view>
@@ -218,73 +221,6 @@
 											</label>
 										</view>
 									</template>
-									<template v-if="combinationItem.questionType===7">
-										<view style="height: 5vh;">
-											<rich-text :nodes="combinationItem.question.content"></rich-text>
-										</view>
-										<view>
-											<l-divider color="#aaaa7f">
-											</l-divider>
-										</view>
-										<view style=" height: 500px;width: 700px;background-color: #ff3807;">
-
-											<movable-area style="height: 500px;width: 700px;background-color: #8c8c8c;">
-
-												<movable-view style="width: 50px;height: 50px;border:solid 1px black;"
-													:x="x" :y="y">
-
-												</movable-view>
-
-
-
-												<movable-view
-													style="width: 40px;height: 40px;background-color: #f90005;"
-													direction="all" :x="x" :y="y" @change="onChange">
-
-													text
-												</movable-view>
-
-											</movable-area>
-
-										</view>
-
-									</template>
-									<template v-if="combinationItem.questionType===8">
-										<view style="height: 5vh;">
-											<rich-text :nodes="combinationItem.question.content"></rich-text>
-										</view>
-										<view>
-											<l-divider color="#aaaa7f">
-											</l-divider>
-										</view>
-
-										<view>
-											<view style="height: 600px;width: 800;background-color: #8c8c8c;">
-
-												<movable-area
-													style="height: 100%;width: 100%;background-color: #8c8c8c;">
-
-													<movable-view
-														style="width: 50px;height: 50px;border:solid 1px black;" :x="95"
-														:y="95">
-
-													</movable-view>
-
-													<movable-view
-														style="width: 40px;height: 40px;background-color: #f90005;"
-														direction="all" :x="x" :y="y" @change="onChange">
-
-														text
-													</movable-view>
-
-												</movable-area>
-
-											</view>
-
-										</view>
-
-									</template>
-
 
 								</uni-card>
 							</view>
@@ -669,6 +605,9 @@
 				this.scantron = this.examObject.userExamQuestionList[value - 1]
 				if (this.scantron.questionType !== 7 && this.scantron.questionType !== 8) {
 					document.getElementById('scantronNodes').innerHTML = this.scantron.question.content
+				}else{
+					console.log(this.scantron.question.content.split('%||||||||%')[0]);
+					document.getElementById('scantronNodes').innerHTML = this.scantron.question.content.split('%||||||||%')[0]
 				}
 
 				let combination = setInterval(() => {
@@ -1040,7 +979,7 @@
 				if (!this.disabledDrag) {
 					return
 				}
-				
+
 				let index = -1
 				for (var j = 0; j < this.drag[this.scantron.sort].option.length; j++) {
 					let option = this.drag[this.scantron.sort].option[j]
@@ -1077,13 +1016,15 @@
 								.height)) >= drag.y
 						) {
 							for (var p = 0; p < this.drag[this.scantron.sort].answer.length; p++) {
-								if (this.drag[this.scantron.sort].answer[p].op !== undefined&&this.drag[this.scantron.sort].answer[p].op === index) {
+								if (this.drag[this.scantron.sort].answer[p].op !== undefined && this.drag[this
+										.scantron.sort].answer[p].op === index) {
 									this.drag[this.scantron.sort].answer[p].op = undefined
 								}
 							}
 							if (this.drag[this.scantron.sort].answer[i].op !== undefined) {
 								this.tap(this.drag[this.scantron.sort].answer[i].op, this.drag[this.scantron.sort]
-									.option[this.drag[this.scantron.sort].answer[i].op].old.ax, this.drag[this.scantron.sort]
+									.option[this.drag[this.scantron.sort].answer[i].op].old.ax, this.drag[this
+										.scantron.sort]
 									.option[this.drag[this.scantron.sort].answer[i].op].old.by);
 								this.drag[this.scantron.sort].answer[i].op = index
 							} else {

pages/login/Login.vue

@@ -56,6 +56,7 @@
 	import {
 		getSysLogin,
 		minioIP,
+		minioPort,
 		request,
 	} from '../../examJs/examRequest';
 	import {