From d982086179708a2c213d10feabce4b8406fb3bd1 Mon Sep 17 00:00:00 2001
From: linju <linju@dcloud.io>
Date: Fri, 3 Feb 2023 14:45:54 +0800
Subject: [PATCH] v1.1.1

---
 manifest.json                                 |   2 +-
 uni_modules/uni-id-pages/changelog.md         |   2 +-
 .../uni-id-pages/common/login-page.mixin.js   |   3 +-
 .../uni-id-pages-avatar.vue                   |  89 +-
 .../uni-id-pages-fab-login.vue                |  21 -
 .../uni-id-pages-user-profile.vue             | 171 ----
 uni_modules/uni-id-pages/package.json         |   2 +-
 .../pages/login/login-withoutpwd.vue          | 468 ++++-----
 .../uni-id-pages/pages/userinfo/userinfo.vue  | 500 ++++-----
 .../database/uni-id-users.schema.json         |  13 +-
 uni_modules/uni-popup/changelog.md            |   6 +
 .../uni-popup-dialog/uni-popup-dialog.vue     |   8 +-
 .../components/uni-popup/uni-popup.vue        | 946 +++++++++---------
 uni_modules/uni-popup/package.json            |  13 +-
 14 files changed, 1057 insertions(+), 1187 deletions(-)
 delete mode 100644 uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue

diff --git a/manifest.json b/manifest.json
index 01a379a..62aa7da 100644
--- a/manifest.json
+++ b/manifest.json
@@ -107,7 +107,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx1002f172d7719592",
+        "appid" : "wx999bf02c8e05dfc9",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/uni_modules/uni-id-pages/changelog.md b/uni_modules/uni-id-pages/changelog.md
index 551506a..9b1fe26 100644
--- a/uni_modules/uni-id-pages/changelog.md
+++ b/uni_modules/uni-id-pages/changelog.md
@@ -1,5 +1,5 @@
 ## 1.1.1（2023-02-02）
-- 修复 Vue3下 一键登录条款勾选框选中状态未同步到页面 的问题
+- 新增 微信小程序端 支持选择使用微信资料的“头像”和“昵称” 设置用户资料 [详情参考](https://wdoc-76491.picgzc.qpic.cn/MTY4ODg1MDUyNzQyMDUxNw_21263_rTNhg68FTngQGdvQ_1647431233?w=1280&h=695.7176470588236)
 ## 1.1.0（2023-01-31）
 - 【重要】优化 小程序端资源包大小（运行时大小为：731KB，发行后为：583KB；注：可以直接将本插件作为分包使用）
 - 更新 微信小程序端 上传头像功能 用`wx.cropImage`实现图片裁剪
diff --git a/uni_modules/uni-id-pages/common/login-page.mixin.js b/uni_modules/uni-id-pages/common/login-page.mixin.js
index a30aafd..26936db 100644
--- a/uni_modules/uni-id-pages/common/login-page.mixin.js
+++ b/uni_modules/uni-id-pages/common/login-page.mixin.js
@@ -67,8 +67,7 @@ let mixin = {
 					}
 				}
 			},
-			set(agree) {
-				console.log('set(agree)',agree);
+			set(agree) {
 				if (this.$refs.agreements) {
 					this.$refs.agreements.isAgree = agree
 				} else {
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
index 694594a..5f0cc66 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue
@@ -1,9 +1,9 @@
 <template>
-	<view @click="uploadAvatarImg" class="box" :class="{'showBorder':border}"  :style="{width,height,lineHeight:height}">
+	<button open-type="chooseAvatar" @chooseavatar="bindchooseavatar" @click="uploadAvatarImg" class="box" :class="{'showBorder':border}"  :style="{width,height,lineHeight:height}">
 		<cloud-image v-if="avatar_file" :src="avatar_file.url" :width="width" :height="height"></cloud-image>
 		<uni-icons v-else :style="{width,height,lineHeight:height}" class="chooseAvatar" type="plusempty" size="30"
 			color="#dddddd"></uni-icons>
-	</view>
+	</button>
 </template>
 
 <script>
@@ -65,13 +65,71 @@
 			setAvatarFile(avatar_file) {
 				// 使用 clientDB 提交数据
 				mutations.updateUserInfo({avatar_file})
+			},
+			async bindchooseavatar(res){
+				let avatarUrl = res.detail.avatarUrl
+				let avatar_file = {
+					extname: avatarUrl.split('.')[avatarUrl.split('.').length - 1],
+					name:'',
+					url:avatarUrl
+				}
+				
+				// 裁剪
+				let filePath = await new Promise((callback) => {
+					wx.cropImage({
+						src:avatarUrl,
+						cropScale:"1:1",
+						success: res => {
+							callback(res.tempFilePath)
+						},
+						fail(e){
+							console.error(e)
+							uni.showModal({
+								content: 'wx.cropImage ' + e.errMsg,
+								showCancel: false,
+								confirmText:"跳过裁剪",
+								complete() {
+									callback(avatarUrl)
+								}
+							});
+						}
+					})
+				})
+				
+				//上传到服务器
+				let cloudPath = this.userInfo._id + '' + Date.now()
+				avatar_file.name = cloudPath
+				try{
+					uni.showLoading({
+						title: "更新中",
+						mask: true
+					});
+					let {
+						fileID
+					} = await uniCloud.uploadFile({
+						filePath,
+						cloudPath,
+						fileType: "image"
+					});
+					avatar_file.url = fileID
+					uni.hideLoading()
+				}catch(e){
+					console.error(e);
+				}
+				this.setAvatarFile(avatar_file)
 			},
 			uploadAvatarImg(res) {
+				
+				// #ifdef MP-WEIXIN
+				return false // 微信小程序走 bindchooseavatar方法
+				// #endif
+				
 				if(!this.hasLogin){
 					return uni.navigateTo({
 						url:'/uni_modules/uni-id-pages/pages/login/login-withoutpwd'
 					})
-				}
+				}
+				
 				const crop = {
 					quality: 100,
 					width: 600,
@@ -113,27 +171,6 @@
 								});
 							}
 							// #endif
-							
-							// #ifdef MP-WEIXIN
-							wx.cropImage({
-								src:filePath,
-								cropScale:"1:1",
-								success: res => {
-									callback(res.tempFilePath)
-								},
-								fail(e){
-									console.error(e)
-									uni.showModal({
-										content: 'wx.cropImage ' + e.errMsg,
-										showCancel: false,
-										confirmText:"跳过裁剪",
-										complete() {
-											callback(filePath)
-										}
-									});
-								}
-							})
-							// #endif
 						})
 						// #endif
 						
