更新 依赖的uni-id-pages的版本为1.1.20

uni_modules/uni-captcha/changelog.md

+## 0.7.5（2023-12-18）
+- 修复 在uni-app x项目，部分情况下，执行uni-captcha组件的setFocus无效的问题
+## 0.7.4（2023-12-18）
+- 更新 `package.json` -> `dependencies` 增加 `uni-popup`
 ## 0.7.3（2023-11-15）
 - 更新 uni-popup-captcha.uvue依赖的popup组件，直接使用uni_modules下的uni-popup组件
 ## 0.7.2（2023-11-07）

uni_modules/uni-captcha/components/uni-captcha/uni-captcha.uvue

@@ -4,7 +4,7 @@
       <image class="loding" src="/uni_modules/uni-captcha/static/run.gif" v-if="loging" mode="widthFix" />
       <image class="captcha-img" :class="{opacity:loging}" @click="getImageCaptcha(true)" :src="captchaBase64" mode="widthFix" />
     </view>
-    <input @blur="focusCaptchaInput = false" :focus="focusCaptchaInput" type="digit" class="captcha" :inputBorder="false"
+    <input @blur="focusCaptchaInput = false" @focus="focusCaptchaInput = true" :focus="focusCaptchaInput" type="digit" class="captcha" :inputBorder="false"
       maxlength="4" v-model="val" placeholder="请输入验证码" :cursor-spacing="cursorSpacing" />
   </view>
 </template>

uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue

@@ -14,12 +14,8 @@
 </template>
 
 <script>
