From a7a9979ad30eecc51ac7e71cd405e97f50ef38f4 Mon Sep 17 00:00:00 2001
From: linju <linju@dcloud.io>
Date: Thu, 14 Dec 2023 11:44:28 +0800
Subject: [PATCH] =?UTF-8?q?2.1.6=20=E6=9B=B4=E6=96=B0=20=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=9A=84uni-id-pages=E7=9A=84=E7=89=88=E6=9C=AC=E4=B8=BA1.1.17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 changelog.md                                  |   2 +
 uni_modules/uni-captcha/changelog.md          |   6 +
 .../components/uni-captcha/uni-captcha.uvue   | 180 +++++
 .../uni-popup-captcha/uni-popup-captcha.uvue  | 134 ++++
 uni_modules/uni-captcha/package.json          |   2 +-
 uni_modules/uni-captcha/static/run.gif        | Bin 0 -> 31089 bytes
 .../uni-captcha-co/index.obj.js               |  18 +-
 uni_modules/uni-forms/changelog.md            |   2 +
 .../uni-forms-item/uni-forms-item.vue         |  10 +-
 .../components/uni-forms/uni-forms.vue        |   2 +-
 uni_modules/uni-forms/package.json            |   2 +-
 uni_modules/uni-icons/changelog.md            |  14 +
 .../components/uni-icons/uni-icons.uvue       |  91 +++
 .../components/uni-icons/uni-icons.vue        |  90 ++-
 .../components/uni-icons/uniicons.css         |  63 +-
 .../components/uni-icons/uniicons.ttf         | Bin 35760 -> 35824 bytes
 .../components/uni-icons/uniicons_file.ts     | 664 ++++++++++++++++++
 uni_modules/uni-icons/package.json            |  26 +-
 uni_modules/uni-id-pages/changelog.md         |   2 +
 uni_modules/uni-id-pages/package.json         |   2 +-
 .../cloudfunctions/uni-id-co/lib/utils/sms.js | 160 +++--
 .../uni-id-co/lib/utils/univerify.js          |  54 +-
 .../module/dev/get-supported-login-type.js    | 141 ++--
 .../cloudfunctions/uni-id-co/package.json     |   4 +-
 uni_modules/uni-popup/changelog.md            |   2 +
 .../components/uni-popup/uni-popup.uvue       |  90 +++
 .../components/uni-popup/uni-popup.vue        |   2 +-
 uni_modules/uni-popup/package.json            |   2 +-
 28 files changed, 1481 insertions(+), 284 deletions(-)
 create mode 100644 uni_modules/uni-captcha/components/uni-captcha/uni-captcha.uvue
 create mode 100644 uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue
 create mode 100644 uni_modules/uni-captcha/static/run.gif
 create mode 100644 uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
 create mode 100644 uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
 create mode 100644 uni_modules/uni-popup/components/uni-popup/uni-popup.uvue

diff --git a/changelog.md b/changelog.md
index c230c7a..20e2390 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,5 @@
+## 2.1.6（2023-12-14）
+- 更新 依赖的uni-id-pages的版本为1.1.17
 ## 2.1.5（2023-10-20）
 - 更新 依赖的uni-id-pages的版本为1.1.16
 ## 2.1.4（2023-07-11）
diff --git a/uni_modules/uni-captcha/changelog.md b/uni_modules/uni-captcha/changelog.md
index af274d8..8b4f585 100644
--- a/uni_modules/uni-captcha/changelog.md
+++ b/uni_modules/uni-captcha/changelog.md
@@ -1,3 +1,9 @@
+## 0.7.3（2023-11-15）
+- 更新 uni-popup-captcha.uvue依赖的popup组件，直接使用uni_modules下的uni-popup组件
+## 0.7.2（2023-11-07）
+- 新增 前端组件：uni-captcha.uvue、uni-popup-captcha
+## 0.7.1（2023-11-07）
+- 新增 前端组件：uni-captcha.uvue、uni-popup-captcha
 ## 0.7.0（2023-10-10）
 - 新增 支持在`uni-config-center`中配置mode，可选值为svg和bmp，配置成bmp后可以在uniappx的uvue页面正常显示验证码（uvue不支持显示svg验证码）
 ## 0.6.4（2023-01-16）
