From 9539896ac0759b3e4c10ebbd43bb93a5de1d178e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Thu, 5 Mar 2026 09:24:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=5Ffix:=20=E8=AF=84=E8=AE=BA=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comment-input/comment-input.vue           | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/components/comment-input/comment-input.vue b/src/components/comment-input/comment-input.vue
index a8a8c051..75b6f280 100644
--- a/src/components/comment-input/comment-input.vue
+++ b/src/components/comment-input/comment-input.vue
@@ -24,7 +24,7 @@
 			<view class="picture-cont" v-if="isShow && !isReply">
 				<!-- 下方的图片展示框 -->
 				<view class="imgs-div" v-if="!isImg">
-					<image-preview class="upload-img" v-for="item in fileList" :src="item" mode=""></image-preview>
+					<image-preview class="upload-img" v-for="item in fileList" :imgId="item" mode=""></image-preview>
 				</view>
 				<view class="picture" v-if="isImg">
 					<picture-upload :limit="4" v-model="fileList"></picture-upload>
@@ -70,11 +70,14 @@
 			<view class="tool-icon tool-icon-img" @click="upload()" v-if="!isReply">
 				<image class="img" :src="commentInput3" mode="aspectFit"></image>
 			</view>
-			<view class="tool-icon tool-icon-emoji" @click="showKeyborad">
+			<!-- <view class="tool-icon tool-icon-emoji" v-if="!isFocus" @click="showKeyborad">
 				<image class="img" :src="commentInput2" mode="aspectFit"></image>
+			</view> -->
+			<view class="tool-icon tool-icon-emoji" @click="showEmojiNow">
+				<image class="img" :src="commentInput1" mode="aspectFit"></image>
 			</view>
 			<view class="fl1"></view>
-			<view class="tool-send"  @click="submit">发送</view>
+			<view :class="['tool-send', value.length === 0?'is-disabled':'']"  @click="submit">发送</view>
 		</view>
 		<!-- 下方主要表情输入框 -->
 		<view class="bottom-main-input-div">
@@ -113,7 +116,7 @@
 	import commentInput2 from '@/static/images/courseDetail/comment-input-2.png'
 	import commentInput3 from '@/static/images/courseDetail/comment-input-3.png'
 	import commentInput4 from '@/static/images/courseDetail/comment-input-4.png'
-	import { reactive, ref, watch, nextTick, computed } from 'vue';
+	import { reactive, ref, watch, nextTick, computed, onBeforeUnmount } from 'vue';
 	import { emojiList } from '@/emoji';
 	import { publishCrsEvaluation, queryTraMemeInfoList } from '@/api/courseDetail.js'
 	import common from '@/common/common.js';
@@ -144,7 +147,6 @@
 		// '/src/static/images/test/e7dd89a71493fcc6281700a4864e24cb.jpg'
 	])
 	const isShow = ref(false);
-	const popHeight = ref('0px')
 	const value = ref('');
 	const click_input = () => {
 		if(!isShow.value) isShow.value = true
@@ -161,9 +163,14 @@
 		isFocus.value = true
 		cursorLength.value = resStart.value || value.value.length
 	}
+	const showEmoji = ref(false)
+	const showEmojiNow = () => {
+		showEmoji.value = !showEmoji.value
+	}
+	const popHeight = ref('0px')
 	const focus = (event) => {
-		popHeight.value = 'calc(270px + 120rpx)'
 		isShow.value = true
+		isFocus.value = true
 		console.log('focusevent');
 		if(!isReply.value){
 			getMemList()
@@ -263,15 +270,14 @@
 		})
 	}
 	const setMemValue = (item) => {
-		console.log(item)
 		if(!isImg.value || fileList.value.length == 0){
-			fileList.value = [item.ossAddr]
+			fileList.value = [item.ossKey]
 			isImg.value = false
 			return
 		}
 		common.show('','是否清空当前图片并重新添加？').then((res) => {
 			if (res) {
-				fileList.value = [item.ossAddr]
+				fileList.value = [item.ossKey]
 				isImg.value = false
 			}
 		});
@@ -314,9 +320,6 @@
 					value.value = ''
 					fileList.value = []
 					emit('submitOver')
-					if (from.value === 'study') {
-					} else {
-					}
 				}, 500);
 			}, delayTime);
 		}).catch(err=>{
@@ -335,6 +338,24 @@
 			isImg.value = true
 		}
 	})
