diff --git a/.env.development b/.env.development
index fb194141..f8700295 100644
--- a/.env.development
+++ b/.env.development
@@ -2,6 +2,7 @@
 ENV = 'development'
 # '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 = 'http://192.168.247.200'
@@ -10,6 +11,7 @@ VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 # dev
 #VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 # sit
+
 # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
 # UAT
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
@@ -22,8 +24,6 @@ VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
 
 # h5专用地址x2
-
-
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
@@ -31,3 +31,4 @@ VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602'
 #VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://192.168.247.200'
 # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.32.154:9605'
+
diff --git a/src/api/request.js b/src/api/request.js
index e9a30160..9081ebc3 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -35,7 +35,7 @@ export const get_base_url = (url = '') => {
 		}
 		// #endif
 		// #ifdef  APP-PLUS
-		return ENV.VITE_APP_BASE_API_Url
+		return 'https://aitstest.jlbank.com.cn:7002' || ENV.VITE_APP_BASE_API_Url
 		// #endif
 	} else { // 其他环境，包括生产环境，sit环境，uat环境
 
diff --git a/src/pages/courseDetail/index.vue b/src/pages/courseDetail/index.vue
index 3de74b76..d8158cd2 100644
--- a/src/pages/courseDetail/index.vue
+++ b/src/pages/courseDetail/index.vue
@@ -371,8 +371,8 @@
 		border-radius: 24rpx 24rpx 0rpx 0rpx;
 		// height: 162rpx;
 		background-color: #ffffff;
-		display: flex;
-		flex-direction: column;
+		// display: flex;
+		// flex-direction: column;
 		padding-top: 36rpx;
 		padding-left: 42rpx;
 		padding-bottom: 24rpx;
diff --git a/src/pages/examination/components/dialog.vue b/src/pages/examination/components/dialog.vue
index 64fd870e..dd337d3b 100644
--- a/src/pages/examination/components/dialog.vue
+++ b/src/pages/examination/components/dialog.vue
@@ -1,22 +1,23 @@
 <template>
 	<uni-popup ref="PopupRef" class="popup" :mask-click="false">
-		<view class="popup_div">
-			<view class="title_div">
-				<!-- 1. 插槽优先 -->
-				<slot name="title" v-if="$slots.title"></slot>
-				<!-- 2. 有HTML内容且不为空时使用v-html -->
-				<view v-else-if="html && html.trim() !== ''" v-html="html"></view>
-				<!-- 3. 最后显示默认标题 -->
-				<template v-else>{{ title }}</template>
-			</view>
-			<view v-if="msg" class="msg_div">
-				{{ msg }}
-			</view>
-			<view class="button_div">
-				<view class="button_item" v-for="item in buttonList" :style="item?.style" @click="click_button(item)">
-					{{ item?.name || '' }}
+		<view class="popup-content">
+			<view class="fl1"></view>
+			<view class="popup_div">
+				<view class="title_div">
+					<!-- 1. 插槽优先 -->
+					<slot name="title" v-if="$slots.title"></slot>
+					<!-- 2. 有HTML内容且不为空时使用v-html -->
+					<view v-else-if="html && html.trim() !== ''" v-html="html"></view>
+					<!-- 3. 最后显示默认标题 -->
+					<template v-else>{{ title }}</template>
+				</view>
+				<view class="button_div">
+					<view class="button_item" v-for="item in buttonList" :style="item?.style" @click="click_button(item)">
+						{{ item?.name || '' }}
+					</view>
 				</view>
 			</view>
+			<view class="fl1"></view>
 		</view>
 	</uni-popup>
 </template>
@@ -28,8 +29,7 @@
 		dialogConfiguration: {
 			type: Object,
 			required: false
-		},
-		
+		}
 	});
 	const emit = defineEmits(['button_click']);
 
@@ -70,7 +70,13 @@
 		height: 100%;
 		background-color: rgba(0, 0, 0, 0.5);
 	}
