diff --git a/components/preBookList.vue b/components/preBookList.vue
index a3cd926..528283f 100644
--- a/components/preBookList.vue
+++ b/components/preBookList.vue
@@ -45,7 +45,7 @@ export default {
   },
   methods: {
 	  toBookDetail(item){
-		  this.$func.toPage('/pages/book_detail/book_detail?id='+item.id+'&depart_id='+item.depart_id)
+		  this.$func.toPage('/pages/visit_detail/visit_detail?id='+item.id+'&depart_id='+item.depart_id)
 	  },
 	  getDayOfWeek(dateString) {
 	  	var str = new Date(dateString);
diff --git a/components/userCard.vue b/components/userCard.vue
new file mode 100644
index 0000000..c161204
--- /dev/null
+++ b/components/userCard.vue
@@ -0,0 +1,223 @@
+<template>
+  <view :class="'user-card-com'+(!showuinfo?' popup-user-card':'')">
+		<uni-card :title="dataitem.name" extra="身份证：9098******8778" margin="0 10rpx 20rpx 10rpx" shadow="none" :border="false" padding="24rpx 0 0 0">
+			<view>
+				<uni-data-checkbox mode="button" v-model="type" :localdata="types" @change="changeType"></uni-data-checkbox>
+			</view>
+
+			<view class="bed-wrapper" v-show="type == 1">
+				<uni-easyinput v-model="value" placeholder="请输入床位位置" placeholderStyle="color: #999999;font-size: 30rpx;" :trim="true"></uni-easyinput>
+			</view> 
+
+			<view class="card-cus-txt" v-if="type == 0">
+				首次就诊，建议等待医生叫号
+			</view>
+
+			<view class="card-cus-txt" v-else>
+				没有找到床位，可不填写位置
+			</view>
+
+		</uni-card>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "visitorList",
+  props: {
+		add:{
+			type:Boolean,
+			default:()=>false
+		},
+		showuinfo:{
+			type:Boolean,
+			default:()=>true
+		},
+		dataitem:{
+			type:Object,
+			default:()=>{}
+		},
+		index:{
+			type:Number,
+			default:()=>-1
+		},
+  },
+  data() {
+    return {
+			cssUrl:this.cssUrl,
+			value:'',
+			type: 0,
+			types: [{
+				text: '等医生叫号',
+				value: 0
+			}, {
+				text: '找床位候诊',
+				value: 1
+			}],
+    }
+  },
+  methods: {
+		confirm() {
+		},
+		changeType(e) {
+			var obj = new Object()
+			obj.key = this.index
+			obj.type = this.type
+			this.$emit('clickEvent', obj)
+		},
+		setType(typeval) {
+			this.value = typeval
+		}
+  }
+};
+
+</script>
+
+<style lang="scss" scoped>
+	.user-card-com{
+		width: 100%;
+		height: auto;
+		overflow: hidden;
+
+		&.popup-user-card{
+			/deep/ {
+				.uni-card__header{
+					display: none !important;
+				}
+				.uni-card{
+					padding: 0 32rpx 0rpx 32rpx !important;
+					margin-bottom: 0rpx !important;
+				}
+				.uni-card__content{
+					padding: 0 !important;
+				}
+				.checklist-group{
+					margin-bottom: 46rpx !important;
+				}
+				.card-cus-txt{
+					margin-bottom: 42rpx;
+				}
+				.uni-easyinput{
+					margin-bottom: 46rpx;
+				}
+			}
+		}
+
+		/deep/ {
+				.uni-easyinput{
+					margin-bottom: 24rpx;
+					.uni-easyinput__content-input{
+						padding-left: 24rpx !important;
+						color: #333333;
+						font-size: 30rpx;
+						line-height: 30rpx;
+						letter-spacing: 0.22rpx;
+						height: 86rpx;
+						line-height: 86rpx;
+						display: flex;
+						align-items: center;
+						position: relative;
+						top: -2rpx;
+					}
+					.is-input-border{
+						border: 2rpx solid #DCDCDC !important;
+					}
+					.is-input-border.is-focused{
+						border-color: #39D067 !important;
+						.uni-icons.content-clear-icon.uniui-clear{
+							color: #39D067 !important;
+						}
+					}
+				}
+				.uni-card{
+					border-radius: 0;
+					padding: 32rpx !important;
+					.uni-data-checklist .checklist-group {
+						column-gap: 24rpx;
+						margin-bottom: 24rpx;
+						.checklist-box{
+							margin: 0;
+							width: calc(50% - 14rpx);
+							box-sizing: border-box;
+							.checklist-content .checklist-text{
+								font-size: 30rpx;
+								font-weight: normal;
+								letter-spacing: 0.22rpx;
+								margin-left: 12rpx;
+								color: #666666;
+							}
+							
+							.radio__inner{
+								width: 36rpx;
+								height: 36rpx;
+								border: 2rpx solid #BCBCBC;
+								border-radius: 36rpx;
+							}
+							
+							&.is--button{
+								margin-right: 0rpx;
+								padding: 20rpx;
+								border: none;
+								min-height: 82rpx;
+								border-radius: 8rpx;
+								transition: border-color 0.2s;
+								background: #F8F8F8;
+								&.is-checked{
+									background: #F5FFF4;
+									.radio__inner{
+										border-color: #00C160;
+									}
+									.radio__inner-icon{
+										background: #00C160;
+									}
+									.checklist-text{
+											color: #333333;
+									}
+								}
+							}
+						}
+					}
+					.card-cus-txt{
+						font-size: 24rpx;
+						font-weight: normal;
+						line-height: 34rpx;
+						height: 34rpx;
+						letter-spacing: 1.77rpx;
+						color: #666666;
+						text-align: center;
+					}
+					.uni-card__header{
+						border: none;
+						padding: 0;
+						.uni-card__header-extra .uni-card__header-extra-text{
+							font-size: 24rpx;
+							font-weight: normal;
+							line-height: normal;
+							letter-spacing: 0.14rpx;
+							color: #949699;
+						}
+
+						.uni-card__header-content .uni-card__header-content-title{
+							font-weight: 600;
+							line-height: 42rpx;
+							font-size: 32rpx;
+							color: #333333;
+							&:before{
+								content: '';
+								display: inline-block;
+								width: 8rpx;
+								height: 34rpx;
+								z-index: 0;
+								border-radius: 10rpx;
+								background: #58CA7F;
+								position: relative;
+								top: 5rpx;
+								margin-right: 12rpx;
+							}
+						}
+					}
+				}
+			}
+	}
+
+</style>
diff --git a/components/visitorAccount.vue b/components/visitorAccount.vue
index ee2140c..58cc4cd 100644
--- a/components/visitorAccount.vue
+++ b/components/visitorAccount.vue
@@ -1,7 +1,7 @@
 <template>
-  <view class="visitor-account-com">
-		<uni-collapse>
-			<uni-collapse-item title="广安门中医医院中西医门诊部 中医科" :thumb="cssUrl+'hicon.svg'" :errmsg="errmsg">
+  <view :class="'visitor-account-com'+(open?' default-open':'')">
+		<uni-collapse v-model="open?valueOpen:valueClose">
+			<uni-collapse-item title="广安门中医医院中西医门诊部 中医科" :thumb="thumb" :errmsg="errmsg" :disabled="disabled">
 				<view class="collapse-list">
 					<view class="account-list">
 						<view class="account-item">
@@ -71,11 +71,26 @@ export default {
 		errmsg: {
 			type: String,
 			default: ''
-		}
+		},
+		thumb:{
+			type: String,
+			default:''
+		},
+		open: {
+			type: Boolean,
+			default: false
+		},
+		disabled: {
+			type: Boolean,
+			default: false
+		},
   },
   data() {
     return {
 			cssUrl:this.cssUrl,
+			valueOpen:['0'],
+			valueClose:['1'],
+			
     }
   },
   methods: {
@@ -88,6 +103,23 @@ export default {
 		width: 100%;
 		height: auto;
 		overflow: hidden;
+		&.default-open{
+			/deep/{
+				.uni-collapse-item__title{
+					display: none !important;
+				}
+				.account-list{
+					margin-top: 0 !important;
+				}
+				.uni-collapse-item__wrap{
+					margin-top: 16rpx;
+				}
+				
+				.uni-collapse-item__wrap-content{
+					border: none !important;
+				}
+			}
+		}
 		/deep/{
 			.uni-collapse-item__wrap{
 				background: #F9FAFB;
diff --git a/components/visitorList.vue b/components/visitorList.vue
index 5042c5b..343fc1a 100644
--- a/components/visitorList.vue
+++ b/components/visitorList.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="visitor-list-com">
 		<view class="nav">
-			<view class="add PfScMedium" @click="addVisitor">
+			<view class="add PfScMedium" @click="addVisitor" v-if="add">
 				<img :src="cssUrl+'add_visitor.svg'">
 				<text>增加就诊人</text>
 			</view>
diff --git a/pages.json b/pages.json
index 35775b4..cde2d69 100644
--- a/pages.json
+++ b/pages.json
@@ -9,7 +9,7 @@
 					"path" : "pages/visitors_new/visitors_new",
 					"style" : 
 					{
-						"navigationBarTitleText" : ""
+						"navigationBarTitleText" : "就诊人"
 					}
 				},
 				{
@@ -24,7 +24,7 @@
             "path" : "pages/prebook_list/prebook_list",
             "style" :
             {
-                "navigationBarTitleText": "预约列表",
+                "navigationBarTitleText": "就诊记录",
                 "enablePullDownRefresh": false
             }
         },
@@ -84,6 +84,13 @@
         	{
         		"navigationBarTitleText" : ""
         	}
+        },
+        {
+        	"path" : "pages/visit_detail/visit_detail",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "就诊详情"
+        	}
         }
     ],
 	"globalStyle": {
diff --git a/pages/book_detail/book_detail.vue b/pages/book_detail/book_detail.vue
index 389bc53..994709a 100644
--- a/pages/book_detail/book_detail.vue
+++ b/pages/book_detail/book_detail.vue
@@ -2,9 +2,14 @@
 	<view class="book-page btPadding" v-if="bookInfo">
 		<view class="list-box">
 			<list-box class="item-wrapper" v-if="item.show" v-for="(item,key) in list" :key="key" :leftTitle="item.leftTitle" :rightTitle="item.rightTitle?item.rightTitle:''">
-				<view class="item-inner" v-html="item.custom" v-if="item.custom"></view>
+				<view class="item-inner" v-html="item.custom" v-if="item.custom" @click="edit" :data-item="item" :data-key="key"></view>
 			</list-box>
 		</view>
+		
+		<view class="bot-con">
+			<view class="title PfScMedium">治疗记录</view>
+			<visitor-account :open="true" :disabled="true"></visitor-account>
+		</view>
 
 		<view class="bot-con">
 			<view class="title PfScMedium">就诊提醒</view>
@@ -19,11 +24,28 @@
 				<!-- <view class="btn primary btn1" hover-class="hover" v-if="showReBook && !showCancelBook" @click="rebook">重新预约</view> -->
 			</view>
 		</view>
+		
+		<view :class="'ccpop'+(popkey==0?' bed-edit-pop':'')">
+			<uni-popup ref="popup" type="bottom" background-color="#fff">
+				<view class="edit-pop-title PfScSemibold">{{poptitle}}</view>
+
+				<user-card v-for="(item, key) in visitorList" :dataitem="item" @clickEvent="changeType" :index="key" :showuinfo="false"></user-card>
+
+				<view class="submit flex submit-popup">
+					<view :class="'btn cancel'+(' btn1')" hover-class="hover" @click="closepop">取消</view>
+					<view class="btn primary btn1" hover-class="hover" v-if="showCancelBook">确认修改</view>
+				</view>
+			</uni-popup>
+		</view>
+		
+
 	</view>
 </template>
 
 <script>
 	import listBox from '@/components/listBox.vue';
+	import visitorAccount from '@/components/visitorAccount.vue'
+	import userCard from '@/components/userCard.vue';
 	
 	export default {
 		data() {
@@ -36,13 +58,14 @@
 				bookDate:"2024.01.09 周二  09:30-12:00",
 				notice:"",
 				list:[
-					{'leftTitle':'状态','custom':"",show:true},
-					{'leftTitle':'就诊人','rightTitle':'',show:true},
-					{'leftTitle':'就诊医院','rightTitle':'',show:true},
-					{'leftTitle':'就诊科室','rightTitle':'',show:true},
-					{'leftTitle':'医生','rightTitle':'',show:true},
-					{'leftTitle':'排队情况','custom':"",show:true},
-					{'leftTitle':'就诊时间','custom':"",show:true}
+					{'leftTitle':'候诊状态','custom':"",show:true,edit:true},
+					{'leftTitle':'所在床位','rightTitle':'',show:true,edit:true},
+					{'leftTitle':'就诊人','rightTitle':'',show:true,edit:false},
+					{'leftTitle':'就诊医院','rightTitle':'',show:true,edit:false},
+					{'leftTitle':'就诊科室','rightTitle':'',show:true,edit:false},
+					{'leftTitle':'医生','rightTitle':'',show:true,edit:false},
+					{'leftTitle':'排队情况','custom':"",show:true,edit:false},
+					{'leftTitle':'就诊时间','custom':"",show:true,edit:false}
 				],
 				showCancelBook:false,
 				redirect:'/pages/prebook_list/prebook_list',
@@ -50,7 +73,12 @@
 				depart_id:false,
 				bookInfo:false,
 				showReBook:false,
-				cssUrl:this.cssUrl
+				cssUrl:this.cssUrl,
+				visitorList:[
+					{name:'张三',type:1,showuinfo:false}
+				],
+				popkey:-1,
+				poptitle:''
 			}
 		},
 		onLoad(option) {
@@ -67,9 +95,26 @@
 			this.getBookDetail()
 		},
 		components:{
-			listBox
+			listBox,
+			visitorAccount,
+			userCard
 		},
 		methods: {
+			closepop(){
+				this.$refs.popup.close()
+			},
+			edit(e){
+				var dataset = e.currentTarget.dataset
+				var item = dataset.item
+				var key = dataset.key
+				if(!item.edit) return
+				this.popkey = key
+				this.poptitle = '所在床位'
+				if(this.popkey == 1) {
+					this.poptitle = '候诊状态'
+				}
+				this.$refs.popup.open('bottom')
+			},
 			cancelBook(){
 				var that = this
 				uni.showModal({
@@ -124,15 +169,19 @@
 					}else{
 						this.showCancelBook = false
 					}
-					this.list[0].custom = "<view class='"+this.status+" status'><view class='over status_text'>"+bookInfo.status_desc+"</view></view>"
-					this.list[1].rightTitle = bookInfo.name
-					this.list[2].rightTitle = bookInfo.hospital_name
-					this.list[3].rightTitle = bookInfo.depart_name
-					this.list[4].rightTitle = bookInfo.doctor_name ? bookInfo.doctor_name : '无'
+					this.list[0].custom = "<view class='bi flex'><view class='"+this.status+" status'><view class='over status_text'>"+bookInfo.status_desc+"</view></view><img src="+this.cssUrl+"bi.svg></view>"
+					
+					
+					this.list[1].custom = "<view class='bi flex'><text>2诊室13床</text><img src="+this.cssUrl+"bi.svg></view>"
+					
+					this.list[2].rightTitle = bookInfo.name
+					this.list[3].rightTitle = bookInfo.hospital_name
+					this.list[4].rightTitle = bookInfo.depart_name
+					this.list[5].rightTitle = bookInfo.doctor_name ? bookInfo.doctor_name : '无'
 					// this.list[5].custom = "<view class='queue-text'>前方<text class='queue-num-txt PfScSemibold'>"+bookInfo.wait_visit_count+"</text>人</view>"
 					// if(bookInfo.wait_visit_count<=0 || bookInfo.status!=0) this.list[5].show = false
-					this.list[5].show = false
-					this.list[6].custom = "<view class='book-date"+(bookInfo.status==0?' wait':' expire')+"'>"+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+"</view>"
+					this.list[6].show = false
+					this.list[7].custom = "<view class='book-date"+(bookInfo.status==0?' wait':' expire')+"'>"+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+"</view>"
 					this.notice = bookInfo.notice;
 				});
 			}
@@ -148,6 +197,26 @@
 	background: #F6F6F6;
 	overflow-y: auto;
 	box-sizing: border-box;
+	.ccpop{
+		&.bed-edit-pop{
+			/deep/{
+				.uni-data-checklist{
+					display: none !important;
+				}
+				.bed-wrapper{
+					display: block !important;
+				}
+				.card-cus-txt{
+					display: none;
+				}
+			}
+		}
+		/deep/{
+			uni-view[name="content"]{
+				border-radius: 40rpx;
+			}
+		}
+	} 
 	.list-box,.bot-con{
 		width: calc(100% - 34rpx);
 		height: auto;
@@ -155,10 +224,44 @@
 		overflow: hidden;
 		border-radius: 0 0 8rpx 8rpx;
 	}
+	.edit-pop-title{
+		font-size: 36rpx;
+		line-height: 50rpx;
+		letter-spacing: 3.17rpx;
+		color: #333333;
+		margin: 42rpx 0 46rpx 0;
+		text-align: center;
+	}
+
+	.submit-popup{
+		justify-content: center;
+		column-gap: 50rpx;
+
+		width: 100%;
+		height: 124rpx;
+		background: #FFFFFF;
+		backdrop-filter: blur(54.4rpx);
+		box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(181, 181, 181, 0.1319);
+		align-items: center;
+		
+		.btn.btn1{
+			border-radius: 12rpx;
+			width: 300rpx;
+			height: 90rpx;
+		}
+	}
 	
 	.list-box{
 		.item-wrapper{
 			.item-inner /deep/{
+					.bi{
+						align-items: center;
+						column-gap: 12rpx;
+						img{
+							width: 42rpx;
+							height: 42rpx;
+						}
+					}
 				 .status{
 					display: flex;
 					justify-content: flex-end;
@@ -283,12 +386,5 @@
 			column-gap: 50rpx;
 		}
 	}
-	
-	// <view class="fixedBot btPadding">
-	// 	<view class="submit">
-	// 		<view class="btn cancel">返回</view>
-	// 		<view class="btn primary">取消预约</view>
-	// 	</view>
-	// </view>
 }
 </style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5a838e0..4149106 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -340,7 +340,7 @@
 			},
 			toPrebookDetail(){
 				uni.navigateTo({
-					url:"/pages/book_detail/book_detail"
+					url:"/pages/visit_detail/visit_detail"
 				})
 			},
 			qqMapTransBMap(lng, lat) {
diff --git a/pages/visit_detail/visit_detail.vue b/pages/visit_detail/visit_detail.vue
new file mode 100644
index 0000000..994709a
--- /dev/null
+++ b/pages/visit_detail/visit_detail.vue
@@ -0,0 +1,390 @@
+<template>
+	<view class="book-page btPadding" v-if="bookInfo">
+		<view class="list-box">
+			<list-box class="item-wrapper" v-if="item.show" v-for="(item,key) in list" :key="key" :leftTitle="item.leftTitle" :rightTitle="item.rightTitle?item.rightTitle:''">
+				<view class="item-inner" v-html="item.custom" v-if="item.custom" @click="edit" :data-item="item" :data-key="key"></view>
+			</list-box>
+		</view>
+		
+		<view class="bot-con">
+			<view class="title PfScMedium">治疗记录</view>
+			<visitor-account :open="true" :disabled="true"></visitor-account>
+		</view>
+
+		<view class="bot-con">
+			<view class="title PfScMedium">就诊提醒</view>
+			<view class="content" v-html="notice"></view>
+		</view>
+		<view class="btPadding pagebt"></view>
+		
+		<view class="fixedBot btPadding">
+			<view class="submit">
+				<view :class="'btn cancel'+(showCancelBook?' btn1':' btn3')" hover-class="hover" @click="reback">返回</view>
+				<view class="btn primary btn1" hover-class="hover" v-if="showCancelBook" @click="cancelBook">取消预约</view>
+				<!-- <view class="btn primary btn1" hover-class="hover" v-if="showReBook && !showCancelBook" @click="rebook">重新预约</view> -->
+			</view>
+		</view>
+		
+		<view :class="'ccpop'+(popkey==0?' bed-edit-pop':'')">
+			<uni-popup ref="popup" type="bottom" background-color="#fff">
+				<view class="edit-pop-title PfScSemibold">{{poptitle}}</view>
+
+				<user-card v-for="(item, key) in visitorList" :dataitem="item" @clickEvent="changeType" :index="key" :showuinfo="false"></user-card>
+
+				<view class="submit flex submit-popup">
+					<view :class="'btn cancel'+(' btn1')" hover-class="hover" @click="closepop">取消</view>
+					<view class="btn primary btn1" hover-class="hover" v-if="showCancelBook">确认修改</view>
+				</view>
+			</uni-popup>
+		</view>
+		
+
+	</view>
+</template>
+
+<script>
+	import listBox from '@/components/listBox.vue';
+	import visitorAccount from '@/components/visitorAccount.vue'
+	import userCard from '@/components/userCard.vue';
+	
+	export default {
+		data() {
+			return {
+				statusList:['status_wait', 'status_ing', 'status_down', 'status_out_num', 'status_expire', 'status_cancle'],
+				statusStyleList:{'0':'status_wait', '1':'status_ing', '2':'status_down', '3':'status_out_num', '4':'status_expire','5':'status_cancle'},
+				statusDescList:['候诊', '就诊中', '已完成','过号', '已过期',  '已取消'],
+				status:'',
+				queueNum:88,
+				bookDate:"2024.01.09 周二  09:30-12:00",
+				notice:"",
+				list:[
+					{'leftTitle':'候诊状态','custom':"",show:true,edit:true},
+					{'leftTitle':'所在床位','rightTitle':'',show:true,edit:true},
+					{'leftTitle':'就诊人','rightTitle':'',show:true,edit:false},
+					{'leftTitle':'就诊医院','rightTitle':'',show:true,edit:false},
+					{'leftTitle':'就诊科室','rightTitle':'',show:true,edit:false},
+					{'leftTitle':'医生','rightTitle':'',show:true,edit:false},
+					{'leftTitle':'排队情况','custom':"",show:true,edit:false},
+					{'leftTitle':'就诊时间','custom':"",show:true,edit:false}
+				],
+				showCancelBook:false,
+				redirect:'/pages/prebook_list/prebook_list',
+				bookId:false,
+				depart_id:false,
+				bookInfo:false,
+				showReBook:false,
+				cssUrl:this.cssUrl,
+				visitorList:[
+					{name:'张三',type:1,showuinfo:false}
+				],
+				popkey:-1,
+				poptitle:''
+			}
+		},
+		onLoad(option) {
+			// if(option.index) this.redirect = '/pages/index/index'
+			if(option.id) this.bookId = option.id
+			if(option.depart_id) this.depart_id = option.depart_id
+			
+		},
+		onShow() {
+			if(!this.bookId || !this.depart_id){
+				this.$func.toPage('/pages/index/index')
+				return;
+			}
+			this.getBookDetail()
+		},
+		components:{
+			listBox,
+			visitorAccount,
+			userCard
+		},
+		methods: {
+			closepop(){
+				this.$refs.popup.close()
+			},
+			edit(e){
+				var dataset = e.currentTarget.dataset
+				var item = dataset.item
+				var key = dataset.key
+				if(!item.edit) return
+				this.popkey = key
+				this.poptitle = '所在床位'
+				if(this.popkey == 1) {
+					this.poptitle = '候诊状态'
+				}
+				this.$refs.popup.open('bottom')
+			},
+			cancelBook(){
+				var that = this
+				uni.showModal({
+					title:'取消预约',
+					content:'确认取消预约?',
+					success(res) {
+						if(!res.confirm) return
+						that.$http.req('user/cancel_appoint', {
+							appoint_id:that.bookId,
+							depart_id:that.depart_id
+						},
+						 'POST').then(data=>{
+							if(data == -1) return
+							that.getBookDetail()
+							uni.showToast({
+								title:"取消预约成功",
+								mask:true,
+								image:that.cssUrl+'gou.svg',
+								times:false,
+								duration: 1500,
+								success() {
+									that.$func.toPage('/pages/prebook_list/prebook_list')
+								}
+							})
+						});
+					}
+				})
+			},
+			rebook(){
+				this.$func.toPage('/pages/index/index')
+			},
+			reback(){
+				this.$func.toPage('/pages/index/index')
+			},
+			getBookDetail(){
+				this.$http.req('user/get_appoint_detail', {appoint_id:this.bookId,depart_id:this.depart_id}, 'POST').then(data=>{
+					if(data == -1) {
+						this.bookInfo = false
+						return
+					}
+
+					var bookInfo = data
+				// 	if(bookInfo && bookInfo.length <= 0){
+				// 		this.$pop.modelShow('预约信息为空')
+				// 		return
+				// 	}
+					bookInfo = data
+					this.bookInfo = bookInfo
+					this.status = this.statusStyleList[bookInfo.status]
+					if(bookInfo.status==0 || bookInfo.status==2){
+						this.showCancelBook = true
+					}else{
+						this.showCancelBook = false
+					}
+					this.list[0].custom = "<view class='bi flex'><view class='"+this.status+" status'><view class='over status_text'>"+bookInfo.status_desc+"</view></view><img src="+this.cssUrl+"bi.svg></view>"
+					
+					
+					this.list[1].custom = "<view class='bi flex'><text>2诊室13床</text><img src="+this.cssUrl+"bi.svg></view>"
+					
+					this.list[2].rightTitle = bookInfo.name
+					this.list[3].rightTitle = bookInfo.hospital_name
+					this.list[4].rightTitle = bookInfo.depart_name
+					this.list[5].rightTitle = bookInfo.doctor_name ? bookInfo.doctor_name : '无'
+					// this.list[5].custom = "<view class='queue-text'>前方<text class='queue-num-txt PfScSemibold'>"+bookInfo.wait_visit_count+"</text>人</view>"
+					// if(bookInfo.wait_visit_count<=0 || bookInfo.status!=0) this.list[5].show = false
+					this.list[6].show = false
+					this.list[7].custom = "<view class='book-date"+(bookInfo.status==0?' wait':' expire')+"'>"+bookInfo.visit_date+' '+bookInfo.week_desc+' '+bookInfo.visit_time+"</view>"
+					this.notice = bookInfo.notice;
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+.book-page{
+	height: 100vh;
+	width: 100%;
+	background: #F6F6F6;
+	overflow-y: auto;
+	box-sizing: border-box;
+	.ccpop{
+		&.bed-edit-pop{
+			/deep/{
+				.uni-data-checklist{
+					display: none !important;
+				}
+				.bed-wrapper{
+					display: block !important;
+				}
+				.card-cus-txt{
+					display: none;
+				}
+			}
+		}
+		/deep/{
+			uni-view[name="content"]{
+				border-radius: 40rpx;
+			}
+		}
+	} 
+	.list-box,.bot-con{
+		width: calc(100% - 34rpx);
+		height: auto;
+		margin: 17rpx auto 0;
+		overflow: hidden;
+		border-radius: 0 0 8rpx 8rpx;
+	}
+	.edit-pop-title{
+		font-size: 36rpx;
+		line-height: 50rpx;
+		letter-spacing: 3.17rpx;
+		color: #333333;
+		margin: 42rpx 0 46rpx 0;
+		text-align: center;
+	}
+
+	.submit-popup{
+		justify-content: center;
+		column-gap: 50rpx;
+
+		width: 100%;
+		height: 124rpx;
+		background: #FFFFFF;
+		backdrop-filter: blur(54.4rpx);
+		box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(181, 181, 181, 0.1319);
+		align-items: center;
+		
+		.btn.btn1{
+			border-radius: 12rpx;
+			width: 300rpx;
+			height: 90rpx;
+		}
+	}
+	
+	.list-box{
+		.item-wrapper{
+			.item-inner /deep/{
+					.bi{
+						align-items: center;
+						column-gap: 12rpx;
+						img{
+							width: 42rpx;
+							height: 42rpx;
+						}
+					}
+				 .status{
+					display: flex;
+					justify-content: flex-end;
+					.status_text{
+						display: flex;
+						border-radius: 6rpx;
+						font-size: 26rpx;
+						height: 40rpx;
+						line-height: 40rpx;
+						padding:  0 10rpx;
+						box-sizing: border-box;
+						min-width: 90rpx;
+						display: block;
+						text-align: center;
+						min-width: 128rpx;
+					}
+					&.status_wait{
+						.status_text{
+							background: #F8FFF7;
+							border: 1rpx solid #5BD07A;
+							color: #58CA7F;
+						}
+					}
+					&.status_out_num{
+						.status_text{
+							background: #FFFAF7;
+							color: #FE6710;
+							border: 1px solid #FE6710;
+						}
+					}
+					&.status_down{
+						.status_text{
+							background: #FCFCFC;
+							border: 1px solid #999999;
+							color: #999999;
+						}
+					}
+					&.status_expire,&.status_cancle{
+						.status_text{
+							background: #FCFCFC;
+							border: 1rpx solid #AEB0B8;
+							color: #B6B8BF;
+						}
+					}
+					&.status_ing{
+						.status_text{
+							border: 1rpx solid #5FA1CB;
+							background: #F7FCFF;
+							color: #5FA1CB;
+						}
+					}
+				}
+				
+				.queue-text{
+					height: 40rpx;
+					font-size: 28rpx;
+					color: #242833;
+					line-height: 40rpx;
+					.queue-num-txt{
+						height: 48rpx;
+						font-weight: 600;
+						font-size: 48rpx;
+						color: #39D067;
+						line-height: 48rpx;
+						margin: 0 8rpx;
+					}
+				}
+				.book-date{
+					height: 45rpx;
+					font-size: 32rpx;
+					line-height: 45rpx;
+					&.wait{
+						color: #39D067;
+					}
+					&.expire{
+						color: #FD7B13;
+					}
+				}
+			}
+		}
+	}
+	.bot-con{
+		background: #FFFFFF;
+		margin-top: 15rpx;
+		padding: 40rpx 27rpx;
+		box-sizing: border-box;
+		overflow: hidden;
+		min-height: 430rpx;
+		.title{
+			height: 44rpx;
+			font-size: 32rpx;
+			color: #000000;
+			line-height: 44rpx;
+			letter-spacing: 2rpx;
+		}
+		.content{
+			margin-top: 16rpx;
+			font-size: 32rpx;
+			color: #666666;
+			line-height: 46rpx;
+			padding-bottom: 124rpx;
+		}
+	}
+	.pagebt{
+		opacity: 0;
+	}
+	.fixedBot{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		height: 124rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx -2rpx 6rpx 0rpx rgba(181,181,181,0.13);
+		backdrop-filter: blur(20rpx);
+		display: flex;
+		.submit{
+			width: 100%;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			column-gap: 50rpx;
+		}
+	}
+}
+</style>
diff --git a/pages/visitors_new/visitors_new.vue b/pages/visitors_new/visitors_new.vue
index 20ff8a5..36b0c7d 100644
--- a/pages/visitors_new/visitors_new.vue
+++ b/pages/visitors_new/visitors_new.vue
@@ -8,15 +8,15 @@
 		
 		
 		<uni-card title="上官子涵" extra="身份证：9098******8778" margin="0 0 20rpx 0" shadow="none" :border="false" padding="24rpx" class="">
-			<visitor-account></visitor-account>
+			<visitor-account :thumb="cssUrl+'hicon.svg'"></visitor-account>
 		</uni-card>
 		
 		<uni-card title="上官子涵" extra="身份证：9098******8778" margin="0 0 20rpx 0" shadow="none" :border="false" padding="24rpx" class="">
-			<visitor-account errmsg="4周未看病，请及时复诊"></visitor-account>
+			<visitor-account :thumb="cssUrl+'hicon.svg'" errmsg="4周未看病，请及时复诊"></visitor-account>
 		</uni-card>
 		
 		<uni-card title="上官子涵" extra="身份证：9098******8778" margin="0 0 20rpx 0" shadow="none" :border="false" padding="24rpx" class="">
-			<visitor-account errmsg="4周未看病，请及时复诊"></visitor-account>
+			<visitor-account :thumb="cssUrl+'hicon.svg'" errmsg="4周未看病，请及时复诊"></visitor-account>
 		</uni-card>
 		
 		
diff --git a/pages/waiting_method/waiting_method.vue b/pages/waiting_method/waiting_method.vue
index c11be06..3be95c9 100644
--- a/pages/waiting_method/waiting_method.vue
+++ b/pages/waiting_method/waiting_method.vue
@@ -4,41 +4,7 @@
 			{{hospital_depart_name}}
 		</view>
 
-		<uni-card title="上官子涵" extra="身份证：9098******8778" margin="0 10rpx 20rpx 10rpx" shadow="none" :border="false" padding="24rpx 0 0 0">
-			<view>
-				<uni-data-checkbox mode="button" v-model="type" :localdata="types"></uni-data-checkbox>
-			</view>
- 
-			<view class="" v-if="type == 1">
-				<uni-easyinput v-model="value" placeholder="请输入床位位置" placeholderStyle="color: #999999;font-size: 30rpx;" :trim="true"></uni-easyinput>
-			</view> 
-
-			<view class="card-cus-txt" v-if="type == 0">
-				首次就诊，建议等待医生叫号
-			</view>
-
-			<view class="card-cus-txt" v-else>
-				没有找到床位，可不填写位置
-			</view>
-		</uni-card>
-		
-		<uni-card title="王鹏" extra="身份证：9098******8778" margin="0 10rpx 20rpx 10rpx" shadow="none" :border="false" padding="24rpx 0 0 0">
-			<view>
-				<uni-data-checkbox mode="button" v-model="type" :localdata="types"></uni-data-checkbox>
-			</view>
-		 
-			<view class="" v-if="type == 1">
-				<uni-easyinput v-model="value" placeholder="请输入床位位置" placeholderStyle="color: #999999;font-size: 30rpx;" :trim="true"></uni-easyinput>
-			</view> 
-		
-			<view class="card-cus-txt" v-if="type == 0">
-				首次就诊，建议等待医生叫号
-			</view>
-		
-			<view class="card-cus-txt" v-else>
-				没有找到床位，可不填写位置
-			</view>
-		</uni-card>
+		<user-card v-for="(item, key) in visitorList" :dataitem="item" @clickEvent="changeType" :index="key"></user-card>
 
 		<view class="submit">
 			<view class="bot primary btn btn2 submitbtn PfScMedium" hover-class="hover">
@@ -50,6 +16,7 @@
 </template>
 
 <script>
+	import userCard from '@/components/userCard.vue';
 	
 	export default {
 		data() {
@@ -57,17 +24,15 @@
 				cssUrl:this.cssUrl,
 				depart_id:0,
 				hospital_depart_name:'',
-				value:'',
-				type: 0,
-				types: [{
-					text: '等医生叫号',
-					value: 0
-				}, {
-					text: '找床位候诊',
-					value: 1
-				}],
+				visitorList:[
+					{name:'张三',type:1},
+					{name:'李四', type:1},
+				]
 			}
 		},
+		components:{
+			userCard
+		},
 		onLoad(option) {
 			var depart_info = uni.getStorageSync('depart')
 			if(depart_info) {
@@ -85,6 +50,7 @@
 		onReady() {
 		},
 		methods: {
+
 			getVisitors() {
 				this.$http.req('user/get_visitors', {}, 'POST').then(data=>{
 					this.visitUsers = data;
@@ -95,7 +61,11 @@
 						this.visitUsers[i].select = false
 					}
 				});
+			},
+			changeType(info) {
+				console.log(info)
 			}
+			
 		}
 	}
 </script>
@@ -103,120 +73,6 @@
 <style lang="scss" scoped>
 .waiting-method-page{
 	overflow: hidden;
-	/deep/ {
-		.uni-easyinput{
-			margin-bottom: 24rpx;
-			.uni-easyinput__content-input{
-				padding-left: 24rpx !important;
-				color: #333333;
-				font-size: 30rpx;
-				line-height: 30rpx;
-				letter-spacing: 0.22rpx;
-				height: 86rpx;
-				line-height: 86rpx;
-				display: flex;
-				align-items: center;
-				position: relative;
-				top: -2rpx;
-			}
-			.is-input-border{
-				border: 2rpx solid #DCDCDC !important;
-			}
-			.is-input-border.is-focused{
-				border-color: #39D067 !important;
-				.uni-icons.content-clear-icon.uniui-clear{
-					color: #39D067 !important;
-				}
-			}
-		}
-		.uni-card{
-			border-radius: 0;
-			padding: 32rpx !important;
-			.uni-data-checklist .checklist-group {
-				column-gap: 24rpx;
-				margin-bottom: 24rpx;
-				.checklist-box{
-					margin: 0;
-					width: calc(50% - 14rpx);
-					box-sizing: border-box;
-					.checklist-content .checklist-text{
-						font-size: 30rpx;
-						font-weight: normal;
-						letter-spacing: 0.22rpx;
-						margin-left: 12rpx;
-						color: #666666;
-					}
-					
-					.radio__inner{
-						width: 36rpx;
-						height: 36rpx;
-						border: 2rpx solid #BCBCBC;
-						border-radius: 36rpx;
-					}
-					
-					&.is--button{
-						margin-right: 0rpx;
-						padding: 20rpx;
-						border: none;
-						min-height: 82rpx;
-						border-radius: 8rpx;
-						transition: border-color 0.2s;
-						background: #F8F8F8;
-						&.is-checked{
-							background: #F5FFF4;
-							.radio__inner{
-								border-color: #00C160;
-							}
-							.radio__inner-icon{
-								background: #00C160;
-							}
-							.checklist-text{
-									color: #333333;
-							}
-						}
-					}
-				}
-			}
-			.card-cus-txt{
-				font-size: 24rpx;
-				font-weight: normal;
-				line-height: 34rpx;
-				height: 34rpx;
-				letter-spacing: 1.77rpx;
-				color: #666666;
-			}
-			.uni-card__header{
-				border: none;
-				padding: 0;
-				.uni-card__header-extra .uni-card__header-extra-text{
-					font-size: 24rpx;
-					font-weight: normal;
-					line-height: normal;
-					letter-spacing: 0.14rpx;
-					color: #949699;
-				}
-
-				.uni-card__header-content .uni-card__header-content-title{
-					font-weight: 600;
-					line-height: 42rpx;
-					font-size: 32rpx;
-					color: #333333;
-					&:before{
-						content: '';
-						display: inline-block;
-						width: 8rpx;
-						height: 34rpx;
-						z-index: 0;
-						border-radius: 10rpx;
-						background: #58CA7F;
-						position: relative;
-						top: 5rpx;
-						margin-right: 12rpx;
-					}
-				}
-			}
-		}
-	}
 	.h-name{
 		padding: 36rpx 24rpx;
 		box-sizing: border-box;
diff --git a/static/images/frontend/bi.svg b/static/images/frontend/bi.svg
new file mode 100644
index 0000000..46dac66
--- /dev/null
+++ b/static/images/frontend/bi.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="42" height="42" viewBox="0 0 42 42"><defs><clipPath id="master_svg0_135_55903"><rect x="0" y="0" width="42" height="42" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_135_55903)"><g><path d="M17.60302890625,29.518378125C17.128768906250002,29.992678125,16.48802890625,30.260078125,15.82709890625,30.285278125L9.19260890625,30.386178125C8.42573690625,30.325678125,7.83039880625,29.705078125,7.744629707336,28.938178125L7.84553490625,22.303778125C7.84553490625,21.642778125,8.13311290625,21.002078125,8.61241090625,20.527778125L20.99342890625,8.146798125L29.98402890625,17.137378124999998L17.60302890625,29.518378125ZM31.09402890625,16.022378125L22.108428906249998,7.0318081249999995L23.80362890625,5.336598125C25.14562890625,3.994570125,27.33532890625,3.994570125,28.68232890625,5.336598125L32.81442890625,9.468648125C34.15642890625,10.810688125,34.15642890625,13.000318125,32.81442890625,14.347378125L31.09402890625,16.022378125ZM32.72862890625,37.656378125L10.32778890625,37.656378125C8.89998890625,37.656378125,7.74462890625,36.501078125,7.74462890625,35.073278125C7.74462890625,33.645478125,8.89998890625,32.490078125,10.32778890625,32.490078125L32.70842890625,32.490078125C34.13622890625,32.490078125,35.29162890625,33.645478125,35.29162890625,35.073278125C35.29162890625,36.501078125,34.15642890625,37.656378125,32.72862890625,37.656378125Z" fill="#C7C7C7" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></svg>
\ No newline at end of file
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..505fc70
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,90 @@
+## 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/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 0000000..a747b9f
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 0000000..e42bfaf
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,316 @@
+<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) {
+				if (this.maxlength != -1 && this.mode === 'input') {
+					this.val = val.slice(0, this.maxlength);
+				} else {
+					this.val = val
+				}
+			},
+			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: {
+			/**
+			 * 点击确认按钮
+			 */
+			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/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 0000000..7f27a1e
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 0000000..049cd5c
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 0000000..8c0f5f3
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 0000000..fa8f0f3
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 0000000..8e5b99f
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 0000000..06ce162
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 0000000..16a5818
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 0000000..a37fb9f
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
new file mode 100644
index 0000000..5eb8d5b
--- /dev/null
+++ b/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/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..5af55e0
--- /dev/null
+++ b/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/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
new file mode 100644
index 0000000..da485a4
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,90 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.9.6",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"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"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+                "aliyun": "y",
+                "alipay": "n"
+			},
+			"client": {
+				"App": {
+                    "app-vue": "y",
+                    "app-nvue": "y",
+                    "app-harmony": "u",
+                    "app-uvue": "u"
+                },
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..fdad4b3
--- /dev/null
+++ b/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/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..faaf336
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,24 @@
+## 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/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..8f89b18
--- /dev/null
+++ b/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/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..f3ddd1f
--- /dev/null
+++ b/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: 1,
+			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
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		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: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			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 ? 0 : 1,
+				'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/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..d5c20e1
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,85 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.3",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "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"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y",
+        "alipay": "n"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..2f8a77e
--- /dev/null
+++ b/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