From 71793d804babc875f928707d3c6af03a04931322 Mon Sep 17 00:00:00 2001
From: longjieli <1060695654@qq.com>
Date: Sun, 25 Aug 2024 15:56:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/prizeDraw/prizeDraw.vue                 | 183 ++++++++
 components/virtualScroll/virtualScroll.vue         |  38 +-
 locale/ar.js                                       |  16 +-
 locale/en.js                                       |  16 +-
 locale/es.js                                       |  16 +-
 locale/fr.js                                       |  16 +-
 locale/ru.js                                       |  16 +-
 pages/home/home.vue                                |  52 ++-
 pages/modifyUser/modifyUser.vue                    | 142 +++---
 pages/purse/purse.vue                              |  13 +-
 pages/starting/starting.vue                        |  56 ++-
 pages/withdraw/withdraw.vue                        |  10 +-
 uni_modules/uni-popup/changelog.md                 |  84 ++++
 .../components/uni-popup-dialog/keypress.js        |  45 ++
 .../uni-popup-dialog/uni-popup-dialog.vue          | 316 +++++++++++++
 .../uni-popup-message/uni-popup-message.vue        | 143 ++++++
 .../components/uni-popup-share/uni-popup-share.vue | 187 ++++++++
 .../uni-popup/components/uni-popup/i18n/en.json    |   7 +
 .../uni-popup/components/uni-popup/i18n/index.js   |   8 +
 .../components/uni-popup/i18n/zh-Hans.json         |   7 +
 .../components/uni-popup/i18n/zh-Hant.json         |   7 +
 .../uni-popup/components/uni-popup/keypress.js     |  45 ++
 .../uni-popup/components/uni-popup/popup.js        |  26 ++
 .../uni-popup/components/uni-popup/uni-popup.uvue  |  90 ++++
 .../uni-popup/components/uni-popup/uni-popup.vue   | 503 +++++++++++++++++++++
 uni_modules/uni-popup/package.json                 |  88 ++++
 uni_modules/uni-popup/readme.md                    |  17 +
 uni_modules/uni-transition/changelog.md            |  24 +
 .../components/uni-transition/createAnimation.js   | 131 ++++++
 .../components/uni-transition/uni-transition.vue   | 286 ++++++++++++
 uni_modules/uni-transition/package.json            |  85 ++++
 uni_modules/uni-transition/readme.md               |  11 +
 32 files changed, 2530 insertions(+), 154 deletions(-)
 create mode 100644 components/prizeDraw/prizeDraw.vue
 create mode 100644 uni_modules/uni-popup/changelog.md
 create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/en.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/index.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-popup/components/uni-popup/keypress.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/popup.js
 create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
 create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.vue
 create mode 100644 uni_modules/uni-popup/package.json
 create mode 100644 uni_modules/uni-popup/readme.md
 create mode 100644 uni_modules/uni-transition/changelog.md
 create mode 100644 uni_modules/uni-transition/components/uni-transition/createAnimation.js
 create mode 100644 uni_modules/uni-transition/components/uni-transition/uni-transition.vue
 create mode 100644 uni_modules/uni-transition/package.json
 create mode 100644 uni_modules/uni-transition/readme.md