+	const keyboardHeight = ref(0)
+	const maxKeyboardHeight = ref(0)
+	uni.onKeyboardHeightChange((res)=>{
+		maxKeyboardHeight.value = res.height > keyboardHeight.value?res.height : keyboardHeight.value
+		keyboardHeight.value = res.height
+	})
+	onBeforeUnmount(()=>{
+		
+	})
+	watch(()=> showEmoji.value,(val)=>{
+		popHeight.value = val ? `${maxKeyboardHeight.value}px` : (keyboardHeight.value+'px')
+	})
+	watch(()=> keyboardHeight.value,(val)=>{
+		console.log(val,showEmoji.value)
+		console.log(maxKeyboardHeight.value)
+		popHeight.value = showEmoji.value ? `${maxKeyboardHeight.value}px` : keyboardHeight.value+'px'
+		console.log(popHeight.value)
+	})
 	defineExpose({hideAll, resetVal})
 </script>
 
@@ -455,6 +476,10 @@
 			font-size: 30rpx;
 			color: #fff;
 			margin-right: 20rpx;
+			&.is-disabled{
+				background-color: #ccc;
+				// pointer-events: none;
+			}
 		}
 	}
 	.main-div {

From c5be86b02ddb80719218a32ffd2e651305b403f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Thu, 5 Mar 2026 09:31:33 +0800
Subject: [PATCH 2/2] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E?=
 =?UTF-8?q?=E5=90=89=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=5F=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5pk?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                    |   4 +-
 src/pages/competition/index.vue     |   1 +
 src/pages/index/components/todo.vue | 141 +++++++++++++---------------
 3 files changed, 70 insertions(+), 76 deletions(-)

diff --git a/.env.development b/.env.development
index 93437482..85e17ced 100644
--- a/.env.development
+++ b/.env.development
@@ -5,11 +5,11 @@ ENV = 'development'
 #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 
 # DEV
-#VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
 # sit
 #VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
diff --git a/src/pages/competition/index.vue b/src/pages/competition/index.vue
index d8e40b43..f3f2a71b 100644
--- a/src/pages/competition/index.vue
+++ b/src/pages/competition/index.vue
@@ -49,6 +49,7 @@
 		searchKey: 'comName',
 		fetchFunction: queryTraCompetitionInfoPaging
 	});