@@ -166,13 +203,15 @@
 		overflow: hidden;
 	}
 	/* #endif */
+	.box{
+		padding: 0;
+	}
 	
 	.chooseAvatar {
 		/* #ifndef APP-NVUE */
 		display: inline-block;
 		box-sizing: border-box;
 		/* #endif */
-		border: dotted 1px #ddd;
 		border-radius: 10px;
 		text-align: center;
 		padding: 1px;
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
index 2cf1ba9..9a10443 100644
--- a/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
+++ b/uni_modules/uni-id-pages/components/uni-id-pages-fab-login/uni-id-pages-fab-login.vue
@@ -7,9 +7,6 @@
 				<text class="login-title">{{item.text}}</text>
 			</view>
 		</view>
-		<!-- #ifdef MP-WEIXIN -->
-		<uni-id-pages-user-profile @next="doUserProfileNext" ref="userProfile"></uni-id-pages-user-profile>
-		<!-- #endif -->
 	</view>
 </template>
 <script>
@@ -442,17 +439,6 @@
 						icon: 'none',
 						duration: 2000
 					});
-					// #ifdef MP-WEIXIN
-					//如果是微信小程序端的微信登录，且为首次登录，就弹出获取微信昵称+头像用于绑定资料
-					if (['weixin', 'weixinMobile'].includes(type) && result.type == "register") {
-						mutations.loginSuccess({
-							...result,
-							showToast: false,
-							autoBack: false
-						})
-						return this.$refs.userProfile.open(result.uid)
-					}
-					// #endif
 					// #ifdef H5
 					result.loginType = type
 					// #endif
@@ -472,13 +458,6 @@
 					uni.hideLoading()
 				})
 			},