-  import uniPopup from './uni-popup/uni-popup.uvue';
   let confirmCallBack = ():void=>console.log('未传入回调函数')
   export default {
-    components: {
-      uniPopup
-    },
     emits:["modelValue","confirm","cancel"],
     data() {
       return {

uni_modules/uni-captcha/package.json

 {
   "id": "uni-captcha",
   "displayName": "uni-captcha",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "云端一体图形验证码组件",
   "keywords": [
     "captcha",
@@ -14,7 +14,7 @@
   "engines": {
     "HBuilderX": "^3.1.0"
   },
-"dcloudext": {
+  "dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -35,7 +35,9 @@
     "type": "unicloud-template-function"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": [
+      "uni-popup"
+    ],
     "encrypt": [],
     "platforms": {
       "cloud": {

uni_modules/uni-data-checkbox/changelog.md

+## 1.0.5（2024-03-20）
+- 修复 单选模式下选中样式不生效的bug
+## 1.0.4（2024-01-27）
+- 修复 修复错别字chagne为change
 ## 1.0.3（2022-09-16）
 - 可以使用 uni-scss 控制主题色
 ## 1.0.2（2022-06-30）

uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.vue

@@ -2,16 +2,21 @@
 	<view class="uni-data-checklist" :style="{'margin-top':isTop+'px'}">
 		<template v-if="!isLocal">
 			<view class="uni-data-loading">
-				<uni-load-more v-if="!mixinDatacomErrorMessage" status="loading" iconType="snow" :iconSize="18" :content-text="contentText"></uni-load-more>
+				<uni-load-more v-if="!mixinDatacomErrorMessage" status="loading" iconType="snow" :iconSize="18"
+					:content-text="contentText"></uni-load-more>
 				<text v-else>{{mixinDatacomErrorMessage}}</text>
 			</view>
 		</template>
 		<template v-else>
-			<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}" @change="chagne">
-				<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+			<checkbox-group v-if="multiple" class="checklist-group" :class="{'is-list':mode==='list' || wrap}"
+				@change="change">
+				<label class="checklist-box"
+					:class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
 					:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
-					<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''" :checked="item.selected" />
-					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="checkbox__inner"  :style="item.styleIcon">
+					<checkbox class="hidden" hidden :disabled="disabled || !!item.disabled" :value="item[map.value]+''"
+						:checked="item.selected" />
+					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')"
+						class="checkbox__inner" :style="item.styleIcon">
 						<view class="checkbox__inner-icon"></view>
 					</view>
 					<view class="checklist-content" :class="{'list-content':mode === 'list' && icon ==='left'}">
@@ -20,11 +25,12 @@
 					</view>
 				</label>
 			</checkbox-group>
-			<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="chagne">
-				<!-- -->
-				<label class="checklist-box" :class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
+			<radio-group v-else class="checklist-group" :class="{'is-list':mode==='list','is-wrap':wrap}" @change="change">
+				<label class="checklist-box"
+					:class="['is--'+mode,item.selected?'is-checked':'',(disabled || !!item.disabled)?'is-disable':'',index!==0&&mode==='list'?'is-list-border':'']"
 					:style="item.styleBackgroud" v-for="(item,index) in dataList" :key="index">
-					<radio class="hidden" hidden :disabled="disabled || item.disabled" :value="item[map.value]+''" :checked="item.selected" />
+					<radio class="hidden" hidden :disabled="disabled || item.disabled" :value="item[map.value]+''"
+						:checked="item.selected" />
 					<view v-if="(mode !=='tag' && mode !== 'list') || ( mode === 'list' && icon === 'left')" class="radio__inner"
 						:style="item.styleBackgroud">
 						<view class="radio__inner-icon" :style="item.styleIcon"></view>
@@ -68,7 +74,7 @@
 	export default {
 		name: 'uniDataChecklist',
 		mixins: [uniCloud.mixinDatacom || {}],
-		emits:['input','update:modelValue','change'],
+		emits: ['input', 'update:modelValue', 'change'],
 		props: {
 			mode: {
 				type: String,
@@ -88,7 +94,7 @@
 			// TODO vue3
 			modelValue: {
 				type: [Array, String, Number],
-				default() {
+				default () {
 					return '';
 				}
 			},
@@ -122,20 +128,20 @@
 				type: String,
 				default: ''
 			},
-			emptyText:{
+			emptyText: {
 				type: String,
 				default: '暂无数据'
 			},
-			disabled:{
+			disabled: {
 				type: Boolean,
 				default: false
 			},
-			map:{
+			map: {
 				type: Object,
-				default(){
+				default () {
 					return {
-						text:'text',
-						value:'value'
+						text: 'text',
+						value: 'value'
 					}
 				}
 			}
@@ -177,18 +183,18 @@
 					contentrefresh: '加载中',
 					contentnomore: '没有更多'
 				},
-				isLocal:true,
+				isLocal: true,
 				styles: {
 					selectedColor: '#2979ff',
 					selectedTextColor: '#666',
 				},
-				isTop:0
+				isTop: 0
 			};
 		},
-		computed:{
-			dataValue(){
-				if(this.value === '')return this.modelValue
-				if(this.modelValue === '') return this.value
+		computed: {
+			dataValue() {
+				if (this.value === '') return this.modelValue
+				if (this.modelValue === '') return this.value
 				return this.value
 			}
 		},
@@ -223,15 +229,15 @@
 		},
 		methods: {
 			loadData() {
-				this.mixinDatacomGet().then(res=>{
+				this.mixinDatacomGet().then(res => {
 					this.mixinDatacomResData = res.result.data
-					if(this.mixinDatacomResData.length === 0){
+					if (this.mixinDatacomResData.length === 0) {
 						this.isLocal = false
 						this.mixinDatacomErrorMessage = this.emptyText
-					}else{
+					} else {
 						this.isLocal = true
 					}
-				}).catch(err=>{
+				}).catch(err => {
 					this.mixinDatacomErrorMessage = err.message
 				})
 			},
@@ -248,7 +254,7 @@
 				}
 				return parent;
 			},
-			chagne(e) {
+			change(e) {
 				const values = e.detail.value
 
 				let detail = {
@@ -383,13 +389,13 @@
 			 */
 			setStyleBackgroud(item) {
 				let styles = {}
-				let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+				let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
 				if (this.selectedColor) {
 					if (this.mode !== 'list') {
-						styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+						styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
 					}
 					if (this.mode === 'tag') {
-						styles['background-color'] = item.selected? selectedColor:'#f5f5f5'
+						styles['background-color'] = item.selected ? selectedColor : '#f5f5f5'
 					}
 				}
 				let classles = ''
@@ -402,13 +408,13 @@
 				let styles = {}
 				let classles = ''
 				if (this.selectedColor) {
-					let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
-					styles['background-color'] = item.selected?selectedColor:'#fff'
-					styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+					let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
+					styles['background-color'] = item.selected ? selectedColor : '#fff'
+					styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
 
-					if(!item.selected && item.disabled){
+					if (!item.selected && item.disabled) {
 						styles['background-color'] = '#F2F6FC'
-						styles['border-color'] = item.selected?selectedColor:'#DCDFE6'
+						styles['border-color'] = item.selected ? selectedColor : '#DCDFE6'
 					}
 				}
 				for (let i in styles) {
@@ -420,13 +426,13 @@
 				let styles = {}
 				let classles = ''
 				if (this.selectedColor) {
-					let selectedColor = this.selectedColor?this.selectedColor:'#2979ff'
+					let selectedColor = this.selectedColor ? this.selectedColor : '#2979ff'
 					if (this.mode === 'tag') {
-						styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:'#fff'):'#666'
+						styles.color = item.selected ? (this.selectedTextColor ? this.selectedTextColor : '#fff') : '#666'
 					} else {
-						styles.color = item.selected?(this.selectedTextColor?this.selectedTextColor:selectedColor):'#666'
+						styles.color = item.selected ? (this.selectedTextColor ? this.selectedTextColor : selectedColor) : '#666'
 					}
-					if(!item.selected && item.disabled){
+					if (!item.selected && item.disabled) {
 						styles.color = '#999'
 					}
 				}
@@ -439,7 +445,7 @@
 				let styles = {}
 				let classles = ''
 				if (this.mode === 'list') {
-					styles['border-color'] = item.selected?this.styles.selectedColor:'#DCDFE6'
+					styles['border-color'] = item.selected ? this.styles.selectedColor : '#DCDFE6'
 				}
 				for (let i in styles) {
 					classles += `${i}:${styles[i]};`
@@ -454,7 +460,7 @@
 <style lang="scss">
 	$uni-primary: #2979ff !default;
 	$border-color: #DCDFE6;
-	$disable:0.4;
+	$disable: 0.4;
 
 	@mixin flex {
 		/* #ifndef APP-NVUE */
@@ -476,6 +482,7 @@
 		position: relative;
 		z-index: 0;
 		flex: 1;
+
 		// 多选样式
 		.checklist-group {
 			@include flex;
@@ -506,6 +513,7 @@
 					flex-direction: row;
 					align-items: center;
 					justify-content: space-between;
+
 					.checklist-text {
 						font-size: 14px;
 						color: #666;
@@ -517,7 +525,7 @@
 						border-right-width: 1px;
 						border-right-color: #007aff;
 						border-right-style: solid;
-						border-bottom-width:1px;
+						border-bottom-width: 1px;
 						border-bottom-color: #007aff;
 						border-bottom-style: solid;
 						height: 12px;
@@ -542,6 +550,7 @@
 					border-radius: 4px;
 					background-color: #fff;
 					z-index: 1;
+
 					.checkbox__inner-icon {
 						position: absolute;
 						/* #ifdef APP-NVUE */
@@ -556,7 +565,7 @@
 						border-right-width: 1px;
 						border-right-color: #fff;
 						border-right-style: solid;
-						border-bottom-width:1px ;
+						border-bottom-width: 1px;
 						border-bottom-color: #fff;
 						border-bottom-style: solid;
 						opacity: 0;
@@ -597,6 +606,7 @@
 					&.is-disable {
 						/* #ifdef H5 */
 						cursor: not-allowed;
+
 						/* #endif */
 						.checkbox__inner {
 							background-color: #F2F6FC;
@@ -610,6 +620,7 @@
 							background-color: #F2F6FC;
 							border-color: $border-color;
 						}
+
 						.checklist-text {
 							color: #999;
 						}
@@ -626,16 +637,20 @@
 								transform: rotate(45deg);
 							}
 						}
+
 						.radio__inner {
 							border-color: $uni-primary;
+
 							.radio__inner-icon {
 								opacity: 1;
 								background-color: $uni-primary;
 							}
 						}
+
 						.checklist-text {
 							color: $uni-primary;
 						}
+
 						// 选中禁用
 						&.is-disable {
 							.checkbox__inner {
@@ -645,6 +660,7 @@
 							.checklist-text {
 								opacity: $disable;
 							}
+
 							.radio__inner {
 								opacity: $disable;
 							}
@@ -667,6 +683,7 @@
 						/* #endif */
 						border: 1px #eee solid;
 						opacity: $disable;
+
 						.checkbox__inner {
 							background-color: #F2F6FC;
 							border-color: $border-color;
@@ -674,6 +691,7 @@
 							cursor: not-allowed;
 							/* #endif */
 						}
+
 						.radio__inner {
 							background-color: #F2F6FC;
 							border-color: $border-color;
@@ -681,6 +699,7 @@
 							cursor: not-allowed;
 							/* #endif */
 						}
+
 						.checklist-text {
 							color: #999;
 						}
@@ -688,9 +707,11 @@
 
 					&.is-checked {
 						border-color: $uni-primary;
+
 						.checkbox__inner {
 							border-color: $uni-primary;
 							background-color: $uni-primary;
+
 							.checkbox__inner-icon {
 								opacity: 1;
 								transform: rotate(45deg);
@@ -747,6 +768,7 @@
 						}
 					}
 				}
+
 				// 列表样式
 				&.is--list {
 					/* #ifndef APP-NVUE */
@@ -764,6 +786,7 @@
 					&.is-disable {
 						/* #ifdef H5 */
 						cursor: not-allowed;
+
 						/* #endif */
 						.checkbox__inner {
 							background-color: #F2F6FC;
@@ -772,6 +795,7 @@
 							cursor: not-allowed;
 							/* #endif */
 						}
+
 						.checklist-text {
 							color: #999;
 						}
@@ -787,11 +811,15 @@
 								transform: rotate(45deg);
 							}
 						}
+
 						.radio__inner {
+							border-color: $uni-primary;
 							.radio__inner-icon {
 								opacity: 1;
+								background-color: $uni-primary;
 							}
 						}
+
 						.checklist-text {
 							color: $uni-primary;
 						}

uni_modules/uni-data-checkbox/package.json

 {
   "id": "uni-data-checkbox",
   "displayName": "uni-data-checkbox 数据选择器",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "通过数据驱动的单选框和复选框",
   "keywords": [
     "uni-ui",

uni_modules/uni-easyinput/changelog.md

+## 1.1.18（2024-04-11）
+- 修复 easyinput组件双向绑定问题
+## 1.1.17（2024-03-28）
+- 修复 在头条小程序下丢失事件绑定的问题
+## 1.1.16（2024-03-20）
+- 修复 在密码输入情况下 清除和小眼睛覆盖bug 在edge浏览器下显示双眼睛bug
+## 1.1.15（2024-02-21）
+- 新增 左侧插槽：left
+## 1.1.14（2024-02-19）
+- 修复 onBlur的emit传值错误
+## 1.1.12（2024-01-29）
+- 补充 adjust-position文档属性补充
+## 1.1.11（2024-01-29）
+- 补充 adjust-position属性传递值：（Boolean）当键盘弹起时，是否自动上推页面
+## 1.1.10（2024-01-22）
+- 去除 移除无用的log输出
 ## 1.1.9（2023-04-11）
 - 修复 vue3 下 keyboardheightchange 事件报错的bug
 ## 1.1.8（2023-03-29）

uni_modules/uni-easyinput/components/uni-easyinput/common.js

@@ -6,9 +6,7 @@
  */
 export const debounce = function(func, wait = 1000, immediate = true) {
 	let timer;
-	console.log(1);
 	return function() {
-		console.log(123);
 		let context = this,
 			args = arguments;
 		if (timer) clearTimeout(timer);

uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue

 <template>
 	<view class="uni-easyinput" :class="{ 'uni-easyinput-error': msg }" :style="boxStyle">
 		<view class="uni-easyinput__content" :class="inputContentClass" :style="inputContentStyle">
-			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc" @click="onClickIcon('prefix')" size="22"></uni-icons>
-			<textarea
-				v-if="type === 'textarea'"
-				class="uni-easyinput__content-textarea"
-				:class="{ 'input-padding': inputBorder }"
-				:name="name"
-				:value="val"
-				:placeholder="placeholder"
-				:placeholderStyle="placeholderStyle"
-				:disabled="disabled"
-				placeholder-class="uni-easyinput__placeholder-class"
-				:maxlength="inputMaxlength"
-				:focus="focused"
-				:autoHeight="autoHeight"
-				:cursor-spacing="cursorSpacing"
-				@input="onInput"
-				@blur="_Blur"
-				@focus="_Focus"
-				@confirm="onConfirm"
-        @keyboardheightchange="onkeyboardheightchange"
-			></textarea>
-			<input
-				v-else
-				:type="type === 'password' ? 'text' : type"
-				class="uni-easyinput__content-input"
-				:style="inputStyle"
-				:name="name"
-				:value="val"
-				:password="!showPassword && type === 'password'"
-				:placeholder="placeholder"
-				:placeholderStyle="placeholderStyle"
-				placeholder-class="uni-easyinput__placeholder-class"
-				:disabled="disabled"
-				:maxlength="inputMaxlength"
-				:focus="focused"
-				:confirmType="confirmType"
-				:cursor-spacing="cursorSpacing"
-				@focus="_Focus"
-				@blur="_Blur"
-				@input="onInput"
-				@confirm="onConfirm"
-        @keyboardheightchange="onkeyboardheightchange"
-			/>
+			<uni-icons v-if="prefixIcon" class="content-clear-icon" :type="prefixIcon" color="#c0c4cc"
+				@click="onClickIcon('prefix')" size="22"></uni-icons>
+			<slot name="left">
+			</slot>
+			<!-- #ifdef MP-ALIPAY -->
+			<textarea :enableNative="enableNative" v-if="type === 'textarea'" class="uni-easyinput__content-textarea"
+				:class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder"
+				:placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class"
+				:maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing"
+				:adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm"
+				@keyboardheightchange="onkeyboardheightchange"></textarea>
+			<input :enableNative="enableNative" v-else :type="type === 'password' ? 'text' : type"
+				class="uni-easyinput__content-input" :style="inputStyle" :name="name" :value="val"
+				:password="!showPassword && type === 'password'" :placeholder="placeholder" :placeholderStyle="placeholderStyle"
+				placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled" :maxlength="inputMaxlength"
+				:focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing" :adjust-position="adjustPosition"
+				@focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm"
+				@keyboardheightchange="onkeyboardheightchange" />
+			<!-- #endif -->
+			<!-- #ifndef MP-ALIPAY -->
+			<textarea v-if="type === 'textarea'" class="uni-easyinput__content-textarea"
+				:class="{ 'input-padding': inputBorder }" :name="name" :value="val" :placeholder="placeholder"
+				:placeholderStyle="placeholderStyle" :disabled="disabled" placeholder-class="uni-easyinput__placeholder-class"
+				:maxlength="inputMaxlength" :focus="focused" :autoHeight="autoHeight" :cursor-spacing="cursorSpacing"
+				:adjust-position="adjustPosition" @input="onInput" @blur="_Blur" @focus="_Focus" @confirm="onConfirm"
+				@keyboardheightchange="onkeyboardheightchange"></textarea>
+			<input v-else :type="type === 'password' ? 'text' : type" class="uni-easyinput__content-input" :style="inputStyle"
+				:name="name" :value="val" :password="!showPassword && type === 'password'" :placeholder="placeholder"
+				:placeholderStyle="placeholderStyle" placeholder-class="uni-easyinput__placeholder-class" :disabled="disabled"
+				:maxlength="inputMaxlength" :focus="focused" :confirmType="confirmType" :cursor-spacing="cursorSpacing"
+				:adjust-position="adjustPosition" @focus="_Focus" @blur="_Blur" @input="onInput" @confirm="onConfirm"
+				@keyboardheightchange="onkeyboardheightchange" />
+			<!-- #endif -->
+
 			<template v-if="type === 'password' && passwordIcon">
 				<!-- 开启密码时显示小眼睛 -->
-				<uni-icons
-					v-if="isVal"
-					class="content-clear-icon"
-					:class="{ 'is-textarea-icon': type === 'textarea' }"
-					:type="showPassword ? 'eye-slash-filled' : 'eye-filled'"
-					:size="22"
-					:color="focusShow ? primaryColor : '#c0c4cc'"
-					@click="onEyes"
-				></uni-icons>
+				<uni-icons v-if="isVal" class="content-clear-icon" :class="{ 'is-textarea-icon': type === 'textarea' }"
+					:type="showPassword ? 'eye-slash-filled' : 'eye-filled'" :size="22"
+					:color="focusShow ? primaryColor : '#c0c4cc'" @click="onEyes"></uni-icons>
 			</template>
-			<template v-else-if="suffixIcon">
-				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc" @click="onClickIcon('suffix')" size="22"></uni-icons>
+			<template v-if="suffixIcon">
+				<uni-icons v-if="suffixIcon" class="content-clear-icon" :type="suffixIcon" color="#c0c4cc"
+					@click="onClickIcon('suffix')" size="22"></uni-icons>
 			</template>
 			<template v-else>
-				<uni-icons
-					v-if="clearable && isVal && !disabled && type !== 'textarea'"
-					class="content-clear-icon"
-					:class="{ 'is-textarea-icon': type === 'textarea' }"
-					type="clear"
-					:size="clearSize"
-					:color="msg ? '#dd524d' : focusShow ? primaryColor : '#c0c4cc'"
-					@click="onClear"
-				></uni-icons>
+				<uni-icons v-if="clearable && isVal && !disabled && type !== 'textarea'" class="content-clear-icon"
+					:class="{ 'is-textarea-icon': type === 'textarea' }" type="clear" :size="clearSize"
+					:color="msg ? '#dd524d' : focusShow ? primaryColor : '#c0c4cc'" @click="onClear"></uni-icons>
 			</template>
 			<slot name="right"></slot>
 		</view>
@@ -76,7 +56,7 @@
 </template>
 
 <script>
-/**
+	/**
 	 * Easyinput 输入框
 	 * @description 此组件可以实现表单的输入与校验，包括 "text" 和 "textarea" 类型。
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3455
@@ -102,6 +82,7 @@
 	 * @property {String}	primaryColor	设置主题色（默认#2979ff）
 	 * @property {Boolean}	trim	是否自动去除两端的空格
 	 * @property {Boolean}	cursorSpacing	指定光标与键盘的距离，单位 px
+	 * @property {Boolean}  ajust-position 当键盘弹起时，是否上推内容，默认值：true
 	 * @value both	去除两端空格
 	 * @value left	去除左侧空格
 	 * @value right	去除右侧空格
@@ -119,7 +100,7 @@
 	 * @event {Function}	iconClick	点击图标时触发
 	 * @example <uni-easyinput v-model="mobile"></uni-easyinput>
 	 */
-function obj2strClass(obj) {
+	function obj2strClass(obj) {
 		let classess = '';
 		for (let key in obj) {
 			const val = obj[key];
@@ -128,25 +109,42 @@ function obj2strClass(obj) {
 			}
 		}
 		return classess;
-}
+	}
 
-function obj2strStyle(obj) {
+	function obj2strStyle(obj) {
 		let style = '';
 		for (let key in obj) {
 			const val = obj[key];
 			style += `${key}:${val};`;
 		}
 		return style;
-}
-export default {
+	}
+	export default {
 		name: 'uni-easyinput',
-	emits: ['click', 'iconClick', 'update:modelValue', 'input', 'focus', 'blur', 'confirm', 'clear', 'eyes', 'change', 'keyboardheightchange'],
+		emits: [
+			'click',
+			'iconClick',
+			'update:modelValue',
+			'input',
+			'focus',
+			'blur',
+			'confirm',
+			'clear',
+			'eyes',
+			'change',
+			'keyboardheightchange'
+		],
 		model: {
 			prop: 'modelValue',
 			event: 'update:modelValue'
 		},
 		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
 			virtualHost: true
+			// #endif
 		},
 		inject: {
 			form: {
@@ -223,6 +221,10 @@ export default {
 				type: Boolean,
 				default: true
 			},
+			adjustPosition: {
+				type: Boolean,
+				default: true
+			},
 			primaryColor: {
 				type: String,
 				default: '#2979ff'
@@ -241,7 +243,13 @@ export default {
 			errorMessage: {
 				type: [String, Boolean],
 				default: ''
+			},
+			// #ifdef MP-ALIPAY
+			enableNative: {
+				type: Boolean,
+				default: false
 			}
+			// #endif
 		},
 		data() {
 			return {
@@ -283,7 +291,9 @@ export default {
 
 			// 处理外层样式的style
 			boxStyle() {
-			return `color:${this.inputBorder && this.msg ? '#e43d33' : this.styles.color};`;
+				return `color:${
+					this.inputBorder && this.msg ? '#e43d33' : this.styles.color
+				};`;
 			},
 			// input 内容的类和样式处理
 			inputContentClass() {
@@ -296,16 +306,24 @@ export default {
 				});
 			},
 			inputContentStyle() {
-			const focusColor = this.focusShow ? this.primaryColor : this.styles.borderColor;
-			const borderColor = this.inputBorder && this.msg ? '#dd524d' : focusColor;
+				const focusColor = this.focusShow
+					? this.primaryColor
+					: this.styles.borderColor;
+				const borderColor =
+					this.inputBorder && this.msg ? '#dd524d' : focusColor;
 				return obj2strStyle({
 					'border-color': borderColor || '#e5e5e5',
-				'background-color': this.disabled ? this.styles.disableColor : this.styles.backgroundColor
+					'background-color': this.disabled
+						? this.styles.disableColor
+						: this.styles.backgroundColor
 				});
 			},
 			// input右侧样式
 			inputStyle() {
-			const paddingRight = this.type === 'password' || this.clearable || this.prefixIcon ? '' : '10px';
+				const paddingRight =
+					this.type === 'password' || this.clearable || this.prefixIcon
+						? ''
+						: '10px';
 				return obj2strStyle({
 					'padding-right': paddingRight,
 					'padding-left': this.prefixIcon ? '' : '10px'
@@ -348,7 +366,11 @@ export default {
 			init() {
 				if (this.value || this.value === 0) {
 					this.val = this.value;
-			} else if (this.modelValue || this.modelValue === 0 || this.modelValue === '') {
+				} else if (
+					this.modelValue ||
+					this.modelValue === 0 ||
+					this.modelValue === ''
+				) {
 					this.val = this.modelValue;
 				} else {
 					this.val = null;
@@ -418,7 +440,7 @@ export default {
 			 */
 			onBlur() {
 				this.focused = false;
-			this.$emit('focus', null);
+				this.$emit('blur', null);
 			},
 			_Blur(event) {
 				let value = event.detail.value;
@@ -471,7 +493,7 @@ export default {
 			 * @param {Object} event
 			 */
 			onkeyboardheightchange(event) {
-      this.$emit("keyboardheightchange",event);
+				this.$emit('keyboardheightchange', event);
 			},
 
 			/**
@@ -496,14 +518,14 @@ export default {
 				return str;
 			}
 		}
-};
+	};
 </script>
 
 <style lang="scss">
-$uni-error: #e43d33;
-$uni-border-1: #dcdfe6 !default;
+	$uni-error: #e43d33;
+	$uni-border-1: #dcdfe6 !default;
 
-.uni-easyinput {
+	.uni-easyinput {
 		/* #ifndef APP-NVUE */
 		width: 100%;
 		/* #endif */
@@ -512,9 +534,9 @@ $uni-border-1: #dcdfe6 !default;
 		text-align: left;
 		color: #333;
 		font-size: 14px;
-}
+	}
 
-.uni-easyinput__content {
+	.uni-easyinput__content {
 		flex: 1;
 		/* #ifndef APP-NVUE */
 		width: 100%;
@@ -528,9 +550,9 @@ $uni-border-1: #dcdfe6 !default;
 		border-color: #fff;
 		transition-property: border-color;
 		transition-duration: 0.3s;
-}
+	}
 
-.uni-easyinput__content-input {
+	.uni-easyinput__content-input {
 		/* #ifndef APP-NVUE */
 		width: auto;
 		/* #endif */
@@ -541,23 +563,37 @@ $uni-border-1: #dcdfe6 !default;
 		font-size: 14px;
 		height: 35px;
 		// min-height: 36px;
-}
 
-.uni-easyinput__placeholder-class {
+		/*ifdef H5*/
+		& ::-ms-reveal {
+			display: none;
+		}
+
+		& ::-ms-clear {
+			display: none;
+		}
+
+		& ::-o-clear {
+			display: none;
+		}
+		/*endif*/
+	}
+
+	.uni-easyinput__placeholder-class {
 		color: #999;
 		font-size: 12px;
 		// font-weight: 200;
-}
+	}
 
-.is-textarea {
+	.is-textarea {
 		align-items: flex-start;
-}
+	}
 
-.is-textarea-icon {
+	.is-textarea-icon {
 		margin-top: 5px;
-}
+	}
 
-.uni-easyinput__content-textarea {
+	.uni-easyinput__content-textarea {
 		position: relative;
 		overflow: hidden;
 		flex: 1;
@@ -571,23 +607,23 @@ $uni-border-1: #dcdfe6 !default;
 		min-height: 80px;
 		width: auto;
 		/* #endif */
-}
+	}
 
-.input-padding {
+	.input-padding {
 		padding-left: 10px;
-}
+	}
 
-.content-clear-icon {
+	.content-clear-icon {
 		padding: 0 5px;
-}
+	}
 
-.label-icon {
+	.label-icon {
 		margin-right: 5px;
 		margin-top: -1px;
-}
+	}
 
-// 显示边框
-.is-input-border {
+	// 显示边框
+	.is-input-border {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		box-sizing: border-box;
@@ -599,9 +635,9 @@ $uni-border-1: #dcdfe6 !default;
 		/* #ifdef MP-ALIPAY */
 		overflow: hidden;
 		/* #endif */
-}
+	}
 
-.uni-error-message {
+	.uni-error-message {
 		position: absolute;
 		bottom: -17px;
 		left: 0;
@@ -609,43 +645,43 @@ $uni-border-1: #dcdfe6 !default;
 		color: $uni-error;
 		font-size: 12px;
 		text-align: left;
-}
+	}
 
-.uni-error-msg--boeder {
+	.uni-error-msg--boeder {
 		position: relative;
 		bottom: 0;
 		line-height: 22px;
-}
+	}
 
-.is-input-error-border {
+	.is-input-error-border {
 		border-color: $uni-error;
 
 		.uni-easyinput__placeholder-class {
 			color: mix(#fff, $uni-error, 50%);
 		}
-}
+	}
 
-.uni-easyinput--border {
+	.uni-easyinput--border {
 		margin-bottom: 0;
 		padding: 10px 15px;
 		// padding-bottom: 0;
 		border-top: 1px #eee solid;
-}
+	}
 
-.uni-easyinput-error {
+	.uni-easyinput-error {
 		padding-bottom: 0;
-}
+	}
 
-.is-first-border {
+	.is-first-border {
 		/* #ifndef APP-NVUE */
 		border: none;
 		/* #endif */
 		/* #ifdef APP-NVUE */
 		border-width: 0;
 		/* #endif */
-}
+	}
 
-.is-disabled {
+	.is-disabled {
 		background-color: #f7f6f6;
 		color: #d5d5d5;
 
@@ -653,5 +689,5 @@ $uni-border-1: #dcdfe6 !default;
 			color: #d5d5d5;
 			font-size: 12px;
 		}
-}
+	}
 </style>

uni_modules/uni-easyinput/package.json

 {
   "id": "uni-easyinput",
   "displayName": "uni-easyinput 增强输入框",
-  "version": "1.1.9",
+  "version": "1.1.18",
   "description": "Easyinput 组件是对原生input组件的增强",
   "keywords": [
     "uni-ui",
@@ -46,7 +46,8 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "n"
       },
       "client": {
         "App": {

uni_modules/uni-icons/changelog.md

+## 2.0.9（2024-01-12）
+fix: 修复图标大小默认值错误的问题
 ## 2.0.8（2023-12-14）
 - 修复 项目未使用 ts 情况下，打包报错的bug
 ## 2.0.7（2023-12-14）

uni_modules/uni-icons/components/uni-icons/uni-icons.uvue

@@ -30,7 +30,7 @@
 			},
 			size: {
 				type: Object,
-				default: 24
+				default: 16
 			},
 			fontFamily: {
 				type: String,

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -50,7 +50,7 @@
 			},
 			size: {
 				type: [Number, String],
-				default: 24
+				default: 16
 			},
 			customPrefix: {
 				type: String,

uni_modules/uni-icons/package.json

 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",

uni_modules/uni-id-common/changelog.md

+## 1.0.17（2024-04-26）
+- 兼容uni-app-x对客户端uniPlatform的调整（uni-app-x内uniPlatform区分app-android、app-ios）
 ## 1.0.16（2023-04-25）
 - 新增maxTokenLength配置，用于限制数据库用户记录token数组的最大长度
 ## 1.0.15（2023-04-06）

uni_modules/uni-id-common/package.json

 {
 	"id": "uni-id-common",
 	"displayName": "uni-id-common",
-	"version": "1.0.16",
+	"version": "1.0.17",
 	"description": "包含uni-id token生成、校验、刷新功能的云函数公共模块",
 	"keywords": [
         "uni-id-common",
@@ -39,7 +39,8 @@
 		"platforms": {
 			"cloud": {
 				"tcb": "y",
-				"aliyun": "y"
+                "aliyun": "y",
+                "alipay": "n"
 			},
 			"client": {
 				"Vue": {

uni_modules/uni-id-common/uniCloud/cloudfunctions/common/uni-id-common/package.json

 {
   "name": "uni-id-common",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "uni-id token生成、校验、刷新",
   "main": "index.js",
   "homepage": "https://uniapp.dcloud.io/uniCloud/uni-id-common.html",

uni_modules/uni-id-pages/changelog.md

+## 1.1.20（2024-04-28）
+- uni-id-co 兼容uni-app-x对客户端uniPlatform的调整（uni-app-x内uniPlatform区分app-android、app-ios）
+## 1.1.19（2024-03-20）
+- uni-id-co 修复 实人认证的认证照片在阿里云服务空间没有保存到指定路径下的Bug
+- uni-id-co 修复 云对象开发依赖未移除的Bug
+## 1.1.18（2024-02-20）
+- 修复 PC设置头像无效的问题
 ## 1.1.17（2023-12-14）
 - uni-id-co 移除一键登录、短信的调用凭据
 ## 1.1.16（2023-10-18）

uni_modules/uni-id-pages/components/uni-id-pages-avatar/uni-id-pages-avatar.vue

@@ -130,10 +130,9 @@
 							filePath = res.tempFilePaths[0]
 							
 						//非app端剪裁头像，app端用内置的原生裁剪
-						// #ifndef APP-PLUS
-						filePath = await new Promise((callback) => {
 						// #ifdef H5
 						if (!this.isPC) {
+							filePath = await new Promise((callback) => {
 								uni.navigateTo({
 									url: '/uni_modules/uni-id-pages/pages/userinfo/cropImage/cropImage?path=' +
 										filePath + `&options=${JSON.stringify(crop)}`,
@@ -144,12 +143,11 @@
 										}
 									},
 									complete(e) {
-										// console.log(e);
+										console.log(e);
 									}
 								});
-							}
-							// #endif
 							})
+						}
 						// #endif
 						
 						let cloudPath = this.userInfo._id + '' + Date.now()

uni_modules/uni-id-pages/package.json

 {
 	"id": "uni-id-pages",
 	"displayName": "uni-id-pages",
-	"version": "1.1.17",
+	"version": "1.1.20",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
         "用户管理",
@@ -55,7 +55,8 @@
 		"platforms": {
 			"cloud": {
 				"tcb": "y",
-				"aliyun": "y"
+                "aliyun": "y",
+                "alipay": "y"
 			},
 			"client": {
 				"Vue": {

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/common/utils.js

@@ -171,13 +171,6 @@ function getNonceStr (length = 16) {
   return str.substring(0, length)
 }
 
-try {
-  require('lodash.merge')
-} catch (error) {
-  console.error('uni-id-co缺少依赖，请在uniCloud/cloudfunctions/uni-id-co目录执行 npm install 安装依赖')
-  throw error
-}
-
 function isMatchUserApp (userAppList, matchAppList) {
   if (userAppList === undefined || userAppList === null) {
     return true

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/index.obj.js

@@ -111,6 +111,8 @@ module.exports = {
     switch (clientPlatform) {
       case 'app':
       case 'app-plus':
+      case 'app-android':
+      case 'app-ios':
         clientPlatform = 'app'
         break
       case 'web':

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/third-party/apple/account/index.js

 const rsaPublicKeyPem = require('../rsa-public-key-pem')
+const {
+  jwtVerify
+} = require('../../../npm/index')
 let authKeysCache = null
 
 module.exports = class Auth {
@@ -44,7 +47,7 @@ module.exports = class Auth {
      *   nonce_supported: true
      * }
      */
-    const payload = require('jsonwebtoken').verify(
+    const payload = jwtVerify(
       identityToken,
       rsaPublicKeyPem(usedKey.n, usedKey.e),
       {

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/config.js

@@ -18,7 +18,7 @@ const uniIdConfig = createConfig({
 })
 
 class ConfigUtils {
-  constructor ({
+  constructor({
     context
   } = {}) {
     this.context = context
@@ -31,6 +31,8 @@ class ConfigUtils {
     switch (uniPlatform) {
       case 'app':
       case 'app-plus':
+      case 'app-android':
+      case 'app-ios':
         this.platform = 'app'
         break
       case 'web':
@@ -43,7 +45,7 @@ class ConfigUtils {
     }
   }
 
-  getConfigArray () {
+  getConfigArray() {
     let configContent
     try {
       configContent = require('uni-config-center/uni-id/config.json')
@@ -57,12 +59,12 @@ class ConfigUtils {
     return [configContent]
   }
 
-  getAppConfig () {
+  getAppConfig() {
     const configArray = this.getConfigArray()
     return configArray.find(item => item.dcloudAppid === this.appId) || configArray.find(item => item.isDefaultConfig)
   }
 
-  getPlatformConfig () {
+  getPlatformConfig() {
     const appConfig = this.getAppConfig()
     if (!appConfig) {
       throw new Error(
@@ -87,7 +89,7 @@ class ConfigUtils {
     return Object.assign(defaultConfig, appConfig, appConfig[platform])
   }
 
-  getOauthProvider ({
+  getOauthProvider({
     provider
   } = {}) {
     const clientPlatform = this.platform
@@ -101,7 +103,7 @@ class ConfigUtils {
     return oatuhProivder
   }
 
-  getOauthConfig ({
+  getOauthConfig({
     provider
   } = {}) {
     const config = this.getPlatformConfig()
@@ -122,7 +124,7 @@ class ConfigUtils {
     return oauthConfig
   }
 
-  getHooks () {
+  getHooks() {
     if (uniIdConfig.hasFile('hooks/index.js')) {
       return require(
         uniIdConfig.resolve('hooks/index.js')

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/qq.js

@@ -10,6 +10,8 @@ function getQQPlatform () {
   switch (platform) {
     case 'app':
     case 'app-plus':
+    case 'app-android':
+    case 'app-ios':
       return 'app'
     case 'mp-qq':
       return 'mp'

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/register.js

@@ -16,7 +16,9 @@ const {
   logout
 } = require('./logout')
 const PasswordUtils = require('./password')
-const merge = require('lodash.merge')
+const { 
+  merge
+} = require('../npm/index')
 
 async function realPreRegister (params = {}) {
   const {

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/relate.js

@@ -14,7 +14,9 @@ const {
 const {
   batchFindObjctValue
 } = require('../../common/utils')
-const merge = require('lodash.merge')
+const {
+  merge
+} = require('../npm/index')
 
 /**
  *

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/weixin.js

@@ -43,6 +43,8 @@ function getWeixinPlatform () {
   switch (platform) {
     case 'app':
     case 'app-plus':
+    case 'app-android':
+    case 'app-ios':
       return 'app'
     case 'mp-weixin':
       return 'mp'

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/facial-recognition-verify/get-auth-result.js

@@ -109,6 +109,7 @@ module.exports = async function (params) {
         fileID
       } = await uniCloud.uploadFile({
         cloudPath: `user/id-card/${uid}.b64`,
+        cloudPathAsRealPath: true,
         fileContent: Buffer.from(encryptData.call(this, pictureRes.data.toString('base64')))
       })
       updateData.realname_auth.in_hand = fileID

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/verify/send-sms-code.js

@@ -49,7 +49,7 @@ module.exports = async function (params = {}) {
     this.config.service.sms &&
     this.config.service.sms.scene &&
     this.config.service.sms.scene[scene]) || {}
-  if (!templateId) {
+  if (!templateId || !templateId.replace(/[^0-9a-zA-Z]/g, '')) {
     await require('../../lib/utils/verify-code')
       .setMobileVerifyCode.call(this, {
         mobile: params.mobile,

uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json

 {
   "name": "uni-id-co",
-  "version": "1.1.17",
+  "version": "1.1.20",
   "description": "",
   "main": "index.js",
   "keywords": [],
   "author": "DCloud",
   "dependencies": {
-    "jsonwebtoken": "8.5.1",
-    "lodash.merge": "^4.6.2",
     "uni-captcha": "file:../../../../uni-captcha/uniCloud/cloudfunctions/common/uni-captcha",
     "uni-config-center": "file:../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
     "uni-id-common": "file:../../../../uni-id-common/uniCloud/cloudfunctions/common/uni-id-common",
@@ -21,12 +19,5 @@
   },
   "cloudfunction-config": {
     "keepRunningAfterReturn": false
-  },
-  "devDependencies": {
-    "eslint": "^8.18.0",
-    "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.3",
-    "eslint-plugin-promise": "^6.0.0"
   }
 }

uni_modules/uni-popup/changelog.md

+## 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_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -10,14 +10,15 @@
 		</view>
 		<view v-else class="uni-dialog-content">
 			<slot>
-				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText" :focus="focus" >
+				<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" @click="closeDialog">
+			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
 				<text class="uni-dialog-button-text">{{closeText}}</text>
 			</view>
-			<view class="uni-dialog-button uni-border-left" @click="onOk">
+			<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>
@@ -31,13 +32,16 @@
 		initVueI18n
 	} from '@dcloudio/uni-i18n'
 	import messages from '../uni-popup/i18n/index.js'
-	const {	t } = initVueI18n(messages)
+	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 提示
@@ -46,8 +50,10 @@
 	 * @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 点击取消按钮触发
 	 */
@@ -55,16 +61,30 @@
 	export default {
 		name: "uniPopupDialog",
 		mixins: [popup],
-		emits:['confirm','close'],
+		emits: ['confirm', 'close', 'update:modelValue', 'input'],
 		props: {
-			inputType:{
+			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: ''
@@ -89,19 +109,26 @@
 				type: Boolean,
 				default: false
 			},
-			cancelText:{
+			cancelText: {
 				type: String,
 				default: ''
 			},
-			confirmText:{
+			confirmText: {
 				type: String,
 				default: ''
+			},
+			maxlength: {
+				type: Number,
+				default: -1,
+			},
+			focus: {
+				type: Boolean,
+				default: true,
 			}
 		},
 		data() {
 			return {
 				dialogType: 'error',
-				focus: false,
 				val: ""
 			}
 		},
@@ -129,34 +156,48 @@
 				}
 			},
 			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
+				this.val = this.value;
+				// #ifdef VUE3
+				this.val = this.modelValue;
+				// #endif
 			} else {
 				this.dialogType = this.type
 			}
 		},
-		mounted() {
-			this.focus = true
-		},
 		methods: {
 			/**
 			 * 点击确认按钮
 			 */
 			onOk() {
-				if (this.mode === 'input'){
+				if (this.mode === 'input') {
 					this.$emit('confirm', this.val)
-				}else{
+				} else {
 					this.$emit('confirm')
 				}
-				if(this.beforeClose) return
+				if (this.beforeClose) return
 				this.popup.close()
 			},
 			/**
@@ -164,17 +205,17 @@
 			 */
 			closeDialog() {
 				this.$emit('close')
-				if(this.beforeClose) return
+				if (this.beforeClose) return
 				this.popup.close()
 			},
-			close(){
+			close() {
 				this.popup.close()
 			}
 		}
 	}
 </script>
 
-<style lang="scss" >
+<style lang="scss">
 	.uni-popup-dialog {
 		width: 300px;
 		border-radius: 11px;

uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue

@@ -47,7 +47,7 @@
 					{
 						text: '支付宝',
 						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
-						name: 'wx'
+						name: 'ali'
 					},
 					{
 						text: 'QQ',

uni_modules/uni-popup/components/uni-popup/uni-popup.vue

@@ -5,7 +5,7 @@
 				: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">
+				<view class="uni-popup__wrapper" :style="getStyles" :class="[popupstyle]" @click="clear">
 					<slot />
 				</view>
 			</uni-transition>
@@ -39,6 +39,7 @@
 	 * @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 点击遮罩触发
@@ -86,6 +87,9 @@
 				type: String,
 				default: 'rgba(0, 0, 0, 0.4)'
 			},
+			borderRadius:{
+				type: String,
+			}
 		},
 
 		watch: {
@@ -157,6 +161,8 @@
 					backgroundColor: 'rgba(0, 0, 0, 0.4)'
 				},
 				transClass: {
+					backgroundColor: 'transparent',
+					borderRadius: this.borderRadius || "0",
 					position: 'fixed',
 					left: 0,
 					right: 0
@@ -167,6 +173,13 @@
 			}
 		},
 		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
 			},
@@ -221,6 +234,12 @@
 			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) {
@@ -240,10 +259,10 @@
 			this.maskClass.backgroundColor = this.maskBackgroundColor
 		},
 		methods: {
-			setH5Visible() {
+			setH5Visible(visible = true) {
 				// #ifdef H5
 				// fix by mehaotian 处理 h5 滚动穿透的问题
-				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				document.getElementsByTagName('body')[0].style.overflow =  visible ? "visible" : "hidden";
 				// #endif
 			},
 			/**
@@ -323,7 +342,8 @@
 					position: 'fixed',
 					left: 0,
 					right: 0,
-					backgroundColor: this.bg
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0"
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
@@ -347,7 +367,8 @@
 					right: 0,
 					bottom: 0,
 					paddingBottom: this.safeAreaInsets + 'px',
-					backgroundColor: this.bg
+					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
@@ -359,7 +380,13 @@
 			 */
 			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 */
@@ -371,7 +398,8 @@
 					right: 0,
 					top: 0,
 					justifyContent: 'center',
-					alignItems: 'center'
+					alignItems: 'center',
+					borderRadius:this.borderRadius || "0"
 				}
 				// TODO 兼容 type 属性 ，后续会废弃
 				if (type) return
@@ -387,6 +415,7 @@
 					bottom: 0,
 					top: 0,
 					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
 					/* #ifndef APP-NVUE */
 					display: 'flex',
 					flexDirection: 'column'
@@ -406,6 +435,7 @@
 					right: 0,
 					top: 0,
 					backgroundColor: this.bg,
+					borderRadius:this.borderRadius || "0",
 					/* #ifndef APP-NVUE */
 					display: 'flex',
 					flexDirection: 'column'

uni_modules/uni-popup/package.json

 {
 	"id": "uni-popup",
 	"displayName": "uni-popup 弹出层",
-	"version": "1.8.4",
+	"version": "1.9.1",
 	"description": " Popup 组件，提供常用的弹层",
 	"keywords": [
         "uni-ui",
@@ -46,7 +46,8 @@
 		"platforms": {
 			"cloud": {
 				"tcb": "y",
-				"aliyun": "y"
+                "aliyun": "y",
+                "alipay": "n"
 			},
 			"client": {
 				"App": {

uni_modules/uni-transition/changelog.md

+## 1.3.3（2024-04-23）
+- 修复 当元素会受变量影响自动隐藏的bug
 ## 1.3.2（2023-05-04）
 - 修复 NVUE 平台报错的问题
 ## 1.3.1（2021-11-23）

uni_modules/uni-transition/components/uni-transition/uni-transition.vue

@@ -254,7 +254,7 @@ export default {
 		},
 		animationType(type) {
 			return {
-				fade: type ? 1 : 0,
+				fade: type ? 0 : 1,
 				'slide-top': `translateY(${type ? '0' : '-100%'})`,
 				'slide-right': `translateX(${type ? '0' : '100%'})`,
 				'slide-bottom': `translateY(${type ? '0' : '100%'})`,

uni_modules/uni-transition/package.json

 {
   "id": "uni-transition",
   "displayName": "uni-transition 过渡动画",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "元素的简单过渡动画",
   "keywords": [
     "uni-ui",
@@ -43,7 +43,8 @@
     "platforms": {
       "cloud": {
         "tcb": "y",
-        "aliyun": "y"
+        "aliyun": "y",
+        "alipay": "n"
       },
       "client": {
         "App": {