+	// 去竞赛页
 	const goto_competition = (item) => {
 		if (item.type !== '00') {
 			if(item.type === '01') common.msg('竞赛未开始');
diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue
index 173a9914..5f8688b9 100644
--- a/src/pages/index/components/todo.vue
+++ b/src/pages/index/components/todo.vue
@@ -9,8 +9,12 @@
 		<!-- {{activeDate}} -->
 		<calendarCom @change="changeDate" />
 		<view class="table-list">
-			<todoItem v-for="(item, index) in tableData" :dataInfo="item"
-				:class="index === tableData.length -1 ?'last-item':''" @click="handleDetail(item)"></todoItem>
+			<todoItem
+				v-for="(item, index) in tableData"
+				:dataInfo="item"
+				:class="index === tableData.length - 1 ? 'last-item' : ''"
+				@click="handleDetail(item)"
+			></todoItem>
 			<view class="empty-box" v-show="tableData.length === 0">暂无数据</view>
 		</view>
 		<view class="more-btn" v-show="showMoreBtn" @click="getMoreData">点击加载更多</view>
@@ -18,80 +22,70 @@
 </template>
 
 <script setup>
-	import {
-		ref,
-		onMounted,
-		computed
-	} from 'vue'
-	import calendarCom from './calendar.vue'
-	import todoItem from './todo-item.vue'
-	import common from '@/common/common.js'
-	import {
-		queryHaveToDo
-	} from '@/api/index'
-	import {
-		queryTraExamPapersByPapersId
-	} from '@/api/examination.js';
-	import {
-		queryTestPapers
-	} from '@/api/competition.js';
-	import {
-		checkTraPartnerInfoById
-	} from '@/api/sparring.js'
+	import { ref, onMounted, computed } from 'vue';
+	import calendarCom from './calendar.vue';
+	import todoItem from './todo-item.vue';
+	import common from '@/common/common.js';
+	import { queryHaveToDo } from '@/api/index';
+	import { queryTraExamPapersByPapersId } from '@/api/examination.js';
+	import { queryTestPapers, queryOrgTree } from '@/api/competition.js';
+	import { checkTraPartnerInfoById } from '@/api/sparring.js';
 	import { queryTraUserAnonyByUserId } from '@/api/user.js';
-	const activeDate = ref('')
-	const tableData = ref([])
+	const activeDate = ref('');
+	const tableData = ref([]);
 	const pageObj = ref({
 		totalNum: 0,
 		page: 1,
 		limit: 10
-	})
+	});
 	const changeDate = (date) => {
-		activeDate.value = date
-		getDataList(date, 1)
-	}
+		activeDate.value = date;
+		getDataList(date, 1);
+	};
 	const showMoreBtn = computed(() => {
-		return pageObj.value.totalNum > pageObj.value.page * pageObj.value.limit
-	})
+		return pageObj.value.totalNum > pageObj.value.page * pageObj.value.limit;
+	});
 	const getMoreData = () => {
-		pageObj.value.page += 1
-		getDataList(activeDate.value)
-	}
+		pageObj.value.page += 1;
+		getDataList(activeDate.value);
+	};
 	const getDataList = (date, flag) => {
 		common.loading();
 		if (flag === 1) {
-			tableData.value = []
+			tableData.value = [];
 			pageObj.value = {
 				totalNum: 0,
 				page: 1,
 				limit: 10
-			}
+			};
 		}
 		queryHaveToDo({
 			date,
 			...pageObj.value
-		}).then(res => {
-			let _arr = res.body || []
-			pageObj.value.totalNum = res.total
-			tableData.value = tableData.value.concat(_arr)
-		}).finally(() => {
-			common.hideLoading();
-		});
-	}
+		})
+			.then((res) => {
+				let _arr = res.body || [];
+				pageObj.value.totalNum = res.total;
+				tableData.value = tableData.value.concat(_arr);
+			})
+			.finally(() => {
+				common.hideLoading();
+			});
+	};
 	const handleDetail = (item) => {
-		console.log(item)
+		console.log(item);
 		switch (item.type) {
 			case '00':
-				common.navigateTo('/pages/courseDetail/index?crsId=' + item.id)
+				common.navigateTo('/pages/courseDetail/index?crsId=' + item.id);
 				break;
 			case '01':
-				toSparringDetail(item)
+				toSparringDetail(item);
 				break;
 			case '02':
-				toPKDetail(item)
+				toPKDetail(item);
 				break;
 			case '03':
-				toExaminationDetail(item)
+				toExaminationDetail(item);
 				break;
 			case '04':
 				common.setPageCache('learning_tasks_details', {
@@ -104,38 +98,38 @@
 			default:
 				break;
 		}
-	}
+	};
 	// 去PK
 	const toPKDetail = async (item) => {
+		const comId = item.id;
 		common.loading();
-		queryTestPapers({
-				comId: item.id
-			})
+		const result = Promise.all([queryTestPapers({ comId }), queryTraUserAnonyByUserId(), queryOrgTree()]);
+		result
 			.then((res) => {
+				const papersId = res[0].body;
 				common.setPageCache('competition_list', {
-					papersId: res.body.papersId, // 试卷id
-					isAnony: res.body.isAnony, // 是否匿名 Y是N否
-					ruleDesc: res.body.ruleDesc, // 规则说明
-					comName: item.name, // 标题
-					comId: item.id
+					papersId: papersId, // 试卷id
+					isAnony: res[1].body.isAnony, // 是否匿名 Y是N否
+					ruleDesc: item.ruleDesc, // 规则说明
+					comName: item.comName, // 标题
+					comId: comId
 				});
-				queryTraUserAnonyByUserId().then(res2=>{
-					common.setValue('orgTree', res2.body ?? []);
-					common.navigateTo(`/pages/competition/matching?papersId=${res.body.papersId}&comId=${item.id}`);
-				})
-			})
-			.finally(() => {
+				common.setValue('orgTree', res[2].body ?? []);
 				common.hideLoading();
+				common.navigateTo(`/pages/competition/matching?papersId=${papersId}&comId=${comId}`);
+			})
+			.catch(() => {
+				common.msg('网络繁忙,请稍后再试!');
 			});
 	};
 	// 去考试
 	const toExaminationDetail = async (item) => {
 		common.loading();
 		queryTraExamPapersByPapersId({
-				papersId: item.id
-			})
+			papersId: item.id
+		})
 			.then((res) => {
-				common.setPageCache('testing_hall_details',res.body);
+				common.setPageCache('testing_hall_details', res.body);
 				common.navigateTo('/pages/testingHall/details');
 			})
 			.catch(() => {})
@@ -144,19 +138,19 @@
 			});
 	};
 	// 跳转 课程详情
-	const toSparringDetail = item => {
+	const toSparringDetail = (item) => {
 		if (item.id) {
 			checkTraPartnerInfoById({
 				traId: item.id
-			}).then(res => {
+			}).then((res) => {
 				if (res.body.inRange) {
-					common.navigateTo('/pages/sparring/detail?traId=' + item.id)
+					common.navigateTo('/pages/sparring/detail?traId=' + item.id);
 				} else {
-					common.show('提示', res.body.message, false)
+					common.show('提示', res.body.message, false);
 				}
-			})
+			});
 		}
-	}
+	};
 </script>
 
 <style lang="scss" scoped>
@@ -188,7 +182,6 @@
 		}
 
 		.icon_3 {
-
 			// margin-top: 10rpx;
 			.img {
 				width: 38rpx;
@@ -232,4 +225,4 @@
 		font-size: 24rpx;
 		line-height: 120rpx;
 	}
-</style>
\ No newline at end of file
+</style>