-			doUserProfileNext() {
-				try {
-					mutations.loginSuccess()
-				} catch (e) {
-					console.log(e);
-				}
-			},
 			async getUserInfo(e) {
 				return new Promise((resolve, reject) => {
 					uni.getUserInfo({
diff --git a/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue b/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue
deleted file mode 100644
index 7b78f9b..0000000
--- a/uni_modules/uni-id-pages/components/uni-id-pages-user-profile/uni-id-pages-user-profile.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-	<uni-popup ref="popup" type="bottom">
-		<view class="box">
-			<text class="headBox">绑定资料</text>
-			<text class="tip">获取你的微信头像和昵称，完善你的个人资料</text>
-			<view class="btnBox">
-				<text @click="closeMe" class="close">关闭</text>
-				<button class="agree uni-btn" type="primary" @click="getUserProfile">确定</button>
-			</view>
-		</view>
-	</uni-popup>
-</template>
-
-<script>
-	const db = uniCloud.database();
-	const usersTable = db.collection('uni-id-users')
-	let userId = ''
-	export default {
-		emits:['next'],
-		data() {
-			return {}
-		},
-		methods: {
-			async open(uid){
-				userId = uid
-				this.$refs.popup.open()
-			},
-			async getUserProfile(){
-				uni.showLoading();
-				let res = await new Promise((callBack) => {
-					uni.getUserProfile({
-						desc: "用于设置账户昵称和头像",
-						complete: (e) => {
-							callBack(e)
-						}
-					})
-				})
-				if(res.errMsg != "getUserProfile:ok"){
-					return this.closeMe()
-				}
-				let {avatarUrl,nickName} = res.userInfo;
-				
-				let tempFilePath = await new Promise((callBack)=>{
-					uni.downloadFile({
-					    url: avatarUrl,
-					    success: (res) => {
-								if (res.statusCode === 200) {
-					            // console.log('下载成功');
-									callBack(res.tempFilePath)
-								}
-							callBack()
-					    },
-						fail: (err) => {
-							console.error(err)
-						},
-						complete: (e) => {
-							// console.log("downloadFile",e);
-						}
-					});
-				})
-				const extName = tempFilePath.split('.').pop() || 'jpg'
-				const cloudPath = 'user/avatar/'+ userId+'/'+Date.now()+'-avatar.'+extName;
-				const result = await uniCloud.uploadFile({
-					filePath: tempFilePath,
-					cloudPath,
-					fileType:'image'
-				});
-				let userInfo = {
-					"nickname":nickName,
-					"avatar_file":{
-						name:cloudPath,
-						extname:"jpg",
-						url:result.fileID
-					}
-				}
-				this.doUpdate(userInfo,()=>{
-					this.$refs.popup.close()
-				})
-			},
-			closeMe(e){
-				uni.showLoading();
-				this.doUpdate({nickname:"匿名微信用户"},()=>{
-					uni.hideLoading()
-					this.$refs.popup.close()
-				})
-			},
-			doUpdate(data,callback){
-				// 使用 clientDB 提交数据
-				usersTable.where('_id==$env.uid').update(data).then((res) => {
-					callback(res)
-				}).catch((err) => {
-					uni.showModal({
-						content: err.message || '请求服务失败',
-						showCancel: false
-					})
-					callback(err)
-				}).finally(() => {
-					this.$emit('next')
-					uni.hideLoading()
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-view{
-	display: flex;
-}
-.box{
-	background-color: #FFFFFF;
-	height:200px;
-	width: 750rpx;
-	flex-direction: column;
-	border-top-left-radius: 15px;
-	border-top-right-radius: 15px;
-}
-.headBox{
-	padding:20rpx;
-	height:80rpx;
-	line-height:80rpx;
-	text-align: left;
-	font-size:16px;
-	color:#333333;
-	margin-left: 15rpx;
-}
-.tip{
-	color:#666666;
-	text-align: left;
-	justify-content: center;
-	margin:10rpx 30rpx;
-	font-size:18px;
-}
-.btnBox{
-	margin-top:45rpx;
-	justify-content: center;
-	flex-direction: row;
-}
-.close,.agree{
-	text-align: center;
-	width:200rpx;
-	height:80upx;
-	line-height:80upx;
-	border-radius:5px;
-	margin:0 20rpx;
-	font-size:14px;
-}
-.close{
-	color:#999999;
-	border-color: #EEEEEE;
-	border-style: solid;
-	border-width: 1px;
-	background-color:#FFFFFF;
-}
-.close:active{
-	color:#989898;
-	background-color:#E2E2E2;
-}
-.agree{
-	color:#FFFFFF;
-}
-/* #ifdef MP */
-.agree::after {
-   border: none;
-}
-/* #endif */
-.agree:active{
-	background-color:#F5F5F6;
-}
-</style>
diff --git a/uni_modules/uni-id-pages/package.json b/uni_modules/uni-id-pages/package.json
index 1c8e2ff..fef8199 100644
--- a/uni_modules/uni-id-pages/package.json
+++ b/uni_modules/uni-id-pages/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
         "用户管理",
diff --git a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
index 99f72d9..5e88727 100644
--- a/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
+++ b/uni_modules/uni-id-pages/pages/login/login-withoutpwd.vue
@@ -1,241 +1,241 @@
-<!-- 免密登录页 -->
-<template>
-	<view class="uni-content">
-		<view class="login-logo">
-			<image :src="logo"></image>
-		</view>
-		<!-- 顶部文字 -->
-		<text class="title">请选择登录方式</text>
-		<!-- 快捷登录框 当url带参数时有效 -->
-		<template v-if="['apple','weixin', 'weixinMobile'].includes(type)">
-			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
-			<view class="quickLogin">
-				<image v-if="type !== 'weixinMobile'" @click="quickLogin" :src="imgSrc" mode="widthFix"
-					class="quickLoginBtn"></image>
-				<button v-else type="primary" open-type="getPhoneNumber" @getphonenumber="quickLogin"
-					class="uni-btn">微信授权手机号登录</button>
-				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
-			</view>
-		</template>
-		<template v-else>
-			<text class="tip">未注册的账号验证通过后将自动注册</text>
-			<view class="phone-box">
-				<view @click="chooseArea" class="area">+86</view>
-				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number"
-					:inputBorder="false" v-model="phone" maxlength="11" placeholder="请输入手机号" />
-			</view>
-			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
-			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
-		</template>
-		<!-- 固定定位的快捷登录按钮 -->
-		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
-	</view>
-</template>
-
-<script>
-	let currentWebview; //当前窗口对象
-	import config from '@/uni_modules/uni-id-pages/config.js'
-	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
-	export default {
-		mixins: [mixin],
-		data() {
-			return {
-				type: "", //快捷登录方式
-				phone: "", //手机号码
-				focusPhone: false,
-				logo: "/static/logo.png"
-			}
-		},
-		computed: {
-			async loginTypes() { //读取配置的登录优先级
-				return config.loginTypes
-			},
-			isPhone() { //手机号码校验正则
-				return /^1\d{10}$/.test(this.phone);
-			},
-			imgSrc() { //大快捷登录按钮图
-				return this.type == 'weixin' ? '/uni_modules/uni-id-pages/static/login/weixin.png' :
-					'/uni_modules/uni-id-pages/static/app-plus/apple.png'
-			}
-		},
-		async onLoad(e) {
-			//获取通过url传递的参数type设置当前登录方式，如果没传递直接默认以配置的登录
-			let type = e.type || config.loginTypes[0]
-			this.type = type
-
-			// console.log("this.type: -----------",this.type);
-			if (type != 'univerify') {
-				this.focusPhone = true
-			}
-			this.$nextTick(() => {
-				//关闭重复显示的登录快捷方式
-				if (['weixin', 'apple'].includes(type)) {
-					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>
-						item.id != type)
-				}
-			})
-			uni.$on('uni-id-pages-setLoginType', type => {
-				this.type = type
-			})
-		},
-		onShow() {
-			// #ifdef H5
-			document.onkeydown = event => {
-				var e = event || window.event;
-				if (e && e.keyCode == 13) { //回车键的键值为13
-					this.toSmsPage()
-				}
-			};
-			// #endif
-		},
-		onUnload() {
-			uni.$off('uni-id-pages-setLoginType')
-		},
-		onReady() {
-			// 是否优先启动一键登录。即：页面一加载就启动一键登录
-			//#ifdef APP-PLUS
-			if (this.type == "univerify") {
-				const pages = getCurrentPages();
-				currentWebview = pages[pages.length - 1].$getAppWebview();
-				currentWebview.setStyle({
-					"top": "2000px" // 隐藏当前页面窗体
-				})
-				this.type == this.loginTypes[1]
-				// console.log('开始一键登录');
-				this.$refs.uniFabLogin.login_before('univerify')
-			}
-			//#endif
-		},
+<!-- 免密登录页 -->
+<template>
+	<view class="uni-content">
+		<view class="login-logo">
+			<image :src="logo"></image>
+		</view>
+		<!-- 顶部文字 -->
+		<text class="title">请选择登录方式</text>
+		<!-- 快捷登录框 当url带参数时有效 -->
+		<template v-if="['apple','weixin', 'weixinMobile'].includes(type)">
+			<text class="tip">将根据第三方账号服务平台的授权范围获取你的信息</text>
+			<view class="quickLogin">
+				<image v-if="type !== 'weixinMobile'" @click="quickLogin" :src="imgSrc" mode="widthFix"
+					class="quickLoginBtn"></image>
+				<button v-else type="primary" open-type="getPhoneNumber" @getphonenumber="quickLogin"
+					class="uni-btn">微信授权手机号登录</button>
+				<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			</view>
+		</template>
+		<template v-else>
+			<text class="tip">未注册的账号验证通过后将自动注册</text>
+			<view class="phone-box">
+				<view @click="chooseArea" class="area">+86</view>
+				<uni-easyinput :focus="focusPhone" @blur="focusPhone = false" class="input-box" type="number"
+					:inputBorder="false" v-model="phone" maxlength="11" placeholder="请输入手机号" />
+			</view>
+			<uni-id-pages-agreements scope="register" ref="agreements"></uni-id-pages-agreements>
+			<button class="uni-btn" type="primary" @click="toSmsPage">获取验证码</button>
+		</template>
+		<!-- 固定定位的快捷登录按钮 -->
+		<uni-id-pages-fab-login ref="uniFabLogin"></uni-id-pages-fab-login>
+	</view>
+</template>
+
+<script>
+	let currentWebview; //当前窗口对象
+	import config from '@/uni_modules/uni-id-pages/config.js'
+	import mixin from '@/uni_modules/uni-id-pages/common/login-page.mixin.js';
+	export default {
+		mixins: [mixin],
+		data() {
+			return {
+				type: "", //快捷登录方式
+				phone: "", //手机号码
+				focusPhone: false,
+				logo: "/static/logo.png"
+			}
+		},
+		computed: {
+			async loginTypes() { //读取配置的登录优先级
+				return config.loginTypes
+			},
+			isPhone() { //手机号码校验正则
+				return /^1\d{10}$/.test(this.phone);
+			},
+			imgSrc() { //大快捷登录按钮图
+				return this.type == 'weixin' ? '/uni_modules/uni-id-pages/static/login/weixin.png' :
+					'/uni_modules/uni-id-pages/static/app-plus/apple.png'
+			}
+		},
+		async onLoad(e) {
+			//获取通过url传递的参数type设置当前登录方式，如果没传递直接默认以配置的登录
+			let type = e.type || config.loginTypes[0]
+			this.type = type
+
+			// console.log("this.type: -----------",this.type);
+			if (type != 'univerify') {
+				this.focusPhone = true
+			}
+			this.$nextTick(() => {
+				//关闭重复显示的登录快捷方式
+				if (['weixin', 'apple'].includes(type)) {
+					this.$refs.uniFabLogin.servicesList = this.$refs.uniFabLogin.servicesList.filter(item =>
+						item.id != type)
+				}
+			})
+			uni.$on('uni-id-pages-setLoginType', type => {
+				this.type = type
+			})
+		},
+		onShow() {
+			// #ifdef H5
+			document.onkeydown = event => {
+				var e = event || window.event;
+				if (e && e.keyCode == 13) { //回车键的键值为13
+					this.toSmsPage()
+				}
+			};
+			// #endif
+		},
+		onUnload() {
+			uni.$off('uni-id-pages-setLoginType')
+		},
+		onReady() {
+			// 是否优先启动一键登录。即：页面一加载就启动一键登录
+			//#ifdef APP-PLUS
+			if (this.type == "univerify") {
+				const pages = getCurrentPages();
+				currentWebview = pages[pages.length - 1].$getAppWebview();
+				currentWebview.setStyle({
+					"top": "2000px" // 隐藏当前页面窗体
+				})
+				this.type == this.loginTypes[1]
+				// console.log('开始一键登录');
+				this.$refs.uniFabLogin.login_before('univerify')
+			}
+			//#endif
+		},
 		methods: {
 			showCurrentWebview(){
 				// 恢复当前页面窗体的显示 一键登录，默认不显示当前窗口
 				currentWebview.setStyle({
 					"top": 0
 				})
-			},
-			quickLogin(e) {
-				let options = {}
-
-				if (e.detail?.code) {
-					options.phoneNumberCode = e.detail.code
-				}
-
-				if (this.type === 'weixinMobile' && !e.detail?.code) return
-
-				this.$refs.uniFabLogin.login_before(this.type, true, options)
-			},
-			toSmsPage() {
-				if (!this.isPhone) {
-					this.focusPhone = true
-					return uni.showToast({
-						title: "手机号码格式不正确",
-						icon: 'none',
-						duration: 3000
-					});
-				}
-				if (this.needAgreements && !this.agree) {
-					return this.$refs.agreements.popup(this.toSmsPage)
-				}
-				// 发送验证吗
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
-				});
-			},
-			//去密码登录页
-			toPwdLogin() {
-				uni.navigateTo({
-					url: '../login/password'
-				})
-			},
-			chooseArea() {
-				uni.showToast({
-					title: '暂不支持其他国家',
-					icon: 'none',
-					duration: 3000
-				});
-			},
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	@media screen and (min-width: 690px) {
-		.uni-content {
-			height: 350px;
-		}
-	}
-
-	.uni-content,
-	.quickLogin {
-		/* #ifndef APP-NVUE */
-		display: flex;
-		flex-direction: column;
-		/* #endif */
-	}
-
-	.phone-box {
-		position: relative;
-		/* #ifndef APP-NVUE */
-		display: flex;
-		/* #endif */
-	}
-
-	.area {
-		position: absolute;
-		left: 10px;
-		z-index: 9;
-		top: 12px;
-		font-size: 14px;
-	}
-
-	.area::after {
-		content: "";
-		border: 3px solid transparent;
-		border-top-color: #000;
-		top: 12px;
-		left: 3px;
-		position: relative;
-	}
-
-	/* #ifdef MP */
-	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
-	.phone-box ::v-deep .uni-easyinput__content,
-	/* #endif */
-	.input-box {
-		/* #ifndef APP-NVUE */
-		box-sizing: border-box;
-		/* #endif */
-		flex: 1;
-		padding-left: 45px;
-		margin-bottom: 10px;
-		border-radius: 0;
-	}
-
-	.quickLogin {
-		height: 350px;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.quickLoginBtn {
-		margin: 20px 0;
-		width: 450rpx;
-		/* #ifndef APP-NVUE */
-		max-width: 230px;
-		/* #endif */
-		height: 82rpx;
-	}
-
-	.tip {
-		margin-top: -15px;
-		margin-bottom: 20px;
-	}
-
-	@media screen and (min-width: 690px) {
-		.quickLogin {
-			height: auto;
-		}
-	}
+			},
+			quickLogin(e) {
+				let options = {}
+
+				if (e.detail?.code) {
+					options.phoneNumberCode = e.detail.code
+				}
+
+				if (this.type === 'weixinMobile' && !e.detail?.code) return
+
+				this.$refs.uniFabLogin.login_before(this.type, true, options)
+			},
+			toSmsPage() {
+				if (!this.isPhone) {
+					this.focusPhone = true
+					return uni.showToast({
+						title: "手机号码格式不正确",
+						icon: 'none',
+						duration: 3000
+					});
+				}
+				if (this.needAgreements && !this.agree) {
+					return this.$refs.agreements.popup(this.toSmsPage)
+				}
+				// 发送验证吗
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-smscode?phoneNumber=' + this.phone
+				});
+			},
+			//去密码登录页
+			toPwdLogin() {
+				uni.navigateTo({
+					url: '../login/password'
+				})
+			},
+			chooseArea() {
+				uni.showToast({
+					title: '暂不支持其他国家',
+					icon: 'none',
+					duration: 3000
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	@media screen and (min-width: 690px) {
+		.uni-content {
+			height: 350px;
+		}
+	}
+
+	.uni-content,
+	.quickLogin {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		flex-direction: column;
+		/* #endif */
+	}
+
+	.phone-box {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+	}
+
+	.area {
+		position: absolute;
+		left: 10px;
+		z-index: 9;
+		top: 12px;
+		font-size: 14px;
+	}
+
+	.area::after {
+		content: "";
+		border: 3px solid transparent;
+		border-top-color: #000;
+		top: 12px;
+		left: 3px;
+		position: relative;
+	}
+
+	/* #ifdef MP */
+	// 解决小程序端开启虚拟节点virtualHost引起的 class = input-box丢失的问题 [详情参考](https://uniapp.dcloud.net.cn/matter.html#%E5%90%84%E5%AE%B6%E5%B0%8F%E7%A8%8B%E5%BA%8F%E5%AE%9E%E7%8E%B0%E6%9C%BA%E5%88%B6%E4%B8%8D%E5%90%8C-%E5%8F%AF%E8%83%BD%E5%AD%98%E5%9C%A8%E7%9A%84%E5%B9%B3%E5%8F%B0%E5%85%BC%E5%AE%B9%E9%97%AE%E9%A2%98)
+	.phone-box ::v-deep .uni-easyinput__content,
+	/* #endif */
+	.input-box {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		flex: 1;
+		padding-left: 45px;
+		margin-bottom: 10px;
+		border-radius: 0;
+	}
+
+	.quickLogin {
+		height: 350px;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.quickLoginBtn {
+		margin: 20px 0;
+		width: 450rpx;
+		/* #ifndef APP-NVUE */
+		max-width: 230px;
+		/* #endif */
+		height: 82rpx;
+	}
+
+	.tip {
+		margin-top: -15px;
+		margin-bottom: 20px;
+	}
+
+	@media screen and (min-width: 690px) {
+		.quickLogin {
+			height: auto;
+		}
+	}
 </style>
diff --git a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
index 5124c4c..5c06983 100644
--- a/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
+++ b/uni_modules/uni-id-pages/pages/userinfo/userinfo.vue
@@ -1,248 +1,256 @@
-<!-- 用户资料页 -->
-<template>
-	<view class="uni-content">
-		<view class="avatar">
-			<uni-id-pages-avatar width="260rpx" height="260rpx"></uni-id-pages-avatar>
-		</view>
-		<uni-list>
-			<uni-list-item class="item" @click="setNickname('')" title="昵称" :rightText="userInfo.nickname||'未设置'" link>
-			</uni-list-item>
-			<uni-list-item class="item" @click="bindMobile" title="手机号" :rightText="userInfo.mobile||'未绑定'" link>
-			</uni-list-item>
-			<uni-list-item v-if="userInfo.email" class="item" title="电子邮箱" :rightText="userInfo.email">
-			</uni-list-item>
-			<uni-list-item v-if="hasPwd" class="item" @click="changePassword" title="修改密码" link>
-			</uni-list-item>
-		</uni-list>
-		<!-- #ifndef MP -->
-		<uni-list class="mt10">
-			<uni-list-item @click="deactivate" title="注销账号" link="navigateTo"></uni-list-item>
-		</uni-list>
-		<!-- #endif -->
-		<uni-popup ref="dialog" type="dialog">
-			<uni-popup-dialog mode="input" :value="userInfo.nickname" @confirm="setNickname" title="设置昵称"
-				placeholder="请输入要设置的昵称">
-			</uni-popup-dialog>
-		</uni-popup>
-		<uni-id-pages-bind-mobile ref="bind-mobile-by-sms" @success="bindMobileSuccess"></uni-id-pages-bind-mobile>
-		<template v-if="showLoginManage">
-			<button v-if="userInfo._id" @click="logout">退出登录</button>
-			<button v-else @click="login">去登录</button>
-		</template>
-	</view>
-</template>
-<script>
-	const uniIdCo = uniCloud.importObject("uni-id-co")
-  import {
-    store,
-    mutations
-  } from '@/uni_modules/uni-id-pages/common/store.js'
-	export default {
-    computed: {
-      userInfo() {
-        return store.userInfo
-      }
-    },
-		data() {
-			return {
-				univerifyStyle: {
-					authButton: {
-						"title": "本机号码一键绑定", // 授权按钮文案
-					},
-					otherLoginButton: {
-						"title": "其他号码绑定",
-					}
-				},
-				// userInfo: {
-				// 	mobile:'',
-				// 	nickname:''
-				// },
-				hasPwd:false,
-				showLoginManage:false//通过页面传参隐藏登录&退出登录按钮
-			}
-		},
-		async onShow() {
-			this.univerifyStyle.authButton.title = "本机号码一键绑定"
-			this.univerifyStyle.otherLoginButton.title = "其他号码绑定"
-		},
-		async onLoad(e) {
-			if(e.showLoginManage){
-				this.showLoginManage = true//通过页面传参隐藏登录&退出登录按钮
-			}
-			//判断当前用户是否有密码，否则就不显示密码修改功能
-			let res = await uniIdCo.getAccountInfo()
-			this.hasPwd = res.isPasswordSet
-		},
-		methods: {
-			login() {
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/login/login-withoutpwd',
-					complete: (e) => {
-						// console.log(e);
-					}
-				})
-			},
-			logout(){
-			  mutations.logout()
-			},
-			bindMobileSuccess(){
-			  mutations.updateUserInfo()
-			},
-			changePassword(){
-				uni.navigateTo({
-					url: '/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd',
-					complete: (e) => {
-						// console.log(e);
-					}
-				})
-			},
-			bindMobile() {
-				// #ifdef APP-PLUS
-				uni.preLogin({
-					provider: 'univerify',
-					success: this.univerify(), //预登录成功
-					fail: (res) => { // 预登录失败
-						// 不显示一键登录选项（或置灰）
-						console.log(res)
-						this.bindMobileBySmsCode()
-					}
-				})
-				// #endif
-
-				// #ifdef MP-WEIXIN
-				this.$refs['bind-mobile-by-sms'].open()
-				// #endif
-
-				// #ifdef H5
-				//...去用验证码绑定
-				this.bindMobileBySmsCode()
-				// #endif
-			},
-			univerify() {
-				uni.login({
-					"provider": 'univerify',
-					"univerifyStyle": this.univerifyStyle,
-					success: async e => {
-						uniIdCo.bindMobileByUniverify(e.authResult).then(res => {
-							mutations.updateUserInfo()
-						}).catch(e => {
-							console.log(e);
-						}).finally(e=>{
-							// console.log(e);
-							uni.closeAuthView()
-						})
-					},
-					fail: (err) => {
-						console.log(err);
-						if (err.code == '30002' || err.code == '30001') {
-							this.bindMobileBySmsCode()
-						}
-					}
-				})
-			},
-			bindMobileBySmsCode() {
-				uni.navigateTo({
-					url: './bind-mobile/bind-mobile'
-				})
-			},
-			setNickname(nickname) {
-				if (nickname) {
-					mutations.updateUserInfo({nickname})
-					this.$refs.dialog.close()
-				} else {
-					this.$refs.dialog.open()
-				}
-			},
-			deactivate(){
-				uni.navigateTo({
-					url:"/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
-				})
-			},
-			async bindThirdAccount(provider) {
-				const uniIdCo = uniCloud.importObject("uni-id-co")
-				const bindField = {
-					weixin: 'wx_openid',
-					alipay: 'ali_openid',
-					apple: 'apple_openid',
-					qq: 'qq_openid'
-				}[provider.toLowerCase()]
-
-				if (this.userInfo[bindField]) {
-					await uniIdCo['unbind' + provider]()
-					await mutations.updateUserInfo()
-				} else {
-					uni.login({
-						provider: provider.toLowerCase(),
-						onlyAuthorize: true,
-						success: async e => {
-							const res = await uniIdCo['bind' + provider]({code: e.code})
-							if (res.errCode) {
-								uni.showToast({
-									title: res.errMsg || '绑定失败',
-									duration: 3000
-								})
-							}
-							await mutations.updateUserInfo()
-						},
-						fail: async (err) => {
-							console.log(err);
-							uni.hideLoading()
-						}
+<!-- 用户资料页 -->
+<template>
+	<view class="uni-content">
+		<view class="avatar">
+			<uni-id-pages-avatar width="260rpx" height="260rpx"></uni-id-pages-avatar>
+		</view>
+		<uni-list>
+			<uni-list-item class="item" @click="setNickname('')" title="昵称" :rightText="userInfo.nickname||'未设置'" link>
+			</uni-list-item>
+			<uni-list-item class="item" @click="bindMobile" title="手机号" :rightText="userInfo.mobile||'未绑定'" link>
+			</uni-list-item>
+			<uni-list-item v-if="userInfo.email" class="item" title="电子邮箱" :rightText="userInfo.email">
+			</uni-list-item>
+			<uni-list-item v-if="hasPwd" class="item" @click="changePassword" title="修改密码" link>
+			</uni-list-item>
+		</uni-list>
+		<!-- #ifndef MP -->
+		<uni-list class="mt10">
+			<uni-list-item @click="deactivate" title="注销账号" link="navigateTo"></uni-list-item>
+		</uni-list>
+		<!-- #endif -->
+		<uni-popup ref="dialog" type="dialog">
+			<uni-popup-dialog mode="input" :value="userInfo.nickname" @confirm="setNickname" :inputType="setNicknameIng?'nickname':'text'"
+				title="设置昵称" placeholder="请输入要设置的昵称">
+			</uni-popup-dialog>
+		</uni-popup>
+		<uni-id-pages-bind-mobile ref="bind-mobile-by-sms" @success="bindMobileSuccess"></uni-id-pages-bind-mobile>
+		<template v-if="showLoginManage">
+			<button v-if="userInfo._id" @click="logout">退出登录</button>
+			<button v-else @click="login">去登录</button>
+		</template>
+	</view>
+</template>
+<script>
+	const uniIdCo = uniCloud.importObject("uni-id-co")
+	import {
+		store,
+		mutations
+	} from '@/uni_modules/uni-id-pages/common/store.js'
+	export default {
+		computed: {
+			userInfo() {
+				return store.userInfo
+			}
+		},
+		data() {
+			return {
+				univerifyStyle: {
+					authButton: {
+						"title": "本机号码一键绑定", // 授权按钮文案
+					},
+					otherLoginButton: {
+						"title": "其他号码绑定",
+					}
+				},
+				// userInfo: {
+				// 	mobile:'',
+				// 	nickname:''
+				// },
+				hasPwd: false,
+				showLoginManage: false ,//通过页面传参隐藏登录&退出登录按钮
+				setNicknameIng:false
+			}
+		},
+		async onShow() {
+			this.univerifyStyle.authButton.title = "本机号码一键绑定"
+			this.univerifyStyle.otherLoginButton.title = "其他号码绑定"
+		},
+		async onLoad(e) {
+			if (e.showLoginManage) {
+				this.showLoginManage = true //通过页面传参隐藏登录&退出登录按钮
+			}
+			//判断当前用户是否有密码，否则就不显示密码修改功能
+			let res = await uniIdCo.getAccountInfo()
+			this.hasPwd = res.isPasswordSet
+		},
+		methods: {
+			login() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/login/login-withoutpwd',
+					complete: (e) => {
+						// console.log(e);
+					}
+				})
+			},
+			logout() {
+				mutations.logout()
+			},
+			bindMobileSuccess() {
+				mutations.updateUserInfo()
+			},
+			changePassword() {
+				uni.navigateTo({
+					url: '/uni_modules/uni-id-pages/pages/userinfo/change_pwd/change_pwd',
+					complete: (e) => {
+						// console.log(e);
+					}
+				})
+			},
+			bindMobile() {
+				// #ifdef APP-PLUS
+				uni.preLogin({
+					provider: 'univerify',
+					success: this.univerify(), //预登录成功
+					fail: (res) => { // 预登录失败
+						// 不显示一键登录选项（或置灰）
+						console.log(res)
+						this.bindMobileBySmsCode()
+					}
+				})
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				this.$refs['bind-mobile-by-sms'].open()
+				// #endif
+
+				// #ifdef H5
+				//...去用验证码绑定
+				this.bindMobileBySmsCode()
+				// #endif
+			},
+			univerify() {
+				uni.login({
+					"provider": 'univerify',
+					"univerifyStyle": this.univerifyStyle,
+					success: async e => {
+						uniIdCo.bindMobileByUniverify(e.authResult).then(res => {
+							mutations.updateUserInfo()
+						}).catch(e => {
+							console.log(e);
+						}).finally(e => {
+							// console.log(e);
+							uni.closeAuthView()
+						})
+					},
+					fail: (err) => {
+						console.log(err);
+						if (err.code == '30002' || err.code == '30001') {
+							this.bindMobileBySmsCode()
+						}
+					}
+				})
+			},
+			bindMobileBySmsCode() {
+				uni.navigateTo({
+					url: './bind-mobile/bind-mobile'
+				})
+			},
+			setNickname(nickname) {
+				if (nickname) {
+					mutations.updateUserInfo({
+						nickname
 					})
-				}
-			}
-		}
-	}
-</script>
-<style lang="scss" scoped>
-
-	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
-
-	.uni-content {
-		padding: 0;
-	}
-
-	/* #ifndef APP-NVUE */
-	view {
-		display: flex;
-		box-sizing: border-box;
-		flex-direction: column;
-	}
-	@media screen and (min-width: 690px) {
-		.uni-content {
-			padding: 0;
-			max-width: 690px;
-			margin-left: calc(50% - 345px);
-			border: none;
-			max-height: none;
-			border-radius: 0;
-			box-shadow: none;
-		}
-	}
-	/* #endif */
-	.avatar {
-		align-items: center;
-		justify-content: center;
-		margin: 22px 0;
-		width: 100%;
-	}
-
-	.item {
-		flex: 1;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-	}
-
-	button {
-		margin: 10%;
-		margin-top: 40px;
-		border-radius: 0;
-		background-color: #FFFFFF;
-		width: 80%;
-	}
-
-	.mt10{
-		margin-top: 10px;
-	}
+					this.setNicknameIng = false
+					this.$refs.dialog.close()
+				} else {
+					this.setNicknameIng = true
+					this.$refs.dialog.open()
+				}
+			},
+			deactivate() {
+				uni.navigateTo({
+					url: "/uni_modules/uni-id-pages/pages/userinfo/deactivate/deactivate"
+				})
+			},
+			async bindThirdAccount(provider) {
+				const uniIdCo = uniCloud.importObject("uni-id-co")
+				const bindField = {
+					weixin: 'wx_openid',
+					alipay: 'ali_openid',
+					apple: 'apple_openid',
+					qq: 'qq_openid'
+				} [provider.toLowerCase()]
+
+				if (this.userInfo[bindField]) {
+					await uniIdCo['unbind' + provider]()
+					await mutations.updateUserInfo()
+				} else {
+					uni.login({
+						provider: provider.toLowerCase(),
+						onlyAuthorize: true,
+						success: async e => {
+							const res = await uniIdCo['bind' + provider]({
+								code: e.code
+							})
+							if (res.errCode) {
+								uni.showToast({
+									title: res.errMsg || '绑定失败',
+									duration: 3000
+								})
+							}
+							await mutations.updateUserInfo()
+						},
+						fail: async (err) => {
+							console.log(err);
+							uni.hideLoading()
+						}
+					})
+				}
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	@import "@/uni_modules/uni-id-pages/common/login-page.scss";
+
+	.uni-content {
+		padding: 0;
+	}
+
+	/* #ifndef APP-NVUE */
+	view {
+		display: flex;
+		box-sizing: border-box;
+		flex-direction: column;
+	}
+
+	@media screen and (min-width: 690px) {
+		.uni-content {
+			padding: 0;
+			max-width: 690px;
+			margin-left: calc(50% - 345px);
+			border: none;
+			max-height: none;
+			border-radius: 0;
+			box-shadow: none;
+		}
+	}
+
+	/* #endif */
+	.avatar {
+		align-items: center;
+		justify-content: center;
+		margin: 22px 0;
+		width: 100%;
+	}
+
+	.item {
+		flex: 1;
+		flex-direction: row;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	button {
+		margin: 10%;
+		margin-top: 40px;
+		border-radius: 0;
+		background-color: #FFFFFF;
+		width: 80%;
+	}
+
+	.mt10 {
+		margin-top: 10px;
+	}
 </style>
diff --git a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
index dc9f6a6..20a9be9 100644
--- a/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
+++ b/uni_modules/uni-id-pages/uniCloud/database/uni-id-users.schema.json
@@ -330,6 +330,15 @@
 			},
 			"title": "角色"
 		},
+		"tags":{
+			"bsonType": "array",
+			"description": "用户标签",
+			"permission": {
+				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
+			},
+			"title": "标签"
+		},
 		"score": {
 			"bsonType": "int",
 			"description": "用户积分，积分变更记录可参考：uni-id-scores表定义",
@@ -369,7 +378,7 @@
 			"bsonType": "array",
 			"description": "用户token",
 			"permission": {
-				"read": "'READ_UNI_ID_USERS' in auth.permission",
+				"read": false,
 				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
 			}
 		},
@@ -379,7 +388,7 @@
 			"title": "用户名",
 			"trim": "both",
 			"permission": {
-				"read": "doc._id == auth.uid || 'READ_UNI_ID_USERS' in auth.permission",
+				"read": true,
 				"write": "'CREATE_UNI_ID_USERS' in auth.permission || 'UPDATE_UNI_ID_USERS' in auth.permission"
 			}
 		},
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index a9e2d66..41abeb4 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -1,3 +1,9 @@
+## 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）
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
index c20df4a..9bc87fc 100644
--- 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
@@ -10,7 +10,7 @@
 		</view>
 		<view v-else class="uni-dialog-content">
 			<slot>
-				<input class="uni-dialog-input" v-model="val" type="text" :placeholder="placeholderText" :focus="focus" >
+				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText" :focus="focus" >
 			</slot>
 		</view>
 		<view class="uni-dialog-button-group">
@@ -56,7 +56,11 @@
 		name: "uniPopupDialog",
 		mixins: [popup],
 		emits:['confirm','close'],
-		props: {
+		props: {
+			inputType:{
+				type: String,
+				default: 'text'
+			},
 			value: {
 				type: [String, Number],
 				default: ''
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
index a3ced3d..db90c59 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -1,474 +1,474 @@
-<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="{ backgroundColor: bg }" :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 {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)'
-			},
-		},
-
-		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: {
-					position: 'fixed',
-					left: 0,
-					right: 0
-				},
-				maskShow: true,
-				mkclick: true,
-				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
-			}
-		},
-		computed: {
-			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
-		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() {
-				// #ifdef H5
-				// fix by mehaotian 处理 h5 滚动穿透的问题
-				document.getElementsByTagName('body')[0].style.overflow = 'visible'
-				// #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) {
-					clearTimeout(this.timer)
-					this.showPopup = false
-				}
-				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
-				}
-				// 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
-				}
-				// TODO 兼容 type 属性 ，后续会废弃
-				if (type) return
-				this.showPopup = true
-				this.showTrans = true
-			},
-			/**
-			 * 中间弹出样式处理
-			 */
-			center(type) {
-				this.popupstyle = 'center'
-				this.ani = ['zoom-out', 'fade']
-				this.transClass = {
-					position: 'fixed',
-					/* #ifndef APP-NVUE */
-					display: 'flex',
-					flexDirection: 'column',
-					/* #endif */
-					bottom: 0,
-					left: 0,
-					right: 0,
-					top: 0,
-					justifyContent: 'center',
-					alignItems: 'center'
-				}
-				// 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,
-					/* #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,
-					/* #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;
-	}
+<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="{ backgroundColor: bg }" :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 {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)'
+			},
+		},
+
+		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: {
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
+			}
+		},
+		computed: {
+			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
+		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() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #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) {
+					clearTimeout(this.timer)
+					this.showPopup = false
+				}
+				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
+				}
+				// 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
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				this.ani = ['zoom-out', 'fade']
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center'
+				}
+				// 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,
+					/* #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,
+					/* #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
index 069e9ce..8a17034 100644
--- a/uni_modules/uni-popup/package.json
+++ b/uni_modules/uni-popup/package.json
@@ -1,7 +1,7 @@
 {
 	"id": "uni-popup",
 	"displayName": "uni-popup 弹出层",
-	"version": "1.7.9",
+	"version": "1.8.2",
 	"description": " Popup 组件，提供常用的弹层",
 	"keywords": [
         "uni-ui",
@@ -17,12 +17,8 @@
 	"directories": {
 		"example": "../../temps/example_temps"
 	},
-	"dcloudext": {
-		"category": [
-			"前端组件",
-			"通用组件"
-		],
-		"sale": {
+    "dcloudext": {
+        "sale": {
 			"regular": {
 				"price": "0.00"
 			},
@@ -38,7 +34,8 @@
 			"data": "无",
 			"permissions": "无"
 		},
-		"npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
 	},
 	"uni_modules": {
 		"dependencies": [
-- 
GitLab