diff --git a/components/prizeDraw/prizeDraw.vue b/components/prizeDraw/prizeDraw.vue
new file mode 100644
index 0000000..0714d84
--- /dev/null
+++ b/components/prizeDraw/prizeDraw.vue
@@ -0,0 +1,183 @@
+<!-- 抽奖弹框 -->
+<template>
+	<view class="prizeDraw">
+		<uni-popup ref="popup">
+			<view class="popup-content">
+				<view class="title">{{ $t('page.prizeDraw.title') }}</view>
+
+				<view class="project">
+					<view class="img-box">
+						<image :src="orderInfo.image" mode="widthFix"></image>
+					</view>
+					<view class="project-base">
+						<view class="project-name">{{ orderInfo.subTitle }}</view>
+					</view>
+				</view>
+
+				<view class="todoy-info">
+					<view class="todoy-info-main">
+						<view class="today-info-l">
+							<view class="today-income">{{ $t('page.prizeDraw.recharge') }}</view>
+							<div class="money">
+								<text class="number">{{ orderInfo.price }}</text>
+								<text class="unit">{{ $t('page.prizeDraw.unit') }}</text>
+							</div>
+						</view>
+
+						<div class="booking-info-r">
+							<view class="booking-income">{{ $t('page.prizeDraw.commission') }}</view>
+							<div class="booking-data">
+								<text class="number">{{ orderInfo.giveMoney + $t('page.prizeDraw.unit') }}</text>
+							</div>
+						</div>
+					</view>
+				</view>
+
+				<view class="order-time">
+					<view class="title">{{ $t('page.prizeDraw.time') }}</view>
+					<div class="content">{{ orderInfo.createTime }}</div>
+				</view>
+				
+				<view class="order-number">
+					<div class="title">{{ $t('page.prizeDraw.number') }}</div>
+					<div class="content">{{ orderInfo.id }}</div>
+				</view>
+				
+				<div @click="orderPay" class="submit">{{ $t('page.prizeDraw.submit') }}</div>
+
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: 'center',
+				orderInfo : {},
+				userInfo : {},		//用户信息
+			}
+		},
+		methods: {
+			toggle(order) {
+				this.getUserInfo()
+				this.orderInfo = order
+				this.$refs.popup.open(this.type)
+			},
+			
+			//用户点击确定按钮(创建订单)
+			orderPay(){
+				this.$emit('orderPay',this.orderInfo.id)
+			},
+			
+			//获取用户信息
+			getUserInfo() {
+				this.request('userInfo').then(res => {
+					if (res.code == 200) {
+						this.userInfo = res.result.userInfo
+					}
+				})
+			},
+			
+			//关闭
+			close(){
+				this.$refs.popup.close(this.type)
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.prizeDraw {
+
+		.popup-content {
+			width: 700rpx;
+			margin: 0rpx auto;
+			background: white;
+			border-radius: 20rpx;
+			box-sizing: border-box;
+			padding: 20rpx;
+
+			.title {
+				font-size: 32rpx;
+			}
+
+			.project {
+				display: flex;
+				align-items: center;
+				flex-wrap: wrap;
+				min-height: 150rpx;
+
+				.img-box {
+					width: 25%;
+					margin-right: 2%;
+
+					image {
+						width: 100%;
+					}
+				}
+
+				.project-base {
+					width: 73%;
+				}
+			}
+		}
+
+		.todoy-info {
+			box-sizing: border-box;
+			height: 140rpx;
+
+			.todoy-info-main {
+				display: flex;
+				flex-wrap: wrap;
+				height: 100%;
+				// background-color: rgba(0, 208, 234, 0.1);
+				border-radius: 20rpx;
+				margin: 20rpx 0rpx;
+				box-sizing: border-box;
+				padding: 0rpx 30rpx;
+
+				.today-info-l,
+				.booking-info-r {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					width: 50%;
+					font-size: 28rpx;
+
+					.today-income,
+					.booking-income {
+						// color: #8e8e98;
+					}
+
+					.money,
+					.booking-data {
+						font-weight: bold;
+						margin-top: 10rpx;
+					}
+				}
+			}
+		}
+
+		.order-time,
+		.order-number {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 30rpx;
+			font-size: 30rpx;
+		}
+		
+		.submit{
+			height: 80rpx;
+			border-radius: 100rpx;
+			background-color: #f33;
+			color: white;
+			font-size: 30rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-top: 30rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/virtualScroll/virtualScroll.vue b/components/virtualScroll/virtualScroll.vue
index fec8778..370c8c2 100644
--- a/components/virtualScroll/virtualScroll.vue
+++ b/components/virtualScroll/virtualScroll.vue
@@ -1,10 +1,10 @@
 <template>
-	<vue-seamless-scroll :data="listData" :class-option="classOption" class="warp">
+	<vue-seamless-scroll :data="listData" :class-option="classOption" :style="{ height : listData.length > 6 ? '400rpx' :`${listData.length * 60}rpx`}" class="warp">
 		<ul class="item">
 			<li v-for="(item, index) in listData" :key="index">
 				<view class="content">
-					<span class="title" v-text="item.title"></span>
-					<span class="date" v-text="item.date"></span>
+					<span class="title" v-text="item.auccont"></span>
+					<span class="date" v-text="item.money"></span>
 				</view>
 			</li>
 		</ul>
@@ -19,37 +19,12 @@
 		components: {
 			vueSeamlessScroll
 		},
+		props : ['listData'],
 		data() {
 			return {
-				listData: [{
-					'title': 'Get a commission',
-					'date': '666'
-				}, {
-					'title': 'Get a commission16'
-				}, {
-					'title': 'Get a commission',
-					'date': '777'
-				}, {
-					'title': 'Get a commission',
-					'date': '888'
-				}, {
-					'title': 'Get a commission',
-					'date': '999'
-				}, {
-					'title': 'Get a commission',
-					'date': '111'
-				}, {
-					'title': 'Get a commission',
-					'date': '222'
-				}, {
-					'title': 'Get a commission',
-					'date': '333'
-				}, {
-					'title': 'Get a commission',
-					'date': '4444'
-				}],
 				classOption: {
-					step: .5
+					step: 1,
+					limitMoveNum: 1
 				}
 			}
 		},
@@ -58,7 +33,6 @@
 
 <style lang="scss" scoped>
 	.warp {
-		height: 100%;
 		width: 80%;
 		margin: 0 auto;
 		overflow: hidden;
diff --git a/locale/ar.js b/locale/ar.js
index dfb29b8..51a1287 100644
--- a/locale/ar.js
+++ b/locale/ar.js
@@ -71,7 +71,8 @@ export default {
 			"unit": "USD",
 			"today-income": "إيرادات اليوم",
 			"completed": "تم الحجز!",
-			"auto-match": "التطابق التلقائي"
+			"auto-match": "التطابق التلقائي",
+			"payment-success": " المراسلات"
 		},
 		"center": {
 			"phone": "الهاتف",
@@ -97,7 +98,9 @@ export default {
 			"recharge-amount-placeholder": "الرجاء إدخال حساب التعبئة",
 			"upload": "رفع لقطة الشاشة للدفع",
 			"complete-top-up": "لقد أكملت عملية التعبئة",
-			"steps": "الخطوات"
+			"steps": "الخطوات",
+			"copySuccess": "نسخ نجاح",
+			"success": "إعادة الشحن بنجاح"
 		},
 		"withdraw": {
 			"balance": "الرصيد",
@@ -162,6 +165,15 @@ export default {
 			"confirm_pay": "هل أنت متأكد من الدفع؟",
 			"ok": "تأكيد",
 			"no": "إلغاء"
+		},
+		"prizeDraw": {
+			"title": "المطابقة",
+			"recharge": "حاجة إلى إعادة الشحن",
+			"commission": "عمولة",
+			"time": "وقت",
+			"number": "رقم",
+			"submit": "إرسال",
+			"unit": "USD"
 		}
 	}
 }
\ No newline at end of file
diff --git a/locale/en.js b/locale/en.js
index 177a35d..b20ae68 100644
--- a/locale/en.js
+++ b/locale/en.js
@@ -71,7 +71,8 @@ export default {
 			"unit": "USD",
 			"today-income": "Today Income",
 			"completed": "Booking completed!",
-			"auto-match": "Auto-match"
+			"auto-match": "Auto-match",
+			"payment-success" : "Payment success"
 		},
 		"center": {
 			"phone": "phone",
@@ -97,7 +98,9 @@ export default {
 			"recharge-amount-placeholder": "Please enter the top up account",
 			"upload": "Upload payment screenshot",
 			"complete-top-up": "I have completed the recharge",
-			"steps": "The steps"
+			"steps": "The steps",
+			"copySuccess" : "Copy success",
+			"success" : "Recharge successfully"
 		},
 		"withdraw": {
 			"balance": "Balance",
@@ -162,6 +165,15 @@ export default {
 			"confirm_pay": "Do you confirm payment?",
 			"ok": "Confirm",
 			"no": "Cancel",
+		},
+		"prizeDraw" : {
+			"title" : "Matching",
+			"recharge" : "Need to recharge",
+			"commission" : "Commission",
+			"time" : "Time",
+			"number" : "Number",
+			"submit" : "Submit",
+			"unit" : "USD"
 		}
 	}
 }
\ No newline at end of file
diff --git a/locale/es.js b/locale/es.js
index 05a2f84..458ce28 100644
--- a/locale/es.js
+++ b/locale/es.js
@@ -71,7 +71,8 @@ export default {
 			"unit": "USD",
 			"today-income": "Ingresos de hoy",
 			"completed": "¡Reserva completada!",
-			"auto-match": "Auto-match"
+			"auto-match": "Auto-match",
+			"payment-success": "Payment Success corresponde"
 		},
 		"center": {
 			"phone": "teléfono",
@@ -97,7 +98,9 @@ export default {
 			"recharge-amount-placeholder": "Por favor, ingrese la cuenta de recarga",
 			"upload": "Subir captura de pantalla de pago",
 			"complete-top-up": "He completado la recarga",
-			"steps": "Los pasos"
+			"steps": "Los pasos",
+			"copySuccess": "Copia exitosa",
+			"success": "Recarga realizada exitosamente"
 		},
 		"withdraw": {
 			"balance": "Saldo",
@@ -162,6 +165,15 @@ export default {
 			"confirm_pay": "¿Confirma el pago?",
 			"ok": "Confirmar",
 			"no": "Cancelar"
+		},
+		"prizeDraw": {
+			"title": "Coincidencia",
+			"recharge": "Necesita recargar",
+			"commission": "Comisión",
+			"time": "Tiempo",
+			"number": "Número",
+			"submit": "Enviar",
+			"unit": "USD"
 		}
 	}
 }
\ No newline at end of file
diff --git a/locale/fr.js b/locale/fr.js
index 7c20807..9a98e4d 100644
--- a/locale/fr.js
+++ b/locale/fr.js
@@ -71,7 +71,8 @@ export default {
 			"unit": "USD",
 			"today-income": "Revenus d'aujourd'hui",
 			"completed": "Réservation complétée!",
-			"auto-match": "Auto-match"
+			"auto-match": "Auto-match",
+			"payment-success": "Payment success correspond à"
 		},
 		"center": {
 			"phone": "Téléphone",
@@ -97,7 +98,9 @@ export default {
 			"recharge-amount-placeholder": "Veuillez entrer le compte de recharge",
 			"upload": "Télécharger la capture d'écran du paiement",
 			"complete-top-up": "J'ai complété le recharge",
-			"steps": "Les étapes"
+			"steps": "Les étapes",
+			"copySuccess": "Copie réussie",
+			"success": "Recharge réussie"
 		},
 		"withdraw": {
 			"balance": "Solde",
@@ -162,6 +165,15 @@ export default {
 			"confirm_pay": "Confirmez-vous le paiement ?",
 			"ok": "Confirmer",
 			"no": "Annuler"
+		},
+		"prizeDraw": {
+			"title": "Correspondance",
+			"recharge": "Besoin de recharger",
+			"commission": "Commission",
+			"time": "Temps",
+			"number": "Numéro",
+			"submit": "Soumettre",
+			"unit": "USD"
 		}
 	}
 }
\ No newline at end of file
diff --git a/locale/ru.js b/locale/ru.js
index f3510bf..bdc4e98 100644
--- a/locale/ru.js
+++ b/locale/ru.js
@@ -71,7 +71,8 @@ export default {
 			"unit": "USD",
 			"today-income": "Сегодняшний доход",
 			"completed": "Бронирование завершено!",
-			"auto-match": "Автоматический сопоставление"
+			"auto-match": "Автоматический сопоставление",
+			"payment-success": "Payment Success Соответствие"
 		},
 		"center": {
 			"phone": "телефон",
@@ -97,7 +98,9 @@ export default {
 			"recharge-amount-placeholder": "Пожалуйста, введите сумма пополнения",
 			"upload": "Загрузить скриншот платежа",
 			"complete-top-up": "Я завершил пополнение",
-			"steps": "Шаги"
+			"steps": "Шаги",
+			"copySuccess": "Копирование успешно",
+			"success": "Пополнение успешно"
 		},
 		"withdraw": {
 			"balance": "Баланс",
@@ -162,6 +165,15 @@ export default {
 			"confirm_pay": "Вы подтверждаете оплату?",
 			"ok": "Подтвердить",
 			"no": "Отмена"
+		},
+		"prizeDraw": {
+			"title": "Совпадение",
+			"recharge": "Необходимо пополнить",
+			"commission": "Комиссия",
+			"time": "Время",
+			"number": "Номер",
+			"submit": "Отправить",
+			"unit": "USD"
 		}
 	}
 }
\ No newline at end of file
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 5dc0f17..48a0202 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -20,10 +20,11 @@
 		</view>
 
 		<view class="swiper">
-			<swiper class="swiper-box" @change="swiperChange" :current="swiperDotIndex">
-				<swiper-item v-for="(item, index) in 3" :key="index">
+			<swiper class="swiper-box" :current="swiperDotIndex" autoplay circular>
+				<swiper-item v-for="(item,index) in shopList" :key="index">
 					<view class="swiper-item">
-						<image src="@/static/home/product.jpg" mode="widthFix"></image>
+						{{ item.image }}
+						<image :src="item.image" mode="widthFix"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -46,15 +47,12 @@
 		</view>
 		
 		<view class="roll">
-			<virtualScroll></virtualScroll>
+			<virtualScroll :listData="scrollList"></virtualScroll>
 		</view>
 
 
 		<sTabbar select="0" />
 
-		<!-- 客服列表 -->
-		<serviceList :show="showService" :serverList="serverList" @close="closeServiceList"></serviceList>
-
 		<!-- 弹窗 -->
 		<popUpWindow :show="showPopUp" @close="closePopUp"></popUpWindow>
 
@@ -79,23 +77,17 @@
 		},
 		data() {
 			return {
-				showService: false,
-				menuTitles: ['CustomerService', 'Certifcate', 'Deposit', 'Withdraw'],
-				agreementTitles: ['agreement_item_1', 'agreement_item_2', 'agreement_item_3', 'agreement_item_4'],
-				serverList: [],
-				outList: [],
-				vipList: [],
-				userInfo: {},
-				vipInfo: {},
-				// showPopUp: uni.getStorageSync('clickPopUp') ? false : true,
-				showPopUp: false,
-				showLanguage: false,
-
-				swiperDotIndex: 0
+				showPopUp: false,		//是否显示弹窗
+				showLanguage: false,		//是否显示切换语言
+
+				swiperDotIndex: 0,		//当前轮播图index
+				shopList : [],		//商品列表
+				scrollList : [],		//提现滚动列表
 			}
 		},
 		onShow() {
-
+			this.getShopList()
+			this.getIndexScroll()
 		},
 		methods: {
 			//关闭语言选项
@@ -103,6 +95,20 @@
 				this.$play()
 				this.showLanguage = false;
 			},
+			
+			//获取商品轮播
+			getShopList(){
+				this.request('shopPage').then(res => {
+					this.shopList = res.result.records
+				})
+			},
+			
+			//获取首页提现滚动
+			getIndexScroll(){
+				this.request('getIndexScroll').then(res => {
+					this.scrollList = res.result
+				})
+			}
 		}
 	}
 </script>
@@ -193,7 +199,7 @@
 				color: #fff;
 				
 				image {
-					width: 30%;
+					width: 50%;
 				}
 			}
 			
@@ -201,6 +207,8 @@
 
 		.about-us ,
 		.roll {
+			display: flex;
+			align-items: center;
 			background-image: url('@/static/home/bg.jpeg');
 			background-size: 100%;
 			height: 400rpx;
diff --git a/pages/modifyUser/modifyUser.vue b/pages/modifyUser/modifyUser.vue
index cac360f..14f6912 100644
--- a/pages/modifyUser/modifyUser.vue
+++ b/pages/modifyUser/modifyUser.vue
@@ -2,53 +2,49 @@
 <template>
 	<view class="modify-user">
 		<navbar :leftClick="leftClick"></navbar>
-		
+
 		<view class="edit-user content" v-if="$route.query.type == 2">
 			<view class="edit-list">
 				<view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.network') }}</view>
-					<input type="text" 
-					disabled
-					value="USDT-TRC20"/>
+					<input type="text" disabled value="USDT-TRC20" />
 				</view>
-				
+
 				<view class="edit-item">
 					<view class="title">{{ $t('page.center.wallet') }}</view>
-					<input type="text" 
-					:placeholder="$t('page.modifyUser.wallet-placeholder')" 
-					v-model="form.newPassword"/>
+					<input type="text" :placeholder="$t('page.modifyUser.wallet-placeholder')"
+						v-model="form.moneyAddress" />
 				</view>
-				
+
 				<view class="edit-item">
-					<view class="title">{{ $t('page.center.Payment') }}</view>
-					<input type="text" 
-					:placeholder="$t('page.modifyUser.payment-placeholder')" 
-					v-model="form.confirmNewPassword"/>
+					<view class="title">{{ $t('page.modifyUser.payment') }}</view>
+					<input type="text" :placeholder="$t('page.modifyUser.payment-placeholder')"
+						v-model="form.confirmNewPassword" />
 				</view>
 			</view>
 		</view>
-		
-		
+
+
 		<!-- 修改pin -->
 		<view class="edit-user content" v-else>
 			<view class="edit-list">
 				<view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.oldPassword') }}</view>
-					<input type="text" v-model="form.oldPassword"/>
+					<input type="text" v-model="form.oldPassword" />
 				</view>
-				
+
 				<view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.newPassword') }}</view>
-					<input type="text" v-model="form.newPassword"/>
+					<input type="text" v-model="form.newPassword" />
 				</view>
-				
+
 				<!-- <view class="edit-item">
 					<view class="title">{{ $t('page.modifyUser.confirmNewPassword') }}</view>
 					<input type="text" :placeholder="$t('page.modifyUser.newPassword')" v-model="form.confirmNewPassword"/>
 				</view> -->
 			</view>
 		</view>
-		
+
 		<!-- <view class="box">
 			<view class="edit-item">
 				<view class="title">{{ $t('page.modifyUser.oldPassword') }}</view>
@@ -60,10 +56,10 @@
 				<input type="text" :placeholder="$t('page.modifyUser.newPasswordPlaceholder')" v-model="form.newPassword"/>
 			</view>
 		</view> -->
-		
+
 		<!-- 提交按钮 -->
 		<view class="confirm content" @click="submit">{{ $t('page.modifyUser.confirm') }}</view>
-		
+
 		<!-- 提示信息 -->
 		<!-- <view class="tips content">{{ $t(`page.modifyUser.${tips[$route.query.type]}`) }}</view> -->
 	</view>
@@ -71,43 +67,42 @@
 
 <script>
 	import navbar from '@/components/base/m-navbar.vue'
-	
+
 	export default {
-		components : { navbar },
-		data(){
+		components: {
+			navbar
+		},
+		data() {
 			return {
-				titles : ['editPinTitle','editPasswordTitle'],
-				tips : ['pinTips','passwordTips'],
-				form : {
-					oldPassword : '',
-					newPassword : '',
-					confirmNewPassword : '',
+				titles: ['editPinTitle', 'editPasswordTitle'],
+				tips: ['pinTips', 'passwordTips'],
+				form: {
+					oldPassword: '',
+					newPassword: '',
+					confirmNewPassword: '',
+					moneyAddress : ''
 				}
 			}
 		},
-		methods : {
+		methods: {
 			leftClick() {
 				uni.navigateTo({
 					url: '/pages/center/center'
 				})
 			},
-			
+
 			//提交
-			submit(){
+			submit() {
 				this.$play()
-				if (this.form.oldPassword.trim() === '') return uni.$u.toast(this.$t('page.modifyUser.oldPasswordToast'))
-				else if (this.form.newPassword.trim() === '') return uni.$u.toast(this.$t('page.modifyUser.newPasswordToast'))
-				else if (this.form.confirmNewPassword.trim() === '') return uni.$u.toast(this.$t('page.modifyUser.confirmNewPasswordToast'))
-				else if (this.form.confirmNewPassword.trim() != this.form.newPassword.trim()) return uni.$u.toast(this.$t('page.modifyUser.notPasswordToast'))
-				
-				
-				if(this.$route.query.type == 0){	//修改pin逻辑
+
+
+				if (this.$route.query.type == 0) { //修改pin逻辑
 					this.request('editPayPass', {}, {
-						oldPayPass : this.form.oldPassword,
-						payPass : this.form.newPassword,
-						okPayPass : this.form.confirmNewPassword,
+						oldPayPass: this.form.oldPassword,
+						payPass: this.form.newPassword,
+						okPayPass: this.form.confirmNewPassword,
 					}).then(res => {
-						if(res.code == 200){
+						if (res.code == 200) {
 							console.log(res.message);
 							uni.$u.toast(this.$t(`message.${res.message}`))
 							setTimeout(() => uni.navigateTo({
@@ -115,19 +110,30 @@
 							}), 1000)
 						}
 					})
-				}else{		//修改密码逻辑
+				} else if (this.$route.query.type == 1) { //修改密码逻辑
 					this.request('editPass', {}, {
-						oldPass : this.form.oldPassword,
-						password : this.form.newPassword,
-						okPassword : this.form.confirmNewPassword,
+						oldPass: this.form.oldPassword,
+						password: this.form.newPassword,
+						okPassword: this.form.confirmNewPassword,
 					}).then(res => {
-						if(res.code == 200){
+						if (res.code == 200) {
 							uni.$u.toast(this.$t(`message.${res.message}`))
 							setTimeout(() => uni.navigateTo({
 								url: '/pages/personalInfo/personalInfo'
 							}), 1000)
 						}
 					})
+				} else {		//修改钱包地址
+					this.request('editMoneyAddress', {}, {
+						moneyAddress : this.form.moneyAddress
+					}).then(res => {
+						if (res.code == 200) {
+							uni.$u.toast(this.$t(`message.${res.message}`))
+							setTimeout(() => uni.navigateTo({
+								url: '/pages/center/center'
+							}), 500)
+						}
+					})
 				}
 			}
 		}
@@ -135,41 +141,41 @@
 </script>
 
 <style lang="scss" scoped>
-	.modify-user{
+	.modify-user {
 		width: 750rpx;
 		min-height: 100vh;
 		// background-color: black;
 		margin: 0 auto;
 		background-size: 100%;
 		background-repeat: no-repeat;
-		
+
 		.content {
 			width: 96%;
 			margin: 0 auto;
 		}
-		
-		
-		.edit-user{
+
+
+		.edit-user {
 			padding-top: 20rpx;
-			
-			.edit-list{
-				
-				.edit-item{
+
+			.edit-list {
+
+				.edit-item {
 					box-sizing: border-box;
 					padding: 15rpx;
 					display: flex;
 					align-items: center;
-					
+
 					border-bottom: 1px solid #33333333;
-					
-					.title{
+
+					.title {
 						color: $uni-text-color;
 						font-size: 28rpx;
 						margin-top: 10rpx;
 						min-width: 25%;
 					}
-					
-					input{
+
+					input {
 						color: $uni-text-color;
 						text-indent: 1em;
 						height: 60rpx;
@@ -179,8 +185,8 @@
 				}
 			}
 		}
-		
-		.confirm{
+
+		.confirm {
 			display: flex;
 			align-items: center;
 			justify-content: center;
@@ -192,8 +198,8 @@
 			font-weight: bold;
 			color: $uni-text-color-inverse;
 		}
-		
-		.tips{
+
+		.tips {
 			color: rgb(191, 118, 112);
 			text-align: center;
 			font-size: 26rpx;
diff --git a/pages/purse/purse.vue b/pages/purse/purse.vue
index 7f7b0b8..a94176f 100644
--- a/pages/purse/purse.vue
+++ b/pages/purse/purse.vue
@@ -14,8 +14,8 @@
 		
 		<view class="purse-input content">
 			<view class="title">{{ $t('page.purse.recharge-address') }}</view>
-			<view class="text">TMzqKBCtFdjzCk293hLS4MgMJbppxUEhp8</view>
-			<view @click="copy('TMzqKBCtFdjzCk293hLS4MgMJbppxUEhp8')" class="btn">{{ $t('page.purse.copy') }}</view>
+			<view class="text">{{ userInfo.moneyAddress }}</view>
+			<view @click="copy(userInfo.moneyAddress)" class="btn">{{ $t('page.purse.copy') }}</view>
 		</view>
 		
 		<view class="purse-input content">
@@ -36,7 +36,7 @@
 		</view>
 		
 		<!-- 按钮 -->
-		<view class="submit-btn content">{{ $t('page.purse.complete-top-up') }}</view>
+		<view @click="recharge" class="submit-btn content">{{ $t('page.purse.complete-top-up') }}</view>
 		
 		<view class="steps content">
 			<view class="steps-title">{{ $t('page.purse.steps') }}</view>
@@ -74,11 +74,11 @@
 				money : '',
 				form : {
 					id : '',
-					image : '',
-					address : ''
+					image : ''
 				},
 				serverList : [],
-				showService : false
+				showService : false,
+				userInfo : {}
 			}
 		},
 		onShow() {
@@ -120,6 +120,7 @@
 			//充值
 			recharge(){
 				this.$play()
+				this.form.moneyAddress = this.userInfo.moneyAddress;
 				this.request('recharge2',{},this.form).then(res => {
 					if(res.code == 200){
 						uni.$u.toast(this.$t('page.purse.success'))
diff --git a/pages/starting/starting.vue b/pages/starting/starting.vue
index 05699ff..110b2b3 100644
--- a/pages/starting/starting.vue
+++ b/pages/starting/starting.vue
@@ -9,7 +9,7 @@
 			<view class="top">
 				<view class="current-balance">{{ $t('page.starting.balance') }}</view>
 				<view class="money">
-					<view class="number">0.00</view>
+					<view class="number">{{ userInfo.money }}</view>
 					<view class="unit">{{ $t('page.starting.unit') }}</view>
 				</view>
 			</view>
@@ -19,7 +19,7 @@
 					<view class="today-info-l">
 						<view class="today-income">{{ $t('page.starting.today-income') }}</view>
 						<div class="money">
-							<text class="number">0.00</text>
+							<text class="number">{{ userInfo.belece }}</text>
 							<text class="unit">{{ $t('page.starting.unit') }}</text>
 						</div>
 					</view>
@@ -27,14 +27,14 @@
 					<div class="booking-info-r">
 						<view class="booking-income">{{ $t('page.starting.completed') }}</view>
 						<div class="booking-data">
-							<text class="number">0/40</text>
+							<text class="number">{{ userInfo.encourageNum }}/{{ userInfo.encourageSum }}</text>
 						</div>
 					</div>
 				</view>
 			</view>
 
 			<view class="btn">
-				<view class="submit">{{ $t('page.starting.auto-match') }}</view>
+				<view @click="submit" class="submit">{{ $t('page.starting.auto-match') }}</view>
 			</view>
 		</view>
 
@@ -47,23 +47,57 @@
 		</view>
 		
 		<sTabbar select="2" />
+		
+		<prizeDraw ref="prizeDraw" @orderPay="orderPay"></prizeDraw>
 
 	</view>
 </template>
 
 <script>
 	import sTabbar from '@/components/base/tabBar.vue'
+	import prizeDraw from '@/components/prizeDraw/prizeDraw.vue'
 	
 	export default {
 		name: 'Starting',
-		components : { sTabbar },
+		components : { sTabbar , prizeDraw },
 		data() {
 			return {
-
+				userInfo : {}
 			}
 		},
+		onShow(){
+			this.getUserInfo()
+		},
 		methods: {
-
+			//点击抽奖按钮
+			submit(){
+				this.request('createOrder').then(res => {
+					this.$refs.prizeDraw.toggle(res.result)
+				})
+			},
+			
+			//获取用户信息
+			getUserInfo() {
+				this.request('userInfo').then(res => {
+					if (res.code == 200) {
+						this.userInfo = res.result.userInfo
+					}
+				})
+			},
+			
+			//订单支付
+			orderPay(id){
+				this.request('pay',{},{ id }).then(res => {
+					if (res.code == 200) {
+						uni.showToast({
+							icon: "none",
+							title: this.$t(`message.${res.message}`)
+						});
+						this.getUserInfo()
+						this.$refs.prizeDraw.close()
+					}
+				})
+			}
 		}
 	}
 </script>
@@ -84,7 +118,7 @@
 
 		.user-info {
 			position: relative;
-			z-index: 999;
+			z-index: 1;
 			width: 90%;
 			margin: -120rpx auto 0rpx auto;
 			background: white;
@@ -105,7 +139,7 @@
 
 				.money {
 					display: flex;
-					color: rgb(0, 208, 234);
+					    color: rgb(0, 208, 234);
 					font-size: 50rpx;
 					font-weight: bold;
 
@@ -142,7 +176,7 @@
 
 						.today-income,
 						.booking-income {
-							color: #8e8e98;
+							// color: #8e8e98;
 						}
 
 						.money,
@@ -158,7 +192,7 @@
 				padding: 20rpx;
 
 				.submit {
-					background: rgb(0, 208, 234);
+					background-color: rgb(0, 208, 234);
 					color: white;
 					height: 80rpx;
 					display: flex;
diff --git a/pages/withdraw/withdraw.vue b/pages/withdraw/withdraw.vue
index aa684e4..2663b58 100644
--- a/pages/withdraw/withdraw.vue
+++ b/pages/withdraw/withdraw.vue
@@ -19,7 +19,7 @@
 			<view style="font-size: 50rpx;font-weight: 900;
 			padding: 30rpx 0;display: flex;align-items: center;
 			">
-				<text style="padding-right: 40rpx;">{{ $t('page.withdraw.unit') }}</text> <input type="text" />
+				<text style="padding-right: 40rpx;">{{ $t('page.withdraw.unit') }}</text> <input v-model="form.money" type="text" />
 			</view>
 			<view class="info"
 			style="font-size: 22rpx;
@@ -31,7 +31,7 @@
 		</view>
 		<view class="box content">
 			<view class="title info">{{ $t('page.withdraw.payment-password') }}</view>
-			<input v-model="form.money" type="number" :placeholder="$t('page.withdraw.payment_passwrod-placeholder')"/>
+			<input v-model="form.payPass" type="number" :placeholder="$t('page.withdraw.payment_passwrod-placeholder')"/>
 		</view>
 		
 		<!-- <view class="withdraw-amount content">
@@ -87,8 +87,8 @@
 				money : '',
 				form : {
 					money : '',	//提现金额
-					// payPass : '',
-					address : ''
+					payPass : '',
+					// address : ''
 				},
 				vipInfo : {},
 				showModal : false,		//是否显示超出最大提现金额提示
@@ -154,7 +154,7 @@
 				// }
 				this.request('withdrawal2',{},this.form).then(res => {
 					if(res.code == 200){
-						uni.$u.toast(this.$t('page.withdraw.successfulWithdrawal'))
+						uni.$u.toast(this.$t(`message.${res.message}`))
 						this.cleanForm()
 						this.revealServiceList()
 						this.getUserInfo()		//刷新用户信息(更新用户余额)
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..decd775
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,84 @@
+## 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..6ef26a2
--- /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..08707d4
--- /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..91370a8
--- /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..f7e667c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,187 @@
+<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 {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'ali'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.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..7f1bd06
--- /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..de7509c
--- /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..5e3003c
--- /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..13e39eb
--- /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..62dda46
--- /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..c4e5781
--- /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..8349e99
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,503 @@
+<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 = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				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(() => {
+					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.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			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.showPopup = true
+				this.showTrans = true
+			},
+			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.showPopup = true
+				this.showTrans = true
+			},
+			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.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..3cfa384
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,88 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.9.1",
+	"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"
+				},
+				"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