-
+	.popup-content {
+		width: 100%;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
 	.popup_div {
 		width: 80%;
 		background-color: #ffffff;
@@ -80,8 +86,8 @@
 		align-items: center;
 		border-radius: 16rpx;
 		position: relative;
-		margin: 0 auto 76% auto;
-
+		margin-top: 6vw;
+		margin-bottom: 30vw;
 		.title_div {
 			width: 100%;
 			text-align: center;
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 892abb5a..02979bcc 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -9,11 +9,13 @@
 				<image src="/static/images/login/logo_text.png" mode="heightFix" class="log_img" @click="goTest"></image>
 				<view class="fl1"></view>
 			</view>
+			<view class="fl2"></view>
 			<view class="title_text_div">
 				<view class="title_text font_pf">欢迎登录</view>
 				<image src="/static/images/login/clap.png" class="title_text_img"></image>
 			</view>
 			<view class="title_text_tip font_pf">登录账号即可查看更多精彩咨询</view>
+			<view class="fl1"></view>
 		</view>
 		<view class="account_password_div">
 			<view class="title1 font_pf">账号</view>
@@ -42,7 +44,7 @@
 				</template>
 			</uv-input>
 		</view>
-		<view class="fl1"></view>
+		<view class="fl8"></view>
 		<view class="bottom_login_div">
 			<view class="" @click="login_fun">
 				<uv-button class="bottom_login_button" type="primary" :throttleTime="500" :disabled="login_button_status">
@@ -57,36 +59,25 @@
 					已阅读并同意
 
 					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy?page=1')">《用户隐私协议》</span>
-
-					<!-- 与
-					<span class="ysxy_term" @click="common.navigateTo('/pages/login/ysxy?page=2')">《隐私权政策》</span> -->
 				</view>
 			</view>
 		</view>
+		<view class="ime-div"></view>
 	</view>
 </template>
 
 <script lang="ts" setup>
 	// import { v4 as uuid4 } from 'uuid'
 	import { onBackPress, onLoad } from '@dcloudio/uni-app';
-	import { ref, computed, onMounted, onBeforeUnmount, getCurrentInstance } from 'vue';
+	import { ref, computed, onMounted, onUnmounted, onBeforeUnmount, getCurrentInstance } from 'vue';
 	import common from '@/common/common';
+	import { setupKeyboardHeightListener } from '@/common/common';
 	import { useAccountLoginApp, queryCurrentUser } from '@/api/login.js';
 	import { encryptByAES } from '@/api/encryptAndDecryptData.js';
 
 	import { useSocketStore } from '@/store/socket.js';
 	import { storeToRefs } from 'pinia';
 	import { getPhoneEnvBool } from '@/common/common.js';
-	// interface PageVueInstance {
-	//   refreshData?: () => Promise<void> | void;
-	// }
-	// // 定义完整的页面实例类型（包含原生属性和$vm）
-	// interface CustomPageInstance {
-	//   route: string;   // 页面路由路径
-	//   options: Record<string, any>;// 页面参数
-	//   $vm: PageVueInstance; // 页面对应的Vue组件实例
-	// }
-	// 定义页面实例的类型（基于UniApp实际情况）
 
 	const socketStore = useSocketStore();
 	const { taskSocket } = storeToRefs(socketStore);
@@ -94,6 +85,7 @@
 	const account = ref<string>('');
 	const password = ref<string>('');
 	const read_text_state = ref<Array<unknown>>([]);
+	const imeHeight = ref('0px');
 	const back_state = ref(true);
 	// 登录按钮状态
 	const login_button_status = computed<boolean>(() => !read_text_state.value.length);
@@ -170,7 +162,7 @@
 					}
 				})
 				.catch((res) => {
-					console.log(res);
+					
 					common.hideLoading();
 					if (res.rtnCode === '1001') {
 						common.msg('账号或密码错误，如忘记密码，请去统一身份认证平台修改。');
@@ -182,8 +174,12 @@
 			common.hideLoading();
 		}
 	};
+	let removeListener = () => {};
+
+	onUnmounted(() => {
+		removeListener();
+	});
 
-	onLoad(() => {});
 	onMounted(() => {
 		let loginAccountData = common.getValue('loginAccountData');
 		if (loginAccountData) {
@@ -191,15 +187,36 @@
 			password.value = loginAccountData.password;
 		}
 		back_state.value = true;
+		removeListener = setupKeyboardHeightListener((height) => {
+			console.log('height', height);
+			if (height > 0) {
+				imeHeight.value = height + 50 + 'px';
+			} else {
+				imeHeight.value = '0px';
+			}
+		});
 	});
 	// 跳进了登录页，禁止返回操作
 	onBackPress(() => back_state.value);
 </script>
 
 <style lang="scss" scoped>
+	.fl2 {
+		flex: 2;
+	
+	}
+	.fl8 {
+		flex: 4;
+	}
+	.ime-div {
+		height: v-bind(imeHeight);
+		width: 100%;
+		transition: height .2s ease;
+	}
 	.bottom_login_div {
 		padding: 0 58rpx;
-		margin-bottom: 93rpx;
+		margin-top: 43rpx;
+		margin-bottom: 80rpx;
 
 		.ysxy_div {
 			margin-top: 27rpx;
@@ -276,9 +293,8 @@
 		flex-direction: column;
 		position: relative;
 		padding: 0 50rpx;
-		height: 496rpx;
-		// border: 1px solid red;
-
+		min-height: 356rpx;
+		flex: 1;
 		.bg_img {
 			position: absolute;
 			top: 0;
@@ -315,7 +331,7 @@
 		.title_text_div {
 			display: flex;
 			align-items: center;
-			margin-top: 84rpx;
+			// margin-top: 84rpx;
 
 			.title_text {
 				font-weight: 700;
@@ -338,5 +354,7 @@
 	.main_div {
 		display: flex;
 		flex-direction: column;
+		overflow: hidden;
+		max-height: 100vh;
 	}
 </style>
diff --git a/src/pages/mascot/mascot_select_list.vue b/src/pages/mascot/mascot_select_list.vue
index f9170c86..fd65481c 100644
--- a/src/pages/mascot/mascot_select_list.vue
+++ b/src/pages/mascot/mascot_select_list.vue
@@ -5,7 +5,7 @@
 			<view class="back-icon"></view>
 		</view>
 		<view class="bg_img">
-			<image src="@/static/images/mascot/bg_1.png" class="img" mode="aspectFit"></image>
+			<image src="@/static/images/mascot/bg_1.png" class="img" mode="widthFix"></image>
 		</view>
 		<view class="fl1"></view>
 		<view class="title_div">
@@ -204,7 +204,7 @@
 		.tip_msg {
 			font-family: PingFangSC;
 			font-weight: 400;
-			font-size: 30rpx;
+			font-size: 4vw;
 			color: #FFFFFF;
 			line-height: 40rpx;
 			text-align: center;
@@ -264,10 +264,13 @@
 			&.right {
 				top: 40%;
 				right: 2%;
+				// width:100rpx;
+				
 			}
 
 			position:absolute;
-			width:100rpx;
+			// width:100rpx;
+			width:13vw;
 			display: flex;
 			align-items: center;
 			flex-direction: column;
@@ -281,8 +284,11 @@
 	.button_div {
 		// width: 50vw;
 		margin-top: 20rpx;
+		margin-bottom: 100rpx;
 		width: 80%;
-		height: 120rpx;
+		// height: 120rpx;
+		height: 16vw;
+		
 		position: relative;
 
 		.img {
@@ -310,7 +316,7 @@
 		display: flex;
 		flex-direction: column;
 		position: relative;
-		max-width: 100vh;
+		// max-width: 100vh;
 		align-items: center;
 		overflow: hidden;
 
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index c07533c9..c8e5a12e 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -144,6 +144,9 @@
 					@click="click_loginout()"
 				></uv-cell>
 			</uv-cell-group>
+		</view>
+		<view style="height: 86rpx;">
+			
 		</view>
 		<tabbar-shadow></tabbar-shadow>
 		<avatar-cropper
@@ -367,6 +370,7 @@
 		.scroll-view-item {
 			display: inline-block;
 			padding: 0 22rpx 0 26rpx;
+			white-space: nowrap;
 		}
 
 		.item {