diff --git a/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.uvue b/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.uvue
new file mode 100644
index 0000000..aa51711
--- /dev/null
+++ b/uni_modules/uni-captcha/components/uni-captcha/uni-captcha.uvue
@@ -0,0 +1,180 @@
+<template>
+  <view class="captcha-box">
+    <view class="captcha-img-box">
+      <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"
+      maxlength="4" v-model="val" placeholder="请输入验证码" :cursor-spacing="cursorSpacing" />
+  </view>
+</template>
+
+<script>
+  export default {
+    emits: ["modelValue"],
+    props: {
+      cursorSpacing: {
+        type: Number,
+        default: 100
+      },
+      modelValue: {
+        type: String,
+        default: ""
+      },
+      value: {
+        type: String,
+        default: ""
+      },
+      scene: {
+        type: String,
+        default: ""
+      },
+      focus: {
+        type: Boolean,
+        default: false
+      }
+    },
+    data() {
+      return {
+        focusCaptchaInput: false,
+        captchaBase64: "" as string,
+        loging: false,
+        val: ""
+      };
+    },
+    watch: {
+      value: {
+        handler(value : string) {
+          // console.log('setvue', value);
+          this.val = value
+        },
+        immediate: true
+      },
+      modelValue: {
+        handler(modelValue : string) {
+          // console.log('setvue', modelValue);
+          this.val = modelValue
+        },
+        immediate: true
+      },
+      scene: {
+        handler(scene : string) {
+          if (scene.length != 0) {
+            this.getImageCaptcha(this.focus)
+          } else {
+            uni.showToast({
+              title: 'scene不能为空',
+              icon: 'none'
+            });
+          }
+        },
+        immediate: true
+      },
+      val(value : string) {
+        // console.log('setvue', value);
+        // TODO 兼容 vue2
+        // #ifdef VUE2
+        this.$emit('input', value);
+        // #endif
+        // TODO　兼容　vue3
+        // #ifdef VUE3
+        this.$emit('update:modelValue', value)
+        // #endif
+      }
+    },
+    methods: {
+      setFocus(state:boolean){
+        this.focusCaptchaInput = state
+      },
+      getImageCaptcha(focus : boolean) {
+        this.loging = true
+        if (focus) {
+          this.val = ''
+          this.focusCaptchaInput = true
+        }
+        const uniIdCo = uniCloud.importObject("uni-captcha-co", {
+          customUI: true
+        })
+        uniIdCo.getImageCaptcha({
+          scene: this.scene,
+          isUniAppX:true
+        }).then((result : UTSJSONObject) => {
+          this.captchaBase64 = (result.getString('captchaBase64') as string)
+        })
+       .catch<void>((err : any | null) : void => {
+         const error = err as UniCloudError
+         console.error(error)
+         console.error(error.code)
+        	uni.showToast({
+        		title: error.message,
+        		icon: 'none'
+        	});
+        })
+        .finally(()=> {
+        	this.loging = false
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .captcha-box {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-end;
+    flex: 1;
+  }
+
+  .captcha-img-box,
+  .captcha {
+    height: 44px;
+  }
+
+  .captcha {
+    flex: 1;
+  }
+
+  .captcha-img-box {
+    position: relative;
+    background-color: #FEFAE7;
+  }
+
+  .captcha {
+    background-color: #F8F8F8;
+    font-size: 14px;
+    flex: 1;
+    padding: 0 20rpx;
+    margin-left: 20rpx;
+    /* #ifndef APP-NVUE */
+    box-sizing: border-box;
+    /* #endif */
+  }
+
+  .captcha-img-box,
+  .captcha-img,
+  .loding {
+    width: 100px;
+  }
+
+  .captcha-img {
+    /* #ifdef WEB */
+    cursor: pointer;
+    /* #endif */
+    height: 44px;
+  }
+
+  .loding {
+    z-index: 9;
+    position: absolute;
+    width: 30px;
+    margin:7px 35px;
+  }
+
+  .opacity {
+    opacity: 0.5;
+  }
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue
new file mode 100644
index 0000000..24be570
--- /dev/null
+++ b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue
@@ -0,0 +1,134 @@
+<template>
+  <uni-popup ref="popup" @clickMask="cancel">
+    <view class="popup-captcha">
+      <view class="content">
+        <text class="title">{{title}}</text>
+        <uni-captcha ref="captcha" :focus="focus" :scene="scene" v-model="val" :cursorSpacing="150"></uni-captcha>
+      </view>
+      <view class="button-box">
+        <text @click="cancel" class="btn cancel">取消</text>
+        <text @click="confirm" class="btn confirm">确认</text>
+      </view>
+    </view>
+  </uni-popup>
+</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 {
+        focus: false,
+        val:""
+      }
+    },
+    props: {
+      modelValue: {
+        type: String,
+        default: ""
+      },
+      value: {
+        type: String,
+        default: ""
+      },
+      scene: {
+        type: String,
+        default: ""
+      },
+      title: {
+        type: String,
+        default: "默认标题"
+      }
+    },
+    watch: {
+      val(val:string) {
+        // console.log(val);
+        // TODO 兼容 vue2
+        // #ifdef VUE2
+        this.$emit('input', val);
+        // #endif
+        
+        // TODO　兼容　vue3
+        // #ifdef VUE3
+        this.$emit('update:modelValue', val)
+        // #endif
+        
+        if(val.length == 4){
+          this.confirm()
+        }
+      }
+    },
+    mounted() {},
+    methods: {
+      open(callback: () => void) {
+        // console.log('callback',callback);
+        confirmCallBack = callback;
+        this.focus = true
+        this.val = "";
+        (this.$refs['popup'] as ComponentPublicInstance).$callMethod("open");
+        this.$nextTick(()=>{
+          (this.$refs['captcha'] as ComponentPublicInstance).$callMethod("getImageCaptcha",true);
+        })
+      },
+      close() {
+        this.focus = false;
+        (this.$refs['popup'] as ComponentPublicInstance).$callMethod("close");
+      },
+      cancel(){
+        this.close()
+        this.$emit("cancel")
+      },
+      confirm() {
+        if (this.val.length != 4) {
+          return uni.showToast({
+            title: '请填写验证码',
+            icon: 'none'
+          });
+        }
+        this.close()
+        this.$emit('confirm')
+        confirmCallBack()
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .popup-captcha {
+    background-color: #fff;
+    flex-direction: column;
+    width: 600rpx;
+    padding:10px 15px;
+    border-radius: 10px;
+  }
+  .popup-captcha .title {
+    text-align: center;
+    font-weight: 700;
+    margin: 5px 0;
+  }
+  .popup-captcha .button-box {
+    flex-direction: row;
+    justify-content: space-around;
+    margin-top: 5px;
+  }
+  .popup-captcha .button-box .btn {
+    flex: 1;
+    height: 35px;
+    line-height: 35px;
+    text-align: center;
+  }
+  .popup-captcha .button-box .cancel {
+    border: 1px solid #eee;
+    color: #666;
+  }
+  .confirm {
+    background-color: #0070ff;
+    color: #fff;
+    margin-left: 5px;
+  }
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-captcha/package.json b/uni_modules/uni-captcha/package.json
index ed93df7..f7e1d51 100644
--- a/uni_modules/uni-captcha/package.json
+++ b/uni_modules/uni-captcha/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-captcha",
   "displayName": "uni-captcha",
-  "version": "0.7.0",
+  "version": "0.7.3",
   "description": "云端一体图形验证码组件",
   "keywords": [
     "captcha",
diff --git a/uni_modules/uni-captcha/static/run.gif b/uni_modules/uni-captcha/static/run.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6d164f2146c27a309af2de7862ee5641eb382c50
GIT binary patch
literal 31089
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
Ve{ud#)9(LUSw<G>pD82w-vC?=Ntyrv

literal 0
HcmV?d00001

diff --git a/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js b/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js
index 504857e..186e82c 100644
--- a/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js
+++ b/uni_modules/uni-captcha/uniCloud/cloudfunctions/uni-captcha-co/index.obj.js
@@ -5,16 +5,9 @@ const uniCaptcha = require('uni-captcha')
 const db = uniCloud.database();
 //获取数据表opendb-verify-codes对象
 const verifyCodes = db.collection('opendb-verify-codes')
-
-const createConfig = require('uni-config-center')
-const captchaConfig = createConfig({ // 获取配置实例
-    pluginId: 'captcha-config' // common/uni-config-center下的插件配置目录名
-})
-const Config = captchaConfig.config() // 获取common/uni-config-center/share-config/config.json的内容
-
 module.exports = {
 	async getImageCaptcha({
-		scene
+		scene,isUniAppX
 	}) {
 		//获取设备id
 		let {
@@ -30,10 +23,13 @@ module.exports = {
 		//如果已存在则调用刷新接口，反之调用插件接口
 		let action = res.data.length ? 'refresh' : 'create'
 		//执行并返回结果
-		return await uniCaptcha[action]({
-			text: Config.text,//用于测试
+    let option = {
 			scene, //来源客户端传递，表示：使用场景值，用于防止不同功能的验证码混用
 			uniPlatform: platform
-		})
+		}
+    if(isUniAppX){
+      option.mode = "bmp"
+    }
+		return await uniCaptcha[action](option)
 	}
 }
\ No newline at end of file
diff --git a/uni_modules/uni-forms/changelog.md b/uni_modules/uni-forms/changelog.md
index 8218df5..3d998bc 100644
--- a/uni_modules/uni-forms/changelog.md
+++ b/uni_modules/uni-forms/changelog.md
@@ -1,3 +1,5 @@
+## 1.4.10（2023-11-03）
+- 优化 labelWidth 描述错误
 ## 1.4.9（2023-02-10）
 - 修复 required 参数无法动态绑定
 ## 1.4.8（2022-08-23）
diff --git a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
index 34d73be..59b0528 100644
--- a/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
+++ b/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue
@@ -36,7 +36,7 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=2773
 	 * @property {Boolean} required 是否必填，左边显示红色"*"号
 	 * @property {String } 	label 				输入框左边的文字提示
-	 * @property {Number } 	labelWidth 			label的宽度，单位px（默认65）
+	 * @property {Number } 	labelWidth 			label的宽度，单位px（默认70）
 	 * @property {String } 	labelAlign = [left|center|right] label的文字对齐方式（默认left）
 	 * 	@value left		label 左侧显示
 	 * 	@value center	label 居中
@@ -91,7 +91,7 @@
 				type: String,
 				default: ''
 			},
-			// label的宽度 ，默认 80
+			// label的宽度
 			labelWidth: {
 				type: [String, Number],
 				default: ''
@@ -128,7 +128,7 @@
 				errMsg: '',
 				userRules: null,
 				localLabelAlign: 'left',
-				localLabelWidth: '65px',
+				localLabelWidth: '70px',
 				localLabelPos: 'left',
 				border: false,
 				isFirstBorder: false,
@@ -413,9 +413,9 @@
 				// 	const {
 				// 		labelWidth
 				// 	} = this.form
-				return this.num2px(this.labelWidth ? this.labelWidth : (labelWidth || (this.label ? 65 : 'auto')))
+				return this.num2px(this.labelWidth ? this.labelWidth : (labelWidth || (this.label ? 70 : 'auto')))
 				// }
-				// return '65px'
+				// return '70px'
 			},
 			// 处理 label 位置
 			_labelPosition() {
diff --git a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
index 21aee1a..b484cc9 100644
--- a/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
+++ b/uni_modules/uni-forms/components/uni-forms/uni-forms.vue
@@ -52,7 +52,7 @@
 	 * @property {String} labelPosition = [top|left]	label 位置 默认 left
 	 * @value top		顶部显示 label
 	 * @value left	左侧显示 label
-	 * @property {String} labelWidth	label 宽度，默认 65px
+	 * @property {String} labelWidth	label 宽度，默认 70px
 	 * @property {String} labelAlign = [left|center|right]	label 居中方式  默认 left
 	 * @value left		label 左侧显示
 	 * @value center	label 居中
diff --git a/uni_modules/uni-forms/package.json b/uni_modules/uni-forms/package.json
index 1925611..464b4e6 100644
--- a/uni_modules/uni-forms/package.json
+++ b/uni_modules/uni-forms/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-forms",
   "displayName": "uni-forms 表单",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "description": "由输入框、选择器、单选框、多选框等控件组成，用以收集、校验、提交数据",
   "keywords": [
     "uni-ui",
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
index 6449885..f8333ca 100644
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -1,3 +1,17 @@
+## 2.0.7（2023-12-14）
+- 修复 size 属性为 string 时，不加单位导致尺寸异常的bug
+## 2.0.6（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.5（2023-12-11）
+- 优化 兼容老版本icon类型，如 top ，bottom 等
+## 2.0.4（2023-12-06）
+- 优化 uni-app x 下示例项目图标排序
+## 2.0.3（2023-12-06）
+- 修复 nvue下引入组件报错的bug
+## 2.0.2（2023-12-05）
+-优化 size 属性支持单位
+## 2.0.1（2023-12-05）
+- 新增 uni-app x 支持定义图标
 ## 1.3.5（2022-01-24）
 - 优化 size 属性可以传入不带单位的字符串数值
 ## 1.3.4（2022-01-24）
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
new file mode 100644
index 0000000..4d0f271
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -0,0 +1,91 @@
+<template>
+	<text class="uni-icons" :style="styleObj">
+		<slot>{{unicode}}</slot>
+	</text>
+</template>
+
+<script>
+	import { fontData, IconsDataItem } from './uniicons_file'
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icon 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: "uni-icons",
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: Object,
+				default: 24
+			},
+			fontFamily: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {};
+		},
+		computed: {
+			unicode() : string {
+				let codes = fontData.find((item : IconsDataItem) : boolean => { return item.font_class == this.type })
+				if (codes !== null) {
+					return codes.unicode
+				}
+				return ''
+			},
+			iconSize() : string {
+				const size = this.size
+				if (typeof size == 'string') {
+					const reg = /^[0-9]*$/g
+					return reg.test(size as string) ? '' + size + 'px' : '' + size;
+					// return '' + this.size
+				}
+				return this.getFontSize(size as number)
+			},
+			styleObj() : UTSJSONObject {
+				if (this.fontFamily !== '') {
+					return { color: this.color, fontSize: this.iconSize, fontFamily: this.fontFamily }
+				}
+				return { color: this.color, fontSize: this.iconSize }
+			}
+		},
+		created() { },
+		methods: {
+			/**
+			 * 字体大小
+			 */
+			getFontSize(size : number) : string {
+				return size + 'px';
+			},
+		},
+	}
+</script>
+
+<style scoped>
+	@font-face {
+		font-family: UniIconsFontFamily;
+		src: url('./uniicons.ttf');
+	}
+
+	.uni-icons {
+		font-family: UniIconsFontFamily;
+		font-size: 18px;
+		font-style: normal;
+		color: #333;
+	}
+</style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
index a87f68e..3f677ec 100644
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -1,24 +1,28 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
-	<!-- #endif -->
-	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="styleObj" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick">
+		<slot></slot>
+	</text>
 	<!-- #endif -->
 </template>
 
 <script>
-	import icons from './icons.js';
-	const getVal = (val) => {
-		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
-	} 
+	import { fontData } from './uniicons_file.ts';
+
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' || reg.test(val)) ? val + 'px' : val;
+	}
+
 	// #ifdef APP-NVUE
 	var domModule = weex.requireModule('dom');
 	import iconUrl from './uniicons.ttf'
 	domModule.addRule('fontFace', {
 		'fontFamily': "uniicons",
-		'src': "url('"+iconUrl+"')"
+		'src': "url('" + iconUrl + "')"
 	});
 	// #endif
 
@@ -28,13 +32,13 @@
 	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
 	 * @property {Number} size 图标大小
 	 * @property {String} type 图标图案，参考示例
-	 * @property {String} color 图标颜色
-	 * @property {String} customPrefix 自定义图标
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
 	 * @event {Function} click 点击 Icon 触发事件
 	 */
 	export default {
 		name: 'UniIcons',
-		emits:['click'],
+		emits: ['click'],
 		props: {
 			type: {
 				type: String,
@@ -46,29 +50,39 @@
 			},
 			size: {
 				type: [Number, String],
-				default: 16
-			},
-			customPrefix:{
-				type: String,
-				default: ''
+				default: 24
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			fontFamily: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
 			return {
-				icons: icons.glyphs
+				icons: fontData
+			}
+		},
+		computed: {
+			unicode() {
+				let code = this.icons.find(v => v.font_class === this.type)
+				if (code) {
+					return code.unicode
+				}
+				return ''
+			},
+			iconSize() {
+				return getVal(this.size)
+			},
+			styleObj() {
+				if (this.fontFamily !== '') {
+					return `color: ${this.color}; font-size: ${this.iconSize}; font-family: ${this.fontFamily};`
+				}
+				return `color: ${this.color}; font-size: ${this.iconSize};`
 			}
-		},
-		computed:{
-			unicode(){
-				let code = this.icons.find(v=>v.font_class === this.type)
-				if(code){
-					return unescape(`%u${code.unicode}`)
-				}
-				return ''
-			},
-			iconSize(){
-				return getVal(this.size)
-			}
 		},
 		methods: {
 			_onClick() {
@@ -78,19 +92,19 @@
 	}
 </script>
 
-<style lang="scss">
-	/* #ifndef APP-NVUE */
+<style lang="scss">
+	/* #ifndef APP-NVUE */
 	@import './uniicons.css';
+
 	@font-face {
 		font-family: uniicons;
-		src: url('./uniicons.ttf') format('truetype');
+		src: url('./uniicons.ttf');
 	}
 
-	/* #endif */
+	/* #endif */
 	.uni-icons {
 		font-family: uniicons;
 		text-decoration: none;
 		text-align: center;
 	}
-
 </style>
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.css b/uni_modules/uni-icons/components/uni-icons/uniicons.css
index 2f56eab..0a6b6fe 100644
--- a/uni_modules/uni-icons/components/uni-icons/uniicons.css
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -1,3 +1,12 @@
+
+.uniui-cart-filled:before {
+  content: "\e6d0";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
 .uniui-color:before {
   content: "\e6cf";
 }
@@ -58,10 +67,6 @@
   content: "\e6c3";
 }
 
-.uniui-gift-filled:before {
-  content: "\e6c4";
-}
-
 .uniui-fire-filled:before {
   content: "\e6c5";
 }
@@ -82,6 +87,18 @@
   content: "\e698";
 }
 
+.uniui-arrowthinleft:before {
+  content: "\e6d2";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6d3";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6d4";
+}
+
 .uniui-back:before {
   content: "\e6b9";
 }
@@ -94,55 +111,43 @@
   content: "\e6bb";
 }
 
-.uniui-arrowthinright:before {
-  content: "\e6bb";
-}
-
 .uniui-arrow-left:before {
   content: "\e6bc";
 }
 
-.uniui-arrowthinleft:before {
-  content: "\e6bc";
-}
-
 .uniui-arrow-up:before {
   content: "\e6bd";
 }
 
-.uniui-arrowthinup:before {
-  content: "\e6bd";
-}
-
 .uniui-arrow-down:before {
   content: "\e6be";
 }
 
-.uniui-arrowthindown:before {
-  content: "\e6be";
+.uniui-arrowthinright:before {
+  content: "\e6d1";
 }
 
-.uniui-bottom:before {
+.uniui-down:before {
   content: "\e6b8";
 }
 
-.uniui-arrowdown:before {
+.uniui-bottom:before {
   content: "\e6b8";
 }
 
-.uniui-right:before {
-  content: "\e6b5";
+.uniui-arrowright:before {
+  content: "\e6d5";
 }
 
-.uniui-arrowright:before {
+.uniui-right:before {
   content: "\e6b5";
 }
 
-.uniui-top:before {
+.uniui-up:before {
   content: "\e6b6";
 }
 
-.uniui-arrowup:before {
+.uniui-top:before {
   content: "\e6b6";
 }
 
@@ -150,8 +155,8 @@
   content: "\e6b7";
 }
 
-.uniui-arrowleft:before {
-  content: "\e6b7";
+.uniui-arrowup:before {
+  content: "\e6d6";
 }
 
 .uniui-eye:before {
@@ -638,10 +643,6 @@
   content: "\e627";
 }
 
-.uniui-cart-filled:before {
-  content: "\e629";
-}
-
 .uniui-checkbox:before {
   content: "\e62b";
 }
diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
index 835f33bc9411461b8b9046b3fec742e921d6ce3a..14696d038d828073edac09ea4e5ba1dec2f58115 100644
GIT binary patch
delta 3270
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
NkM16_N1oeT@n2MfM_vE`

delta 3174
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
WG}d?b6t%2rZ*OjjT;5yCDEc4U`6v_s

diff --git a/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
new file mode 100644
index 0000000..86318df
--- /dev/null
+++ b/uni_modules/uni-icons/components/uni-icons/uniicons_file.ts
@@ -0,0 +1,664 @@
+
+export type IconsData = {
+	id : string
+	name : string
+	font_family : string
+	css_prefix_text : string
+	description : string
+	glyphs : Array<IconsDataItem>
+}
+
+export type IconsDataItem = {
+	font_class : string
+	unicode : string
+}
+
+
+export const fontData = [
+  {
+    "font_class": "arrow-down",
+    "unicode": "\ue6be"
+  },
+  {
+    "font_class": "arrow-left",
+    "unicode": "\ue6bc"
+  },
+  {
+    "font_class": "arrow-right",
+    "unicode": "\ue6bb"
+  },
+  {
+    "font_class": "arrow-up",
+    "unicode": "\ue6bd"
+  },
+  {
+    "font_class": "auth",
+    "unicode": "\ue6ab"
+  },
+  {
+    "font_class": "auth-filled",
+    "unicode": "\ue6cc"
+  },
+  {
+    "font_class": "back",
+    "unicode": "\ue6b9"
+  },
+  {
+    "font_class": "bars",
+    "unicode": "\ue627"
+  },
+  {
+    "font_class": "calendar",
+    "unicode": "\ue6a0"
+  },
+  {
+    "font_class": "calendar-filled",
+    "unicode": "\ue6c0"
+  },
+  {
+    "font_class": "camera",
+    "unicode": "\ue65a"
+  },
+  {
+    "font_class": "camera-filled",
+    "unicode": "\ue658"
+  },
+  {
+    "font_class": "cart",
+    "unicode": "\ue631"
+  },
+  {
+    "font_class": "cart-filled",
+    "unicode": "\ue6d0"
+  },
+  {
+    "font_class": "chat",
+    "unicode": "\ue65d"
+  },
+  {
+    "font_class": "chat-filled",
+    "unicode": "\ue659"
+  },
+  {
+    "font_class": "chatboxes",
+    "unicode": "\ue696"
+  },
+  {
+    "font_class": "chatboxes-filled",
+    "unicode": "\ue692"
+  },
+  {
+    "font_class": "chatbubble",
+    "unicode": "\ue697"
+  },
+  {
+    "font_class": "chatbubble-filled",
+    "unicode": "\ue694"
+  },
+  {
+    "font_class": "checkbox",
+    "unicode": "\ue62b"
+  },
+  {
+    "font_class": "checkbox-filled",
+    "unicode": "\ue62c"
+  },
+  {
+    "font_class": "checkmarkempty",
+    "unicode": "\ue65c"
+  },
+  {
+    "font_class": "circle",
+    "unicode": "\ue65b"
+  },
+  {
+    "font_class": "circle-filled",
+    "unicode": "\ue65e"
+  },
+  {
+    "font_class": "clear",
+    "unicode": "\ue66d"
+  },
+  {
+    "font_class": "close",
+    "unicode": "\ue673"
+  },
+  {
+    "font_class": "closeempty",
+    "unicode": "\ue66c"
+  },
+  {
+    "font_class": "cloud-download",
+    "unicode": "\ue647"
+  },
+  {
+    "font_class": "cloud-download-filled",
+    "unicode": "\ue646"
+  },
+  {
+    "font_class": "cloud-upload",
+    "unicode": "\ue645"
+  },
+  {
+    "font_class": "cloud-upload-filled",
+    "unicode": "\ue648"
+  },
+  {
+    "font_class": "color",
+    "unicode": "\ue6cf"
+  },
+  {
+    "font_class": "color-filled",
+    "unicode": "\ue6c9"
+  },
+  {
+    "font_class": "compose",
+    "unicode": "\ue67f"
+  },
+  {
+    "font_class": "contact",
+    "unicode": "\ue693"
+  },
+  {
+    "font_class": "contact-filled",
+    "unicode": "\ue695"
+  },
+  {
+    "font_class": "down",
+    "unicode": "\ue6b8"
+  },
+	{
+	  "font_class": "bottom",
+	  "unicode": "\ue6b8"
+	},
+  {
+    "font_class": "download",
+    "unicode": "\ue68d"
+  },
+  {
+    "font_class": "download-filled",
+    "unicode": "\ue681"
+  },
+  {
+    "font_class": "email",
+    "unicode": "\ue69e"
+  },
+  {
+    "font_class": "email-filled",
+    "unicode": "\ue69a"
+  },
+  {
+    "font_class": "eye",
+    "unicode": "\ue651"
+  },
+  {
+    "font_class": "eye-filled",
+    "unicode": "\ue66a"
+  },
+  {
+    "font_class": "eye-slash",
+    "unicode": "\ue6b3"
+  },
+  {
+    "font_class": "eye-slash-filled",
+    "unicode": "\ue6b4"
+  },
+  {
+    "font_class": "fire",
+    "unicode": "\ue6a1"
+  },
+  {
+    "font_class": "fire-filled",
+    "unicode": "\ue6c5"
+  },
+  {
+    "font_class": "flag",
+    "unicode": "\ue65f"
+  },
+  {
+    "font_class": "flag-filled",
+    "unicode": "\ue660"
+  },
+  {
+    "font_class": "folder-add",
+    "unicode": "\ue6a9"
+  },
+  {
+    "font_class": "folder-add-filled",
+    "unicode": "\ue6c8"
+  },
+  {
+    "font_class": "font",
+    "unicode": "\ue6a3"
+  },
+  {
+    "font_class": "forward",
+    "unicode": "\ue6ba"
+  },
+  {
+    "font_class": "gear",
+    "unicode": "\ue664"
+  },
+  {
+    "font_class": "gear-filled",
+    "unicode": "\ue661"
+  },
+  {
+    "font_class": "gift",
+    "unicode": "\ue6a4"
+  },
+  {
+    "font_class": "gift-filled",
+    "unicode": "\ue6c4"
+  },
+  {
+    "font_class": "hand-down",
+    "unicode": "\ue63d"
+  },
+  {
+    "font_class": "hand-down-filled",
+    "unicode": "\ue63c"
+  },
+  {
+    "font_class": "hand-up",
+    "unicode": "\ue63f"
+  },
+  {
+    "font_class": "hand-up-filled",
+    "unicode": "\ue63e"
+  },
+  {
+    "font_class": "headphones",
+    "unicode": "\ue630"
+  },
+  {
+    "font_class": "heart",
+    "unicode": "\ue639"
+  },
+  {
+    "font_class": "heart-filled",
+    "unicode": "\ue641"
+  },
+  {
+    "font_class": "help",
+    "unicode": "\ue679"
+  },
+  {
+    "font_class": "help-filled",
+    "unicode": "\ue674"
+  },
+  {
+    "font_class": "home",
+    "unicode": "\ue662"
+  },
+  {
+    "font_class": "home-filled",
+    "unicode": "\ue663"
+  },
+  {
+    "font_class": "image",
+    "unicode": "\ue670"
+  },
+  {
+    "font_class": "image-filled",
+    "unicode": "\ue678"
+  },
+  {
+    "font_class": "images",
+    "unicode": "\ue650"
+  },
+  {
+    "font_class": "images-filled",
+    "unicode": "\ue64b"
+  },
+  {
+    "font_class": "info",
+    "unicode": "\ue669"
+  },
+  {
+    "font_class": "info-filled",
+    "unicode": "\ue649"
+  },
+  {
+    "font_class": "left",
+    "unicode": "\ue6b7"
+  },
+  {
+    "font_class": "link",
+    "unicode": "\ue6a5"
+  },
+  {
+    "font_class": "list",
+    "unicode": "\ue644"
+  },
+  {
+    "font_class": "location",
+    "unicode": "\ue6ae"
+  },
+  {
+    "font_class": "location-filled",
+    "unicode": "\ue6af"
+  },
+  {
+    "font_class": "locked",
+    "unicode": "\ue66b"
+  },
+  {
+    "font_class": "locked-filled",
+    "unicode": "\ue668"
+  },
+  {
+    "font_class": "loop",
+    "unicode": "\ue633"
+  },
+  {
+    "font_class": "mail-open",
+    "unicode": "\ue643"
+  },
+  {
+    "font_class": "mail-open-filled",
+    "unicode": "\ue63a"
+  },
+  {
+    "font_class": "map",
+    "unicode": "\ue667"
+  },
+  {
+    "font_class": "map-filled",
+    "unicode": "\ue666"
+  },
+  {
+    "font_class": "map-pin",
+    "unicode": "\ue6ad"
+  },
+  {
+    "font_class": "map-pin-ellipse",
+    "unicode": "\ue6ac"
+  },
+  {
+    "font_class": "medal",
+    "unicode": "\ue6a2"
+  },
+  {
+    "font_class": "medal-filled",
+    "unicode": "\ue6c3"
+  },
+  {
+    "font_class": "mic",
+    "unicode": "\ue671"
+  },
+  {
+    "font_class": "mic-filled",
+    "unicode": "\ue677"
+  },
+  {
+    "font_class": "micoff",
+    "unicode": "\ue67e"
+  },
+  {
+    "font_class": "micoff-filled",
+    "unicode": "\ue6b0"
+  },
+  {
+    "font_class": "minus",
+    "unicode": "\ue66f"
+  },
+  {
+    "font_class": "minus-filled",
+    "unicode": "\ue67d"
+  },
+  {
+    "font_class": "more",
+    "unicode": "\ue64d"
+  },
+  {
+    "font_class": "more-filled",
+    "unicode": "\ue64e"
+  },
+  {
+    "font_class": "navigate",
+    "unicode": "\ue66e"
+  },
+  {
+    "font_class": "navigate-filled",
+    "unicode": "\ue67a"
+  },
+  {
+    "font_class": "notification",
+    "unicode": "\ue6a6"
+  },
+  {
+    "font_class": "notification-filled",
+    "unicode": "\ue6c1"
+  },
+  {
+    "font_class": "paperclip",
+    "unicode": "\ue652"
+  },
+  {
+    "font_class": "paperplane",
+    "unicode": "\ue672"
+  },
+  {
+    "font_class": "paperplane-filled",
+    "unicode": "\ue675"
+  },
+  {
+    "font_class": "person",
+    "unicode": "\ue699"
+  },
+  {
+    "font_class": "person-filled",
+    "unicode": "\ue69d"
+  },
+  {
+    "font_class": "personadd",
+    "unicode": "\ue69f"
+  },
+  {
+    "font_class": "personadd-filled",
+    "unicode": "\ue698"
+  },
+  {
+    "font_class": "personadd-filled-copy",
+    "unicode": "\ue6d1"
+  },
+  {
+    "font_class": "phone",
+    "unicode": "\ue69c"
+  },
+  {
+    "font_class": "phone-filled",
+    "unicode": "\ue69b"
+  },
+  {
+    "font_class": "plus",
+    "unicode": "\ue676"
+  },
+  {
+    "font_class": "plus-filled",
+    "unicode": "\ue6c7"
+  },
+  {
+    "font_class": "plusempty",
+    "unicode": "\ue67b"
+  },
+  {
+    "font_class": "pulldown",
+    "unicode": "\ue632"
+  },
+  {
+    "font_class": "pyq",
+    "unicode": "\ue682"
+  },
+  {
+    "font_class": "qq",
+    "unicode": "\ue680"
+  },
+  {
+    "font_class": "redo",
+    "unicode": "\ue64a"
+  },
+  {
+    "font_class": "redo-filled",
+    "unicode": "\ue655"
+  },
+  {
+    "font_class": "refresh",
+    "unicode": "\ue657"
+  },
+  {
+    "font_class": "refresh-filled",
+    "unicode": "\ue656"
+  },
+  {
+    "font_class": "refreshempty",
+    "unicode": "\ue6bf"
+  },
+  {
+    "font_class": "reload",
+    "unicode": "\ue6b2"
+  },
+  {
+    "font_class": "right",
+    "unicode": "\ue6b5"
+  },
+  {
+    "font_class": "scan",
+    "unicode": "\ue62a"
+  },
+  {
+    "font_class": "search",
+    "unicode": "\ue654"
+  },
+  {
+    "font_class": "settings",
+    "unicode": "\ue653"
+  },
+  {
+    "font_class": "settings-filled",
+    "unicode": "\ue6ce"
+  },
+  {
+    "font_class": "shop",
+    "unicode": "\ue62f"
+  },
+  {
+    "font_class": "shop-filled",
+    "unicode": "\ue6cd"
+  },
+  {
+    "font_class": "smallcircle",
+    "unicode": "\ue67c"
+  },
+  {
+    "font_class": "smallcircle-filled",
+    "unicode": "\ue665"
+  },
+  {
+    "font_class": "sound",
+    "unicode": "\ue684"
+  },
+  {
+    "font_class": "sound-filled",
+    "unicode": "\ue686"
+  },
+  {
+    "font_class": "spinner-cycle",
+    "unicode": "\ue68a"
+  },
+  {
+    "font_class": "staff",
+    "unicode": "\ue6a7"
+  },
+  {
+    "font_class": "staff-filled",
+    "unicode": "\ue6cb"
+  },
+  {
+    "font_class": "star",
+    "unicode": "\ue688"
+  },
+  {
+    "font_class": "star-filled",
+    "unicode": "\ue68f"
+  },
+  {
+    "font_class": "starhalf",
+    "unicode": "\ue683"
+  },
+  {
+    "font_class": "trash",
+    "unicode": "\ue687"
+  },
+  {
+    "font_class": "trash-filled",
+    "unicode": "\ue685"
+  },
+  {
+    "font_class": "tune",
+    "unicode": "\ue6aa"
+  },
+  {
+    "font_class": "tune-filled",
+    "unicode": "\ue6ca"
+  },
+  {
+    "font_class": "undo",
+    "unicode": "\ue64f"
+  },
+  {
+    "font_class": "undo-filled",
+    "unicode": "\ue64c"
+  },
+  {
+    "font_class": "up",
+    "unicode": "\ue6b6"
+  },
+	{
+	  "font_class": "top",
+	  "unicode": "\ue6b6"
+	},
+  {
+    "font_class": "upload",
+    "unicode": "\ue690"
+  },
+  {
+    "font_class": "upload-filled",
+    "unicode": "\ue68e"
+  },
+  {
+    "font_class": "videocam",
+    "unicode": "\ue68c"
+  },
+  {
+    "font_class": "videocam-filled",
+    "unicode": "\ue689"
+  },
+  {
+    "font_class": "vip",
+    "unicode": "\ue6a8"
+  },
+  {
+    "font_class": "vip-filled",
+    "unicode": "\ue6c6"
+  },
+  {
+    "font_class": "wallet",
+    "unicode": "\ue6b1"
+  },
+  {
+    "font_class": "wallet-filled",
+    "unicode": "\ue6c2"
+  },
+  {
+    "font_class": "weibo",
+    "unicode": "\ue68b"
+  },
+  {
+    "font_class": "weixin",
+    "unicode": "\ue691"
+  }
+] as IconsDataItem[]
+
+// export const fontData = JSON.parse<IconsDataItem>(fontDataJson)
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
index d1c4e77..63273c8 100644
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-icons",
   "displayName": "uni-icons 图标",
-  "version": "1.3.5",
+  "version": "2.0.7",
   "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
   "keywords": [
     "uni-ui",
@@ -16,11 +16,7 @@
   "directories": {
     "example": "../../temps/example_temps"
   },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
+"dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -37,7 +33,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": ["uni-scss"],
@@ -50,7 +47,8 @@
       "client": {
         "App": {
           "app-vue": "y",
-          "app-nvue": "y"
+          "app-nvue": "y",
+          "app-uvue": "y"
         },
         "H5-mobile": {
           "Safari": "y",
@@ -70,11 +68,15 @@
           "阿里": "y",
           "百度": "y",
           "字节跳动": "y",
-          "QQ": "y"
+          "QQ": "y",
+					"钉钉": "y",
+					"快手": "y",
+					"飞书": "y",
+					"京东": "y"
         },
         "快应用": {
-          "华为": "u",
-          "联盟": "u"
+          "华为": "y",
+          "联盟": "y"
         },
         "Vue": {
             "vue2": "y",
@@ -83,4 +85,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/uni_modules/uni-id-pages/changelog.md b/uni_modules/uni-id-pages/changelog.md
index 68be3ec..db54fa0 100644
--- a/uni_modules/uni-id-pages/changelog.md
+++ b/uni_modules/uni-id-pages/changelog.md
@@ -1,3 +1,5 @@
+## 1.1.17（2023-12-14）
+- uni-id-co 移除一键登录、短信的调用凭据
 ## 1.1.16（2023-10-18）
 - 修复 当不满足一键登录时页面回退无法继续登录的问题
 ## 1.1.15（2023-07-13）
diff --git a/uni_modules/uni-id-pages/package.json b/uni_modules/uni-id-pages/package.json
index 66e1614..c36b4ea 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.16",
+	"version": "1.1.17",
 	"description": "云端一体简单、统一、可扩展的用户中心页面模版",
 	"keywords": [
         "用户管理",
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
index 9caecaa..ae9b7af 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/sms.js
@@ -1,81 +1,79 @@
-const {
-  setMobileVerifyCode
-} = require('./verify-code')
-const {
-  getVerifyCode
-} = require('../../common/utils')
-
-/**
- * 发送短信
- * @param {object} param
- * @param {string} param.mobile       手机号
- * @param {object} param.code         可选，验证码
- * @param {object} param.scene        短信场景
- * @param {object} param.templateId   可选，短信模板id
- * @returns
- */
-async function sendSmsCode ({
-  mobile,
-  code,
-  scene,
-  templateId
-} = {}) {
-  const requiredParams = [
-    'name',
-    'smsKey',
-    'smsSecret',
-    'codeExpiresIn'
-  ]
-  const smsConfig = (this.config.service && this.config.service.sms) || {}
-  for (let i = 0; i < requiredParams.length; i++) {
-    const key = requiredParams[i]
-    if (!smsConfig[key]) {
-      throw new Error(`Missing config param: service.sms.${key}`)
-    }
-  }
-  if (!code) {
-    code = getVerifyCode()
-  }
-  let action
-  switch (scene) {
-    case 'login-by-sms':
-      action = this.t('login')
-      break
-    default:
-      action = this.t('verify-mobile')
-      break
-  }
-  const sceneConfig = (smsConfig.scene || {})[scene] || {}
-  if (!templateId) {
-    templateId = sceneConfig.templateId
-  }
-  if (!templateId) {
-    throw new Error('"templateId" is required')
-  }
-  const codeExpiresIn = sceneConfig.codeExpiresIn || smsConfig.codeExpiresIn
-  await setMobileVerifyCode.call(this, {
-    mobile,
-    code,
-    expiresIn: codeExpiresIn,
-    scene
-  })
-  await uniCloud.sendSms({
-    smsKey: smsConfig.smsKey,
-    smsSecret: smsConfig.smsSecret,
-    phone: mobile,
-    templateId,
-    data: {
-      name: smsConfig.name,
-      code,
-      action,
-      expMinute: '' + Math.round(codeExpiresIn / 60)
-    }
-  })
-  return {
-    errCode: 0
-  }
-}
-
-module.exports = {
-  sendSmsCode
-}
+const {
+  setMobileVerifyCode
+} = require('./verify-code')
+const {
+  getVerifyCode
+} = require('../../common/utils')
+
+/**
+ * 发送短信
+ * @param {object} param
+ * @param {string} param.mobile       手机号
+ * @param {object} param.code         可选，验证码
+ * @param {object} param.scene        短信场景
+ * @param {object} param.templateId   可选，短信模板id
+ * @returns
+ */
+async function sendSmsCode ({
+  mobile,
+  code,
+  scene,
+  templateId
+} = {}) {
+  const requiredParams = [
+    'name',
+    'codeExpiresIn'
+  ]
+  const smsConfig = (this.config.service && this.config.service.sms) || {}
+  for (let i = 0; i < requiredParams.length; i++) {
+    const key = requiredParams[i]
+    if (!smsConfig[key]) {
+      throw new Error(`Missing config param: service.sms.${key}`)
+    }
+  }
+  if (!code) {
+    code = getVerifyCode()
+  }
+  let action
+  switch (scene) {
+    case 'login-by-sms':
+      action = this.t('login')
+      break
+    default:
+      action = this.t('verify-mobile')
+      break
+  }
+  const sceneConfig = (smsConfig.scene || {})[scene] || {}
+  if (!templateId) {
+    templateId = sceneConfig.templateId
+  }
+  if (!templateId) {
+    throw new Error('"templateId" is required')
+  }
+  const codeExpiresIn = sceneConfig.codeExpiresIn || smsConfig.codeExpiresIn
+  await setMobileVerifyCode.call(this, {
+    mobile,
+    code,
+    expiresIn: codeExpiresIn,
+    scene
+  })
+  await uniCloud.sendSms({
+    smsKey: smsConfig.smsKey,
+    smsSecret: smsConfig.smsSecret,
+    phone: mobile,
+    templateId,
+    data: {
+      name: smsConfig.name,
+      code,
+      action,
+      expMinute: '' + Math.round(codeExpiresIn / 60)
+    }
+  })
+  return {
+    errCode: 0
+  }
+}
+
+module.exports = {
+  sendSmsCode
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
index 8b45b62..b64bef9 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/lib/utils/univerify.js
@@ -1,27 +1,27 @@
-async function getPhoneNumber ({
-  // eslint-disable-next-line camelcase
-  access_token,
-  openid
-} = {}) {
-  const requiredParams = ['apiKey', 'apiSecret']
-  const univerifyConfig = (this.config.service && this.config.service.univerify) || {}
-  for (let i = 0; i < requiredParams.length; i++) {
-    const key = requiredParams[i]
-    if (!univerifyConfig[key]) {
-      throw new Error(`Missing config param: service.univerify.${key}`)
-    }
-  }
-  return uniCloud.getPhoneNumber({
-    provider: 'univerify',
-    appid: this.getUniversalClientInfo().appId,
-    apiKey: univerifyConfig.apiKey,
-    apiSecret: univerifyConfig.apiSecret,
-    // eslint-disable-next-line camelcase
-    access_token,
-    openid
-  })
-}
-
-module.exports = {
-  getPhoneNumber
-}
+async function getPhoneNumber ({
+  // eslint-disable-next-line camelcase
+  access_token,
+  openid
+} = {}) {
+  const requiredParams = []
+  const univerifyConfig = (this.config.service && this.config.service.univerify) || {}
+  for (let i = 0; i < requiredParams.length; i++) {
+    const key = requiredParams[i]
+    if (!univerifyConfig[key]) {
+      throw new Error(`Missing config param: service.univerify.${key}`)
+    }
+  }
+  return uniCloud.getPhoneNumber({
+    provider: 'univerify',
+    appid: this.getUniversalClientInfo().appId,
+    apiKey: univerifyConfig.apiKey,
+    apiSecret: univerifyConfig.apiSecret,
+    // eslint-disable-next-line camelcase
+    access_token,
+    openid
+  })
+}
+
+module.exports = {
+  getPhoneNumber
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
index 7d235fe..c28f3bd 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/module/dev/get-supported-login-type.js
@@ -1,71 +1,70 @@
-function isMobileCodeSupported () {
-  const config = this.config
-  return !!(config.service && config.service.sms && config.service.sms.smsKey)
-}
-
-function isUniverifySupport () {
-  const config = this.config
-  return !!(config.service && config.service.univerify && config.service.univerify.apiKey)
-}
-
-function isWeixinSupported () {
-  this.configUtils.getOauthConfig({
-    provider: 'weixin'
-  })
-  return true
-}
-
-function isQQSupported () {
-  this.configUtils.getOauthConfig({
-    provider: 'qq'
-  })
-  return true
-}
-
-function isAppleSupported () {
-  this.configUtils.getOauthConfig({
-    provider: 'apple'
-  })
-  return true
-}
-
-function isAlipaySupported () {
-  this.configUtils.getOauthConfig({
-    provider: 'alipay'
-  })
-  return true
-}
-
-const loginTypeTester = {
-  'mobile-code': isMobileCodeSupported,
-  univerify: isUniverifySupport,
-  weixin: isWeixinSupported,
-  qq: isQQSupported,
-  apple: isAppleSupported,
-  alipay: isAlipaySupported
-}
-
-/**
- * 获取支持的登录方式
- * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-supported-login-type
- * @returns
- */
-module.exports = async function () {
-  const supportedLoginType = [
-    'username-password',
-    'mobile-password',
-    'email-password'
-  ]
-  for (const type in loginTypeTester) {
-    try {
-      if (loginTypeTester[type].call(this)) {
-        supportedLoginType.push(type)
-      }
-    } catch (error) { }
-  }
-  return {
-    errCode: 0,
-    errMsg: '',
-    supportedLoginType
-  }
-}
+function isMobileCodeSupported () {
+  const config = this.config
+  return !!(config.service && config.service.sms && config.service.sms.smsKey)
+}
+
+function isUniverifySupport () {
+  return true
+}
+
+function isWeixinSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'weixin'
+  })
+  return true
+}
+
+function isQQSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'qq'
+  })
+  return true
+}
+
+function isAppleSupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'apple'
+  })
+  return true
+}
+
+function isAlipaySupported () {
+  this.configUtils.getOauthConfig({
+    provider: 'alipay'
+  })
+  return true
+}
+
+const loginTypeTester = {
+  'mobile-code': isMobileCodeSupported,
+  univerify: isUniverifySupport,
+  weixin: isWeixinSupported,
+  qq: isQQSupported,
+  apple: isAppleSupported,
+  alipay: isAlipaySupported
+}
+
+/**
+ * 获取支持的登录方式
+ * @tutorial https://uniapp.dcloud.net.cn/uniCloud/uni-id-pages.html#get-supported-login-type
+ * @returns
+ */
+module.exports = async function () {
+  const supportedLoginType = [
+    'username-password',
+    'mobile-password',
+    'email-password'
+  ]
+  for (const type in loginTypeTester) {
+    try {
+      if (loginTypeTester[type].call(this)) {
+        supportedLoginType.push(type)
+      }
+    } catch (error) { }
+  }
+  return {
+    errCode: 0,
+    errMsg: '',
+    supportedLoginType
+  }
+}
diff --git a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
index 1e4ca46..e26c138 100644
--- a/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
+++ b/uni_modules/uni-id-pages/uniCloud/cloudfunctions/uni-id-co/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uni-id-co",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "",
   "main": "index.js",
   "keywords": [],
@@ -29,4 +29,4 @@
     "eslint-plugin-n": "^15.2.3",
     "eslint-plugin-promise": "^6.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
index bc59f07..98d9d08 100644
--- a/uni_modules/uni-popup/changelog.md
+++ b/uni_modules/uni-popup/changelog.md
@@ -1,3 +1,5 @@
+## 1.8.4（2023-11-15）
+- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
 ## 1.8.3（2023-04-17）
 - 修复 uni-popup 重复打开时的 bug
 ## 1.8.2（2023-02-02）
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
new file mode 100644
index 0000000..5eb8d5b
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -0,0 +1,90 @@
+<template>
+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
+    <view @click.stop>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  type CloseCallBack = ()=> void;
+  let closeCallBack:CloseCallBack = () :void => {};
+  export default {
+    emits:["close","clickMask"],
+    data() {
+      return {
+        isShow:false,
+        isOpen:false
+      }
+    },
+    props: {
+      maskClick: {
+        type: Boolean,
+        default: true
+      },
+    },
+    watch: {
+      // 设置show = true 时，如果没有 open 需要设置为 open
+      isShow:{
+        handler(isShow) {
+          // console.log("isShow",isShow)
+          if(isShow && this.isOpen == false){
+            this.isOpen = true
+          }
+        },
+        immediate:true
+      },
+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
+      isOpen:{
+        handler(isOpen) {
+          // console.log("isOpen",isOpen)
+          if(isOpen && this.isShow == false){
+            this.isShow = true
+          }
+        },
+        immediate:true
+      }
+    },
+    methods:{
+      open(){
+        // ...funs : CloseCallBack[]
+        // if(funs.length > 0){
+        //   closeCallBack = funs[0]
+        // }
+        this.isOpen = true;
+      },
+      clickMask(){
+        if(this.maskClick == true){
+          this.$emit('clickMask')
+          this.close()
+        }
+      },
+      close(): void{
+        this.isOpen = false;
+        this.$emit('close')
+        closeCallBack()
+      },
+      hiden(){
+        this.isShow = false
+      },
+      show(){
+        this.isShow = true
+      }
+    }
+  }
+</script>
+
+<style>
+.popup-root {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: 100%;
+  flex: 1;
+  background-color: rgba(0, 0, 0, 0.3);
+  justify-content: center;
+  align-items: center;
+  z-index: 99;
+}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
index 54afee2..4fae089 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -163,7 +163,7 @@
 				},
 				maskShow: true,
 				mkclick: true,
-				popupstyle: this.isDesktop ? 'fixforpc-top' : 'top'
+				popupstyle: 'top'
 			}
 		},
 		computed: {
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
index f40556b..c3f3d1c 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.8.3",
+	"version": "1.8.4",
 	"description": " Popup 组件，提供常用的弹层",
 	"keywords": [
         "uni-ui",
-- 
GitLab