diff --git a/.env.development b/.env.development
index 5bae6850..9e88b879 100644
--- a/.env.development
+++ b/.env.development
@@ -9,8 +9,8 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786' 
 
 
-# VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 
 app入口
-VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
+# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
diff --git a/src/api/common.js b/src/api/common.js
index 1b48c997..d51d705e 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -56,8 +56,12 @@ export function previewFile(id, responseType = 'arraybuffer') {
 			header,  
 			responseType,
 			success(result) {  
-				console.log(result)
+				//#ifdef APP-PLUS
+				let _header = result.header['Content-Type'].split(';')[0]
+				// #endif
+				//#ifndef APP-PLUS
 				let _header = result.header['content-type'].split(';')[0]
+				// #endif
 				// let base64 = new Blob([result.data],{type:result.header['content-type'].split(';')[0]})
 				let base64 = `data:${_header};base64,` + uni.arrayBufferToBase64(result.data)
 				resolve(base64)
diff --git a/src/api/index.js b/src/api/index.js
index dd40aa06..5f5e6a05 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -12,8 +12,7 @@ export const getStatisticsData = (data) => {
     return request({
         url: '/traapp/traStdyInfo/queryTraStdyStatisticsPerson',
         method: 'post',
-        data,
-        suppressErrors: true
+        data
     });
 };
 
@@ -35,8 +34,7 @@ export const queryCrsInfoByLastnew = (data) => {
     return request({
         url: '/traapp/mycrs/queryCrsInfoByLastnew',
         method: 'post',
-        data,
-        suppressErrors: true
+        data
     });
 };
 
@@ -63,8 +61,7 @@ export const queryCrsInfoByPopular = (data) => {
     return request({
         url: '/traapp/mycrs/queryCrsInfoByPopular',
         method: 'post',
-        data,
-        suppressErrors: true
+        data
     });
 };
 
@@ -86,7 +83,6 @@ export const queryCrsInfoByRecmd = (data) => {
     return request({
         url: '/traapp/mycrs/queryCrsInfoByRecmd',
         method: 'post',
-        data,
-        suppressErrors: true
+        data
     });
 };
\ No newline at end of file
diff --git a/src/api/request.js b/src/api/request.js
index c52d6d87..7b232585 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -32,14 +32,14 @@ export const REQUES_ERROR_CODES = {
 let no_login_show_modal_state = false
 // 去登录方法
 export const goto_login_fun = () => {
-	// if (no_login_show_modal_state) return;
+	if (no_login_show_modal_state) return;
 	no_login_show_modal_state = true
 	common.hideLoading()
 	common.show('未登录', '现在去登录').then(() => {
 		common.navigateTo('/pages/login/login')
 	}).finally(() => {
 		no_login_show_modal_state = false
-	})
+	})	
 }
 
 
@@ -96,7 +96,7 @@ export default function request({
 				return reject(res)
 			},
 			fail(res) {
-				console.log('131231', res, url, base_url);
+				console.log('请求错误', res, url, base_url);
 			}
 		});
 	})
diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index 412a4406..cc1a7fbf 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -43,6 +43,10 @@
 		},
 		methods: {
 			getPreviewUrlBlob(id) {
+				
+				if (id === null) {
+					console.log('谢谢谢谢谢谢', id);
+				}
 				if(this.isCache){
 					previewCacheThumbImage(id, this.width,this.height).then((res) => {
 						this.imgUrlShow = res;
diff --git a/src/pages/courseDetail/components/comment.vue b/src/pages/courseDetail/components/comment.vue
index b2acfea9..635f7cc4 100644
--- a/src/pages/courseDetail/components/comment.vue
+++ b/src/pages/courseDetail/components/comment.vue
@@ -1,78 +1,247 @@
 <template>
 	<view class="comment_div">
-		<view class="message_div" v-for="item in [1,2,3]">
+		<view class="message_div" v-for="(item,index) in message_list">
 			<view class="head_div">
-				<image src="/src/static/images/test/touxiang.png" class="img"></image>
+				<image-preview v-if="item.userIconImgId" class="img-box img"
+					:imgId="item.userIconImgId"></image-preview>
+				<image v-else src="/static/images/me/default_user_avatar.png" class="img"></image>
 			</view>
 			<view class="msg_content">
 				<view class="title_div">
-					<view class="name">黎明正</view>
-					<view class="title_tip">建议</view>
+					<view class="name">{{item.userName}}</view>
+					<view class="title_tip">{{item.bbsTagDesc}}</view>
 				</view>
 				<view class="title">
-					知识点挺清晰的，受益匪浅
+					{{item.bbsContent}}
 				</view>
 				<view class="img_div">
 				</view>
 				<view class="time_and_reply">
-					<view class="time">2025-04-23 14:12</view>
-					<view class="reply">回复</view>
+					<view class="time">{{item.bbsTm.substr(0,16)}}</view>
+					<view class="reply" @click="click_reply(item, item.bbsId, index)">回复</view>
 				</view>
-				<view class="show_close_div">
-					<uv-read-more openText="">展开3条回复</uv-read-more>
-					<!-- <text></text> -->
+				<view class="show_close_div" v-if="item.children?.length" @click="click_show_child_reply(item)">
+					<template v-if="item.show">
+						<view>收起</view>
+						<view class="back_div">
+							<view class="back-icon"></view>
+						</view>
+					</template>
+					<template v-else>
+						<view>展开{{item.children?.length}}条回复</view>
+						<view class="back_div">
+							<view class="back-icon"></view>
+						</view>
+					</template>
 				</view>
+				<view class="children" v-if="item.show">
+					<view class="message_div" v-for="childrenItem in item.children">
+						<view class="head_div">
+							<image-preview v-if="childrenItem.userIconImgId" class="img-box img"
+								:imgId="childrenItem.userIconImgId"></image-preview>
+							<image v-else src="/static/images/me/default_user_avatar.png" class="img"></image>
+						</view>
+						<view class="msg_content">
+							<view class="title_div">
+								<view class="name">{{childrenItem.userName}}</view>
+								<view class="arrow"></view>
+								<view class="name">{{childrenItem.rtnUName}}</view>
+
+							</view>
+							<view class="title">
+								{{childrenItem.bbsContent}}
+							</view>
+							<view class="img_div">
+							</view>
+							<view class="time_and_reply">
+								<view class="time">{{childrenItem.bbsTm.substr(0,16)}}</view>
+								<view class="reply" @click="click_reply(childrenItem, childrenItem.parentId, index)">回复
+								</view>
+							</view>
+
+
+						</view>
+					</view>
+				</view>
+
 			</view>
 		</view>
-		
+		<uni-popup ref="popup" background-color="red">
+
+			<view class="bottom_reply_input_div">
+				<uv-input v-model="reply_data.bbsContent" placeholderStyle='color:#999999;font-size:26rpx'
+					:placeholder="reply_data.placeholder" :focus="true">
+				</uv-input>
+				<view class="" style="display: flex;flex-direction: column; margin:10rpx 20rpx;">
+					<view class="fl1"></view>
+					<uv-button class="bottom_reply_button" type="primary" :throttleTime="500"
+						@click="reply_send">回复</uv-button>
+					<view class="fl1"></view>
+				</view>
+			</view>
+
+		</uni-popup>
 	</view>
 </template>
 
 <script setup>
 	import {
+		ref,
 		reactive,
 		onMounted
 	} from 'vue'
 	import {
-		qryTraCrsBbsDataByCrsNum
+		qryTraCrsBbsDataByCrsNum,
+		replyTraCrsBbsInfo,
+		qryChildTraCrsBbsInfo,
 	} from '@/api/courseDetail.js';
-
-	const message_list = ref([
-		
-	])
-	const props = defineProps({
-		crsNum:String
+	import common from '@/common/common.js'
+	const popup = ref(null)
+	const inputValue = ref('')
+	const placeholder = ref('')
+	const message_list = reactive([])
+	const reply_data_init = {
+		"index": null,
+		"parentBbsId": null,
+		"bbsId": null,
+		"bbsContent": '',
+		"placeholder": '',
+	}
+	const reply_data = reactive({
+		...reply_data_init
 	})
+
+	const props = defineProps({
+		crsNum: String
+	})
+	const click_reply = ({
+		userName,
+		bbsId
+	}, parentBbsId, index) => {
+		popup.value.open('bottom')
+		reply_data.placeholder = '回复 ' + userName + "："
+		reply_data.parentBbsId = parentBbsId
+		reply_data.bbsId = bbsId
+		reply_data.index = index
+	}
+	const reply_send = async () => {
+		try {
+			popup.value.close()
+			common.loading('发送中...')
+			await replyTraCrsBbsInfo({
+				parentBbsId: reply_data.parentBbsId,
+				bbsId: reply_data.bbsId,
+				bbsContent: reply_data.bbsContent,
+				imgIdList: []
+			})
+			common.msg('发送成功')
+			const res = await qryChildTraCrsBbsInfo({
+				bbsId: reply_data.parentBbsId
+			})
+			message_list[reply_data.index]['children'] = res.body
+			Object.assign(reply_data, reply_data_init)
+		} catch (e) {
+			common.msg('发送失败')
+		} finally {
+			common.hideLoading()
+		}
+	}
+	// 点击展开子评论
+	const click_show_child_reply = (item) => {
+		item.show = !item.show
+	}
 	onMounted(() => {
-		qryTraCrsBbsDataByCrsNum({crsNum:props.crsNum}).then(({body}) => {
-			message_list.value = body
+		qryTraCrsBbsDataByCrsNum({
+			crsNum: props.crsNum
+		}).then(({
+			body
+		}) => {
+			Object.assign(message_list, body)
 		})
 	})
 </script>
 
 <style lang="scss" scoped>
-	.message_div:not(:first-child){
+	// 顶部随着输入法弹出的框
+	.bottom_reply_input_div {
+		width: 100%;
+		height: 100%;
+		background-color: #FFFFFF;
+		display: flex;
+		align-items: center;
+		padding: 10rpx 10rpx;
+
+		.bottom_reply_button {
+			border: none;
+			border-radius: 4rpx;
+			background-color: #0066FF;
+			color: #FFFFFF;
+			overflow: hidden;
+
+			:deep(.uv-button) {
+				height: 60rpx;
+			}
+		}
+	}
+
+	.back_div {
+
+		margin-left: 6rpx;
+
+		.back-icon {
+			position: relative;
+			width: 30rpx;
+			height: 30rpx;
+			cursor: pointer;
+		}
+
+		.back-icon::before,
+		.back-icon::after {
+			content: '';
+			position: absolute;
+			transition: all 0.3s ease;
+		}
+
+		.back-icon::after {
+			top: 2%;
+			left: 25%;
+			width: 50%;
+			height: 50%;
+			border-top: 3rpx solid #0066FF;
+			border-left: 3rpx solid #0066FF;
+			transform: rotate(-135deg);
+		}
+	}
+
+
+
+	.message_div:not(:first-child) {
 		margin-top: 30rpx;
 	}
+
 	.message_div {
 		// margin-top: 30rpx;
 		display: flex;
-		.head_div{
-			.img{
+
+		.head_div {
+			.img {
 				border-radius: 100%;
 				width: 78rpx;
 				height: 78rpx;
 				overflow: hidden;
 			}
 		}
-		.msg_content{
-			margin-left: 8rpx;
+
+		.msg_content {
+			margin-left: 22rpx;
 			flex: 1;
 			overflow: hidden;
-			.title_div{
+
+			.title_div {
 				display: flex;
 				align-items: center;
-				.name{
+
+				.name {
 					height: 35rpx;
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
@@ -82,22 +251,42 @@
 					text-align: left;
 					font-style: normal;
 				}
-				.title_tip{
+
+				.title_tip {
 					margin-left: 16rpx;
 					width: 76rpx;
 					height: 34rpx;
 					background: #FFFFFF;
 					border-radius: 8rpx;
 					border: 2rpx solid #999999;
-					font-family: PingFangTC, PingFangTC;
+					font-family: PingFangSC;
 					font-weight: 400;
 					font-size: 23rpx;
 					color: #666666;
 					line-height: 36rpx;
 					text-align: center;
 				}
+
+				.arrow {
+					margin: 0 12rpx 0 14rpx;
+					position: relative;
+					width: 12rpx;
+					height: 20rpx;
+					overflow: hidden;
+				}
+
+				.arrow::after {
+					content: "";
+					position: absolute;
+					background-color: #666666;
+					right: 4rpx;
+					width: 18rpx;
+					height: 12rpx;
+					transform: rotate(45deg);
+				}
 			}
-			.title{
+
+			.title {
 				margin: 4rpx 0;
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
@@ -105,53 +294,58 @@
 				color: #333333;
 				text-align: left;
 				line-height: 48rpx;
-				
-				
 				text-overflow: ellipsis;
 				white-space: wrap;
 				overflow-wrap: anywhere;
-				
+
 			}
-			.time_and_reply{
+
+			.time_and_reply {
 				display: flex;
 				align-items: center;
 				height: 28rpx;
-				.time{
+
+				.time {
 					font-family: ArialMT;
-					font-size: 23rpx;
+					font-size: 24rpx;
 					color: #666666;
 					line-height: 27rpx;
 					text-align: left;
 					font-style: normal;
 				}
-				.reply{
+
+				.reply {
 					margin-left: 16rpx;
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
-					font-size: 23rpx;
+					font-size: 24rpx;
 					color: #0066FF;
 					line-height: 33rpx;
 					text-align: left;
 					font-style: normal;
 				}
 			}
-			.show_close_div{
+
+			.show_close_div {
 				margin-top: 12rpx;
+				margin-bottom: 20rpx;
 				font-family: PingFangSC, PingFang SC;
 				font-weight: 400;
-				font-size: 23rpx;
+				font-size: 30rpx;
 				color: #456A8E;
-				line-height: 33rpx;
+				line-height: 30rpx;
 				text-align: left;
 				font-style: normal;
+				display: flex;
+				align-items: center;
 			}
 		}
 	}
 
 	.comment_div {
-		padding:44rpx 40rpx;
+		padding: 44rpx 40rpx;
 		background-color: #ffffff;
 		border-radius: 24rpx;
-		
+
 	}
 </style>
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index b6e53707..28393905 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -280,17 +280,67 @@
 	const hot_class_list = ref([...init_class_data])
 	const new_class_list = ref([...init_class_data])
 	const recommend_class_list = ref([...init_class_data])
-
-
+	
+	// const statistics_data = reactive({
+	// 	'stdtTmLen': 0, // 学习
+	// 	'accmPracticeCnt': 0, // 训练
+	// 	'accmExamCnt': 0, //考试
+	// 	'start_tudy': 0, // 起始学习
+	// 	'start_train': 0, // 起始训练
+	// 	'start_exam': 0, //起始考试
+	// 	'request_time': 0, //上次请求时间
+	// })
+	
 	const statistics_data = reactive({
 		'stdtTmLen': 0, // 学习
 		'accmPracticeCnt': 0, // 训练
-		'accmExamCnt': 0, //考试
-		'start_tudy': 0, // 起始学习
-		'start_train': 0, // 起始训练
-		'start_exam': 0, //起始考试
-		'request_time': 0, //上次请求时间
-	})
+		'accmExamCnt': 0, // 考试
+		'startStdtTmLen': 0, // 起始学习
+		'startAccmPracticeCnt': 0, // 起始训练
+		'startAccmExamCnt': 0, // 起始考试
+		'request_time': 0, // 上次请求时间
+		"init": function() { // 初始化统计数据
+			// const index_statistics_data = common.getValue('index_statistics_data') // 获取缓存
+			// if (index_statistics_data) {
+			// 	this.stdtTmLen = index_statistics_data.study;
+			// 	this.start_train = index_statistics_data.train;
+			// 	this.start_exam = index_statistics_data.exam;
+			// }
+		},
+		"get_statistics_data": async function() {
+			try {
+				const time_now = Date.now();
+				if (time_now - this.request_time > 300 * 1000) {
+					this.request_time = time_now;
+					// 获取最新数据
+					const res = await queryTraStdyStatisticsSelf();
+					const accmPoint = res.body.accmPoint
+					const accmTaskCnt = res.body.accmTaskCnt
+					const stdtTmLen = res.body.stdtTmLen
+					if (accmPoint != this.accmPoint) { // 不相等就执行
+						this.startAccmPoint = this.accmPoint
+						this.accmPoint = accmPoint
+						accmPointRef.value.start()
+					}
+					if (accmTaskCnt != this.accmTaskCnt) { // 不相等就执行
+						this.startAccmTaskCnt = this.accmTaskCnt
+						this.accmTaskCnt = accmTaskCnt
+						accmTaskCntRef.value.start()
+					}
+					if (stdtTmLen != this.stdtTmLen) { // 不相等就执行
+						this.startStdtTmLen = this.stdtTmLen
+						this.stdtTmLen = stdtTmLen
+						stdtTmLenRef.value.start()
+					}
+					console.log('统计数据已更新');
+				} else {
+					console.log('时间没到无需更新');
+				}
+			} catch (error) {
+				console.error('获取统计数据失败:', error);
+			}
+		}
+	});
 
 
 	// 获取首页统计数据方法
@@ -305,7 +355,6 @@
 		// 	statistics_data['request_time'] = time_now
 		// 	const data = await getStatisticsData()
 
-		// 	console.log(data);
 		// }
 	}
 
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 7556fde2..410c5240 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -8,8 +8,7 @@
 				<!-- 用户个人信息 -->
 				<view class="personal_information">
 					<view class="profile">
-						<image v-if="user_info.imageAddr" class="img_100" src="/static/images/test/touxiang.png">
-						</image>
+						<image v-if="user_info.imageAddr" class="img_100" src="/static/images/test/touxiang.png"></image>
 						<image v-else class="img_100" src="/static/images/me/default_user_avatar.png"></image>
 					</view>
 					<view class="personal_information_data">
@@ -36,19 +35,22 @@
 					<view class="item">
 						<view class="top">累计学习时长</view>
 						<view class="bottom">
-							<uv-count-to :startVal="statistics_data['accmPoint']" :endVal="statistics_data['accmPoint']" :useEasing="true" :decimals="1"></uv-count-to>h
+							<uv-count-to :startVal="statistics_data['startAccmPoint']" :endVal="statistics_data['accmPoint']"
+								:useEasing="true" :decimals="1" ref="accmPointRef"></uv-count-to>h
 						</view>
 					</view>
 					<view class="item">
 						<view class="top">累计完成任务</view>
 						<view class="bottom">
-							<uv-count-to :startVal="statistics_data['accmTaskCnt']" :endVal="statistics_data['accmTaskCnt']" :useEasing="true"></uv-count-to>
+							<uv-count-to :startVal="statistics_data['startAccmTaskCnt']"
+								:endVal="statistics_data['accmTaskCnt']" :useEasing="true" ref="accmTaskCntRef"></uv-count-to>
 						</view>
 					</view>
 					<view class="item">
 						<view class="top">累计获得积分</view>
 						<view class="bottom">
-							<uv-count-to :startVal="statistics_data['stdtTmLen']" :endVal="statistics_data['stdtTmLen']" :useEasing="true"></uv-count-to>
+							<uv-count-to :startVal="statistics_data['startStdtTmLen']" :endVal="statistics_data['stdtTmLen']"
+								:useEasing="true" ref="stdtTmLenRef"></uv-count-to>
 						</view>
 					</view>
 				</view>
@@ -117,64 +119,56 @@
 	import {
 		queryTraStdyStatisticsSelf
 	} from '@/api/user.js'
+	const accmTaskCntRef = ref(null)
+	const accmPointRef = ref(null)
+	const stdtTmLenRef = ref(null)
 	const statistics_data = reactive({
-		'stdtTmLen': 2, // 学习
-		'study': 0, // 学习
-		'train': 0, // 训练
-		'exam': 0, // 考试
-		'start_study': 0, // 起始学习
-		'start_train': 0, // 起始训练
-		'start_exam': 0, // 起始考试
+		'stdtTmLen': 0, // 累计学习时长
+		'accmTaskCnt': 0, // 累计完成任务
+		'accmPoint': 0, // 累计获得积分
+		'startStdtTmLen': 0, // 起始累计学习时长
+		'startAccmTaskCnt': 0, // 起始累计完成任务
+		'startAccmPoint': 0, // 起始累计获得积分
 		'request_time': 0, // 上次请求时间
-		
-		/**
-		 * 初始化统计数据
-		 */
-		"init": function() {
-			// 初始化起始数据
-			this.start_study = this.study;
-			this.start_train = this.train;
-			this.start_exam = this.exam;
-			
+		"init": function() { // 初始化统计数据
+			const me_statistics_data = common.getValue('me_statistics_data') // 获取缓存
+			if (me_statistics_data) {
+				this.stdtTmLen = me_statistics_data.study;
+				this.start_train = me_statistics_data.train;
+				this.start_exam = me_statistics_data.exam;
+			}
 		},
-		
-		/**
-		 * 获取统计数据（带缓存机制）
-		 * @returns {Promise<void>}
-		 */
 		"get_statistics_data": async function() {
 			try {
 				const time_now = Date.now();
-				// 检查缓存是否过期（10分钟）
-				if (time_now - this.request_time > 600 * 1000) {
+				if (time_now - this.request_time > 300 * 1000) {
 					this.request_time = time_now;
-
 					// 获取最新数据
-					const {
-						study,
-						train,
-						exam
-					} = await getStatisticsData();
-
-					// 保存起始值（如果是首次获取）
-					if (this.request_time === 0) {
-						this.start_study = study;
-						this.start_train = train;
-						this.start_exam = exam;
+					const res = await queryTraStdyStatisticsSelf();
+					const accmPoint = res.body.accmPoint
+					const accmTaskCnt = res.body.accmTaskCnt
+					const stdtTmLen = res.body.stdtTmLen
+					if (accmPoint != this.accmPoint) { // 不相等就执行
+						this.startAccmPoint = this.accmPoint
+						this.accmPoint = accmPoint
+						accmPointRef.value.start()
+					}
+					if (accmTaskCnt != this.accmTaskCnt) { // 不相等就执行
+						this.startAccmTaskCnt = this.accmTaskCnt
+						this.accmTaskCnt = accmTaskCnt
+						accmTaskCntRef.value.start()
+					}
+					if (stdtTmLen != this.stdtTmLen) { // 不相等就执行
+						this.startStdtTmLen = this.stdtTmLen
+						this.stdtTmLen = stdtTmLen
+						stdtTmLenRef.value.start()
 					}
-
-					// 更新当前值
-					this.study = study;
-					this.train = train; // 修正：之前漏写这一行
-					this.exam = exam;
-
 					console.log('统计数据已更新');
 				} else {
-					console.log('使用缓存的统计数据');
+					console.log('时间没到无需更新');
 				}
 			} catch (error) {
 				console.error('获取统计数据失败:', error);
-				// 可以在这里添加重试逻辑或使用默认值
 			}
 		}
 	});
@@ -183,19 +177,13 @@
 		userName: '',
 		userId: ''
 	});
-	
+
 
 
 	onShow(() => {
 		const user_info_cache = getUserInfo()
 		Object.assign(user_info, user_info_cache)
-		queryTraStdyStatisticsSelf().then(({body}) => {
-			statistics_data['accmPoint'] = body['accmPoint']
-			statistics_data['accmTaskCnt'] = body['accmTaskCnt']
-			statistics_data['stdtTmLen'] = body['stdtTmLen']
-			console.log('res', body);
-		})
-		// statistics_data['get_statistics_data']() // 获取首页统计数据
+		statistics_data['get_statistics_data']() // 获取首页统计数据
 	})
 
 	const click_loginout = () => {
@@ -310,9 +298,9 @@
 			box-shadow: #F6F8FF 0 0 2rpx;
 
 			.personal_information {
-				padding: 20rpx 0 0 26rpx;
+				padding: 20rpx 18rpx 0 26rpx;
 				display: flex;
-
+				
 				// 个人头像框框
 				.profile {
 					border-radius: 100%;
@@ -324,15 +312,16 @@
 
 				// 头像右边的信息
 				.personal_information_data {
+					flex: 1;
 					display: flex;
 					flex-direction: column;
 					margin-left: 26rpx;
+					overflow: hidden;
 
 					// 上边的姓名性别盒子
 					.name_sex_div {
 						display: flex;
 						margin-top: 6rpx;
-
 						.name {
 							font-family: PingFangSC;
 							font-weight: 600;
@@ -356,6 +345,9 @@
 						line-height: 38rpx;
 						text-align: left;
 						font-style: normal;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						
 					}
 				}
 			}
diff --git a/src/pages/study/index.vue b/src/pages/study/index.vue
index dee92763..a0f74130 100644
--- a/src/pages/study/index.vue
+++ b/src/pages/study/index.vue
@@ -9,41 +9,7 @@
 	</view>
 </template>
 <script setup>
-	import WebSocketUtil from '@/api/socket.js';
-
-	const ws = new WebSocketUtil('ws://127.0.0.1', {
-		maxReconnectCount: 10,
-		reconnectInterval: 5000,
-		heartbeatInterval: 30000,
-		heartbeatMsg: 'ping'
-	});
-
-	ws.on('open', () => {
-		console.log('WebSocket连接已打开');
-		ws.send({
-			type: 'init',
-			data: {
-				userId: 123
-			}
-		});
-	});
-
-	ws.on('message', (res) => {
-		console.log('收到消息:', res);
-	});
-
-	ws.on('close', (res) => {
-		console.log('WebSocket连接已关闭:', res);
-	});
-
-	ws.on('error', (err) => {
-		console.error('WebSocket错误:', err);
-	});
-
-	// 一段时间后关闭连接
-	setTimeout(() => {
-		ws.close(1000, '正常关闭');
-	}, 60000);
+	
 </script>
 <style scoped lang="scss">
 	.main_div {
diff --git a/src/static/images/courseDetail/mipmap-xhdpi/bg.png b/src/static/images/courseDetail/mipmap-xhdpi/bg.png
index 004f0007..835a7323 100644
Binary files a/src/static/images/courseDetail/mipmap-xhdpi/bg.png and b/src/static/images/courseDetail/mipmap-xhdpi/bg.png differ
diff --git a/src/static/images/courseDetail/课程详情-介绍_slices.zip b/src/static/images/courseDetail/课程详情-介绍_slices.zip
deleted file mode 100644
index a9030479..00000000
Binary files a/src/static/images/courseDetail/课程详情-介绍_slices.zip and /dev/null differ
diff --git a/src/uni_modules/uni-popup/changelog.md b/src/uni_modules/uni-popup/changelog.md
new file mode 100644
index 00000000..f28b9286
--- /dev/null
+++ b/src/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,97 @@
+## 1.9.9（2025-06-11）
+- 修复 uni-popup-dialog 中 setVal 方法报错的问题
+- 修复 uni-popup-dialog 数据双向绑定问题。
+## 1.9.8（2025-04-16）
+- 修复 更新组件示例 ，解决更新数据或保存项目导致弹窗消失的问题
+## 1.9.7（2025-04-14）
+- 修复 uni-popup-dialog 弹出框在vue3中双向绑定问题
+## 1.9.6（2025-01-08）
+- 修复 示例中过期图片地址
+## 1.9.5（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 1.9.2（2024-09-21）
+- 修复 uni-popup在android上的重复点击弹出位置不正确的bug
+## 1.9.1（2024-04-02）
+- 修复 uni-popup-dialog vue3下使用value无法进行绑定的bug(双向绑定兼容旧写法)
+## 1.9.0（2024-03-28）
+- 修复 uni-popup-dialog 双向绑定时初始化逻辑修正
+## 1.8.9（2024-03-20）
+- 修复 uni-popup-dialog 数据输入时修正为双向绑定
+## 1.8.8（2024-02-20）
+- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
+## 1.8.7（2024-02-02）
+- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦
+## 1.8.6（2024-01-30）
+- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数
+## 1.8.5（2024-01-26）
+- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示
+## 1.8.4（2023-11-15）
+- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
+## 1.8.3（2023-04-17）
+- 修复 uni-popup 重复打开时的 bug
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
diff --git a/src/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/src/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 00000000..6ef26a26
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 00000000..12ce2c92
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,327 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" :maxlength="maxlength" v-model="val" :type="inputType"
+					:placeholder="placeholderText" :focus="focus">
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button" :class="showClose?'uni-border-left':''" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {Boolean} focus input模式下是否自动聚焦，默认为true
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @showClose {Boolean} 是否显示关闭按钮
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @property {Number} maxlength 输入
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits: ['confirm', 'close', 'update:modelValue', 'input'],
+		props: {
+			inputType: {
+				type: String,
+				default: 'text'
+			},
+			showClose: {
+				type: Boolean,
+				default: true
+			},
+			// #ifdef VUE2
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				type: [Number, String],
+				default: ''
+			},
+			// #endif
+
+
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText: {
+				type: String,
+				default: ''
+			},
+			confirmText: {
+				type: String,
+				default: ''
+			},
+			maxlength: {
+				type: Number,
+				default: -1,
+			},
+			focus: {
+				type: Boolean,
+				default: true,
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				this.setVal(val)
+			},
+			// #ifdef VUE3
+			modelValue(val) {
+				this.setVal(val)
+			},
+			// #endif
+			val(val) {
+				// #ifdef VUE2
+				// TODO 兼容 vue2
+				this.$emit('input', val);
+				// #endif
+				// #ifdef VUE3
+				// TODO　兼容　vue3
+				this.$emit('update:modelValue', val);
+				// #endif
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value;
+				// #ifdef VUE3
+				this.val = this.modelValue;
+				// #endif
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		methods: {
+			/**
+			 * 给val属性赋值
+			 */
+			setVal(val) {
+				if (this.maxlength != -1 && this.mode === 'input') {
+					this.val = val.slice(0, this.maxlength);
+				} else {
+					this.val = val
+				}
+			},
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input') {
+					this.$emit('confirm', this.val)
+				} else {
+					this.$emit('confirm')
+				}
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			close() {
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
diff --git a/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 00000000..91370a82
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
diff --git a/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 00000000..c8945d57
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				// TODO 替换为自己的图标
+				bottomData: [{
+						text: '微信',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'ali'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/unicloudlogo.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
diff --git a/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 00000000..7f1bd06a
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
diff --git a/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 00000000..de7509c8
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 00000000..5e3003ca
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
diff --git a/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 00000000..13e39eba
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
diff --git a/src/uni_modules/uni-popup/components/uni-popup/keypress.js b/src/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 00000000..62dda461
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/src/uni_modules/uni-popup/components/uni-popup/popup.js b/src/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 00000000..c4e5781d
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
diff --git a/src/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/src/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
new file mode 100644
index 00000000..5eb8d5be
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -0,0 +1,90 @@
+<template>
+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
+    <view @click.stop>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  type CloseCallBack = ()=> void;
+  let closeCallBack:CloseCallBack = () :void => {};
+  export default {
+    emits:["close","clickMask"],
+    data() {
+      return {
+        isShow:false,
+        isOpen:false
+      }
+    },
+    props: {
+      maskClick: {
+        type: Boolean,
+        default: true
+      },
+    },
+    watch: {
+      // 设置show = true 时，如果没有 open 需要设置为 open
+      isShow:{
+        handler(isShow) {
+          // console.log("isShow",isShow)
+          if(isShow && this.isOpen == false){
+            this.isOpen = true
+          }
+        },
+        immediate:true
+      },
+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
+      isOpen:{
+        handler(isOpen) {
+          // console.log("isOpen",isOpen)
+          if(isOpen && this.isShow == false){
+            this.isShow = true
+          }
+        },
+        immediate:true
+      }
+    },
+    methods:{
+      open(){
+        // ...funs : CloseCallBack[]
+        // if(funs.length > 0){
+        //   closeCallBack = funs[0]
+        // }
+        this.isOpen = true;
+      },
+      clickMask(){
+        if(this.maskClick == true){
+          this.$emit('clickMask')
+          this.close()
+        }
+      },
+      close(): void{
+        this.isOpen = false;
+        this.$emit('close')
+        closeCallBack()
+      },
+      hiden(){
+        this.isShow = false
+      },
+      show(){
+        this.isShow = true
+      }
+    }
+  }
+</script>
+
+<style>
+.popup-root {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: 100%;
+  flex: 1;
+  background-color: rgba(0, 0, 0, 0.3);
+  justify-content: center;
+  align-items: center;
+  z-index: 99;
+}
+</style>
\ No newline at end of file
diff --git a/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 00000000..5af55e01
--- /dev/null
+++ b/src/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,518 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {String}  borderRadius 设置圆角(左上、右上、右下和左下) 示例:"10px 10px 10px 10px"
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+			borderRadius:{
+				type: String,
+			}
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					backgroundColor: 'transparent',
+					borderRadius: this.borderRadius || "0",
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: 'top'
+			}
+		},
+		computed: {
+			getStyles() {
+				let res = { backgroundColor: this.bg };
+				if (this.borderRadius || "0") {
+					res = Object.assign(res, { borderRadius: this.borderRadius })
+				}
+				return res;
+			},
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				// #ifdef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getWindowInfo()
+				// #endif
+				// #ifndef MP-WEIXIN
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				// #endif
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		activated() {
+   	  this.setH5Visible(!this.showPopup);
+    },
+    deactivated() {
+      this.setH5Visible(true);
+    },
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible(visible = true) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					return
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					this.showPoptrans()
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
+				// #ifdef MP-WEIXIN
+					this.ani = ['fade']
+				// #endif
+				// #ifndef MP-WEIXIN
+					this.ani = ['zoom-out', 'fade']
+				// #endif
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center',
+					borderRadius:this.borderRadius || "0"
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPoptrans()
+			},
+			showPoptrans(){
+				this.$nextTick(()=>{
+					this.showPopup = true
+					this.showTrans = true
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/src/uni_modules/uni-popup/package.json b/src/uni_modules/uni-popup/package.json
new file mode 100644
index 00000000..7be6c669
--- /dev/null
+++ b/src/uni_modules/uni-popup/package.json
@@ -0,0 +1,107 @@
+{
+  "id": "uni-popup",
+  "displayName": "uni-popup 弹出层",
+  "version": "1.9.9",
+  "description": " Popup 组件，提供常用的弹层",
+  "keywords": [
+    "uni-ui",
+    "弹出层",
+    "弹窗",
+    "popup",
+    "弹框"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "",
+    "uni-app": "^4.01",
+    "uni-app-x": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss",
+      "uni-transition"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "√",
+            "android": "√",
+            "ios": "√",
+            "harmony": "x"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "√",
+            "kuaishou": "√",
+            "jd": "√",
+            "harmony": "√",
+            "qq": "√",
+            "lark": "√"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/uni_modules/uni-popup/readme.md b/src/uni_modules/uni-popup/readme.md
new file mode 100644
index 00000000..fdad4b3d
--- /dev/null
+++ b/src/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/src/uni_modules/uni-transition/changelog.md b/src/uni_modules/uni-transition/changelog.md
new file mode 100644
index 00000000..1e500ab8
--- /dev/null
+++ b/src/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,29 @@
+## 1.3.5（2025-06-11）
+- 修复 第一次执行不显示动画的问题
+## 1.3.4（2025-04-16）
+- 修复 页面数据更新到底动画复原的问题
+- 修复 示例页面打开报错的问题
+## 1.3.3（2024-04-23）
+- 修复 当元素会受变量影响自动隐藏的bug
+## 1.3.2（2023-05-04）
+- 修复 NVUE 平台报错的问题
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 00000000..8f89b185
--- /dev/null
+++ b/src/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,131 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+		this.animation = uni.createAnimation({
+			...options
+		})
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
diff --git a/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 00000000..cce8538f
--- /dev/null
+++ b/src/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,286 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	import { createAnimation } from './createAnimation'
+
+	/**
+	 * Transition 过渡动画
+	 * @description 简单过渡动画组件
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+	 * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+	 * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+	 *  @value fade 渐隐渐出过渡
+	 *  @value slide-top 由上至下过渡
+	 *  @value slide-right 由右至左过渡
+	 *  @value slide-bottom 由下至上过渡
+	 *  @value slide-left 由左至右过渡
+	 *  @value zoom-in 由小到大过渡
+	 *  @value zoom-out 由大到小过渡
+	 * @property {Number} duration 过渡动画持续时间
+	 * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+	 */
+	export default {
+		name: 'uniTransition',
+		emits: ['click', 'change'],
+		props: {
+			show: {
+				type: Boolean,
+				default: false
+			},
+			modeClass: {
+				type: [Array, String],
+				default () {
+					return 'fade'
+				}
+			},
+			duration: {
+				type: Number,
+				default: 300
+			},
+			styles: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			customClass: {
+				type: String,
+				default: ''
+			},
+			onceRender: {
+				type: Boolean,
+				default: false
+			},
+		},
+		data() {
+			return {
+				isShow: false,
+				transform: '',
+				opacity: 0,
+				animationData: {},
+				durationTime: 300,
+				config: {}
+			}
+		},
+		watch: {
+			show: {
+				handler(newVal) {
+					if (newVal) {
+						this.open()
+					} else {
+						// 避免上来就执行 close,导致动画错乱
+						if (this.isShow) {
+							this.close()
+						}
+					}
+				},
+				immediate: true
+			}
+		},
+		computed: {
+			// 生成样式数据
+			stylesObject() {
+				let styles = {
+					...this.styles,
+					'transition-duration': this.duration / 1000 + 's'
+				}
+				let transform = ''
+				for (let i in styles) {
+					let line = this.toLine(i)
+					transform += line + ':' + styles[i] + ';'
+				}
+				return transform
+			},
+			// 初始化动画条件
+			transformStyles() {
+				return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+			}
+		},
+		created() {
+			// 动画默认配置
+			this.config = {
+				duration: this.duration,
+				timingFunction: 'ease',
+				transformOrigin: '50% 50%',
+				delay: 0
+			}
+			this.durationTime = this.duration
+		},
+		methods: {
+			/**
+			 *  ref 触发 初始化动画
+			 */
+			init(obj = {}) {
+				if (obj.duration) {
+					this.durationTime = obj.duration
+				}
+				this.animation = createAnimation(Object.assign(this.config, obj), this)
+			},
+			/**
+			 * 点击组件触发回调
+			 */
+			onClick() {
+				this.$emit('click', {
+					detail: this.isShow
+				})
+			},
+			/**
+			 * ref 触发 动画分组
+			 * @param {Object} obj
+			 */
+			step(obj, config = {}) {
+				if (!this.animation) return this
+				Object.keys(obj).forEach(key => {
+					const value = obj[key]
+					if (typeof this.animation[key] === 'function') {
+						Array.isArray(value) ?
+							this.animation[key](...value) :
+							this.animation[key](value)
+					}
+				})
+				this.animation.step(config)
+				return this
+			},
+			/**
+			 *  ref 触发 执行动画
+			 */
+			run(fn) {
+				if (!this.animation) return
+				this.animation.run(fn)
+			},
+			// 开始过度动画
+			open() {
+				clearTimeout(this.timer)
+				this.isShow = true
+				// 新增初始状态重置逻辑（关键）
+				this.transform = this.styleInit(false).transform || ''
+				this.opacity = this.styleInit(false).opacity || 0
+
+				// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+				this.$nextTick(() => {
+					// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+					this.timer = setTimeout(() => {
+						this.animation = createAnimation(this.config, this)
+						this.tranfromInit(false).step()
+						this.animation.run(() => {
+							this.transform = ''
+							this.opacity = this.styleInit(false).opacity || 1
+							this.$emit('change', {
+								detail: this.isShow
+							})
+						})
+					}, 80)
+				})
+			},
+			// 关闭过度动画
+			close(type) {
+				if (!this.animation) return
+				this.tranfromInit(true)
+					.step()
+					.run(() => {
+						this.isShow = false
+						this.animationData = null
+						this.animation = null
+						let { opacity, transform } = this.styleInit(false)
+						this.opacity = opacity || 1
+						this.transform = transform
+						this.$emit('change', {
+							detail: this.isShow
+						})
+					})
+			},
+			// 处理动画开始前的默认样式
+			styleInit(type) {
+				let styles = { transform: '', opacity: 1 }
+				const buildStyle = (type, mode) => {
+					const value = this.animationType(type)[mode] // 直接使用 type 控制状态
+					if (mode.startsWith('fade')) {
+						styles.opacity = value
+					} else {
+						styles.transform += value + ' '
+					}
+				}
+
+				if (typeof this.modeClass === 'string') {
+					buildStyle(type, this.modeClass)
+				} else {
+					this.modeClass.forEach(mode => buildStyle(type, mode))
+				}
+				return styles
+			},
+			// 处理内置组合动画
+			tranfromInit(type) {
+				let buildTranfrom = (type, mode) => {
+					let aniNum = null
+					if (mode === 'fade') {
+						aniNum = type ? 0 : 1
+					} else {
+						aniNum = type ? '-100%' : '0'
+						if (mode === 'zoom-in') {
+							aniNum = type ? 0.8 : 1
+						}
+						if (mode === 'zoom-out') {
+							aniNum = type ? 1.2 : 1
+						}
+						if (mode === 'slide-right') {
+							aniNum = type ? '100%' : '0'
+						}
+						if (mode === 'slide-bottom') {
+							aniNum = type ? '100%' : '0'
+						}
+					}
+					this.animation[this.animationMode()[mode]](aniNum)
+				}
+				if (typeof this.modeClass === 'string') {
+					buildTranfrom(type, this.modeClass)
+				} else {
+					this.modeClass.forEach(mode => {
+						buildTranfrom(type, mode)
+					})
+				}
+
+				return this.animation
+			},
+			animationType(type) {
+				return {
+					fade: type ? 1 : 0,
+					'slide-top': `translateY(${type ? '0' : '-100%'})`,
+					'slide-right': `translateX(${type ? '0' : '100%'})`,
+					'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+					'slide-left': `translateX(${type ? '0' : '-100%'})`,
+					'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+					'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+				}
+			},
+			// 内置动画类型与实际动画对应字典
+			animationMode() {
+				return {
+					fade: 'opacity',
+					'slide-top': 'translateY',
+					'slide-right': 'translateX',
+					'slide-bottom': 'translateY',
+					'slide-left': 'translateX',
+					'zoom-in': 'scale',
+					'zoom-out': 'scale'
+				}
+			},
+			// 驼峰转中横线
+			toLine(name) {
+				return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+			}
+		}
+	}
+</script>
+
+<style></style>
diff --git a/src/uni_modules/uni-transition/package.json b/src/uni_modules/uni-transition/package.json
new file mode 100644
index 00000000..9432c501
--- /dev/null
+++ b/src/uni_modules/uni-transition/package.json
@@ -0,0 +1,114 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.5",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "",
+    "uni-app": "^4.01",
+    "uni-app-x": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "√",
+            "android": "√",
+            "ios": "√",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": {
+            },
+            "alipay": {
+            },
+            "toutiao": {
+            },
+            "baidu": {
+            },
+            "kuaishou": {
+                "extVersion": "1.1.0",
+                "minVersion": ""
+            },
+            "jd": {
+            },
+            "harmony": "x",
+            "qq": "-",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "-",
+            "union": "-"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/uni_modules/uni-transition/readme.md b/src/uni_modules/uni-transition/readme.md
new file mode 100644
index 00000000..2f8a77e1
--- /dev/null
+++ b/src/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file