From b2e67f9a15880b964a2a71e8a622f9b06ba7bd74 Mon Sep 17 00:00:00 2001
From: hcj <hcj>
Date: Thu, 4 Jul 2024 14:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E8=A1=A8=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/testtraining/teacherDetail.vue | 10 ++++++---
 pages/index/testtraining/teacherSign.vue   | 18 +++++++++++----
 pages/index/testtraining/testtraining.vue  | 26 +++++++++++++++++++---
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/pages/index/testtraining/teacherDetail.vue b/pages/index/testtraining/teacherDetail.vue
index 3630554..84c7e57 100644
--- a/pages/index/testtraining/teacherDetail.vue
+++ b/pages/index/testtraining/teacherDetail.vue
@@ -234,11 +234,15 @@
 					</view>
 					<view class="rightBox">
 						<view class="rightBox1">
-							<view class="rightBoxRow">
+							<!-- <view class="rightBoxRow">
 								<text>报名方式1：</text><text style="cursor: pointer;color: #1B68DE;"
 									@click="gosign">点击报名</text>
+							</view> -->
+							<view class="rightBoxRow">
+								<text>报名方式：</text><text style="cursor: pointer;color: #1B68DE;"
+									@click="gosign">点击报名</text>
 							</view>
-							<view class="rightBoxRow rightBoxRowflex">
+							<!-- <view class="rightBoxRow rightBoxRowflex">
 								<text>报名方式2：</text>
 								<view class="" style="display: flex;flex-direction: column;">
 									<text style="cursor: pointer;color: #FB6827;"
@@ -248,7 +252,7 @@
 										src="http://image.bjkeyware.com/static/index/renliwb/627teacherlogo6.png" mode="">
 									</image>
 								</view>
-							</view>
+							</view> -->
 							<view class="rightBoxRow">
 								<text>项目负责人：</text>牛中东 13683248482（同微信）
 							</view>
diff --git a/pages/index/testtraining/teacherSign.vue b/pages/index/testtraining/teacherSign.vue
index 91c1e2b..779fc50 100644
--- a/pages/index/testtraining/teacherSign.vue
+++ b/pages/index/testtraining/teacherSign.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="boxsxx">
-		<image src="http://image.bjkeyware.com/static/index/renliwb/627teacherbg.png" class="topbg" mode=""></image>
+		<!-- <image src="http://image.bjkeyware.com/static/index/renliwb/627teacherbg.png" class="topbg" mode=""></image> -->
 
 		<view class="tscontent">
 			<view class="contitle">北京关键科技股份有限公司&河南科技大学</view>
@@ -19,13 +19,13 @@
 			<!-- 表单 -->
 			<u-form :model="form" ref="uForm" label-position="top" class="uformclass" :rules="rules">
 				<u-form-item v-for="(it,index) in detailForm" :key="it.key" :label="`${index + 1}.${it[it.key]}`">
-					<u-input v-if="it.type == 'input'" border v-model="form[it.key]" />
-					<u-radio-group v-if="it.type == 'radio'" wrap v-model="form[it.key]">
+					<u-input v-if="it.type == 'input'" border v-model="form[it.key]"  />
+					<u-radio-group v-if="it.type == 'radio'" wrap v-model="form[it.key]" >
 						<u-radio v-for="(item, i) in it.value" :key="item" :name="item">
 							{{ item }}
 						</u-radio>
 					</u-radio-group>
-					<u-input v-if="it.type == 'textarea'" type="textarea" border v-model="form[it.key]" />
+					<u-input v-if="it.type == 'textarea'" type="textarea" border v-model="form[it.key]"  />
 				</u-form-item>
 			</u-form>
 
@@ -53,6 +53,7 @@
 			this.getformDe()
 		},
 		onReady() {
+			this.$refs.uForm.setRules(this.rules);
 		},
 		methods: {
 			getformDe() {
@@ -95,12 +96,21 @@
 				// 设置rules不生效,暂时先循环校验空值
 				this.detailForm.forEach(it => {
 					if (!this.form[it.key]) {
+						console.log("不完整");
 						return uni.showToast({
 							title: '请将报名表填写完整',
 							icon: 'none'
 						})
 					}
 				})
+				const toggle = this.form.some(item=>{return toggle === ""})
+				if(toggle){
+					uni.showToast({
+						title: '请将报名表填写完整',
+						icon: 'none'
+					})
+					return
+				}
 				// 处理json数据
 				const newData = JSON.parse(JSON.stringify(this.detailForm))
 				newData.forEach((it) => {
diff --git a/pages/index/testtraining/testtraining.vue b/pages/index/testtraining/testtraining.vue
index 78a0afe..7b420a0 100644
--- a/pages/index/testtraining/testtraining.vue
+++ b/pages/index/testtraining/testtraining.vue
@@ -841,7 +841,10 @@
 				// 评测班弹窗
 				tips: '',
 				isPCshow: false,
-				classInfo: {},
+				classInfo: {
+					classId:"",
+					classType:""
+				},
 				jjrules: {
 					studentName: [{
 						required: true,
@@ -1008,9 +1011,13 @@
 			getSwiperImages(){
 				this.http.quickGet(`/train/banners?type=app`).then(res => {
 					this.swipelist = res.data.data.map(item=>{
+						console.log(item);	
 						return {
 							'classType':item.classType,
-							'image':this.http.baseUrl + item.filePath
+							'image':this.http.baseUrl + item.filePath,
+							'classId':item.entityId,
+							'classType':item.classType,
+							
 						}
 					})
 					console.log(this.swipelist);	
@@ -1018,6 +1025,7 @@
 			},
 			bgClick(e) {
 				const type = this.swipelist[e].classType
+				const item = this.swipelist[e]
 				console.log(e);
 				console.log(this.swipelist);
 				console.log(type);	
@@ -1029,6 +1037,16 @@
 						url: '/pages/index/testtraining/teacherDetail'
 					})
 				}
+				if(type == 1){
+					this.classInfo.classId = item.entityId
+					this.classInfo.classType = item.classType
+					this.jjOpen()
+				}
+				if(type == 2){
+			this.classInfo.classId = item.entityId
+			this.classInfo.classType = item.classType
+					this.jjOpen()
+				}
 			},
 			onKeyboardHeightChange(res) {
 				const {
@@ -1210,8 +1228,10 @@
 				// 	this.isPCshow = true
 				// 	this.classInfo = it
 				// }
+				if(it){
+					this.classInfo = it
+				}
 				this.isPCshow = true
-				this.classInfo = it
 			},
 			// 新报名提交
 			jjbaoming() {