From 01dee26d8f812ead56bcd3c75c1a0eea349f1435 Mon Sep 17 00:00:00 2001
From: jry <ijry@qq.com>
Date: Tue, 27 Aug 2024 21:31:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20up-text=E7=BB=84=E4=BB=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81uni-app-x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uview-plus/components/up-link/link.uts    |  23 +
 .../uview-plus/components/up-link/props.js    |   2 +-
 .../uview-plus/components/up-link/props.uts   |  43 ++
 .../components/up-link/up-link.uvue           |  89 +++
 .../uview-plus/components/up-link/up-link.vue |   4 +-
 .../uview-plus/components/up-navbar/navbar.js |   3 +-
 .../uview-plus/components/up-text/props.js    |   8 +-
 .../uview-plus/components/up-text/props.uts   | 154 +++++
 .../uview-plus/components/up-text/text.js     |   3 +-
 .../uview-plus/components/up-text/text.uts    |  44 ++
 .../components/up-text/up-text.uvue           | 337 +++++++++++
 .../uview-plus/components/up-text/up-text.vue |   6 +-
 .../uview-plus/libs/function/digit.uts        | 113 ++--
 .../uview-plus/libs/function/index.js         |   4 +-
 .../uview-plus/libs/function/index.uts        | 335 ++++++-----
 .../uview-plus/libs/function/test.uts         |  95 +--
 uni-app-x/components/page-nav/page-nav.vue    |   2 +-
 uni-app-x/pages.json                          | 559 +++++++++++++++++-
 .../pages/componentsA/sticky/sticky.nvue      |   8 +-
 .../color/{color.nvue => color.uvue}          |   0
 uni-app-x/pages/componentsC/album/album.nvue  |  40 +-
 uni-app-x/pages/componentsC/form/form.nvue    |  28 +-
 uni-app-x/pages/componentsC/input/input.nvue  |  44 +-
 .../pages/componentsC/skeleton/skeleton.nvue  |   8 +-
 uni-app-x/pages/componentsC/table/table.nvue  |   4 +-
 .../componentsC/text/{text.nvue => text.uvue} |  68 +--
 .../pages/componentsC/textarea/textarea.nvue  |  20 +-
 27 files changed, 1673 insertions(+), 371 deletions(-)
 create mode 100644 src/uni_modules/uview-plus/components/up-link/link.uts
 create mode 100644 src/uni_modules/uview-plus/components/up-link/props.uts
 create mode 100644 src/uni_modules/uview-plus/components/up-link/up-link.uvue
 create mode 100644 src/uni_modules/uview-plus/components/up-text/props.uts
 create mode 100644 src/uni_modules/uview-plus/components/up-text/text.uts
 create mode 100644 src/uni_modules/uview-plus/components/up-text/up-text.uvue
 rename uni-app-x/pages/componentsB/color/{color.nvue => color.uvue} (100%)
 rename uni-app-x/pages/componentsC/text/{text.nvue => text.uvue} (77%)

diff --git a/src/uni_modules/uview-plus/components/up-link/link.uts b/src/uni_modules/uview-plus/components/up-link/link.uts
new file mode 100644
index 000000000..e589e846e
--- /dev/null
+++ b/src/uni_modules/uview-plus/components/up-link/link.uts
@@ -0,0 +1,23 @@
+/*
+ * @Author       : LQ,jry
+ * @Description  :
+ * @version      : 3.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : jry
+ * @lastTime     : 2024-08-20 14:20:58
+ * @FilePath     : /uview-plus/libs/config/props/link.js
+ */
+import config from '../../libs/config/config'
+
+export default {
+    // link超链接组件props参数
+    link: {
+        color: config.getString('color.up-primary'),
+        fontSize: '15px',
+        underLine: false,
+        href: '',
+        mpTips: '链接已复制，请在浏览器打开',
+        lineColor: '',
+        text: ''
+    }
+} as UTSJSONObject
diff --git a/src/uni_modules/uview-plus/components/up-link/props.js b/src/uni_modules/uview-plus/components/up-link/props.js
index bbd2e0603..4e2c0ce5c 100644
--- a/src/uni_modules/uview-plus/components/up-link/props.js
+++ b/src/uni_modules/uview-plus/components/up-link/props.js
@@ -1,6 +1,6 @@
 import { defineMixin } from '../../libs/vue.js'
 import defProps from '../../libs/config/props.js'
-export const props = defineMixin({
+export const propsLink = defineMixin({
     props: {
         // 文字颜色
         color: {
diff --git a/src/uni_modules/uview-plus/components/up-link/props.uts b/src/uni_modules/uview-plus/components/up-link/props.uts
new file mode 100644
index 000000000..f851c4f89
--- /dev/null
+++ b/src/uni_modules/uview-plus/components/up-link/props.uts
@@ -0,0 +1,43 @@
+import { defineMixin } from '../../libs/vue'
+import defProps from './link'
+let crtProp = defProps['link'] as UTSJSONObject
+
+export const propsLink = defineMixin({
+    props: {
+        // 文字颜色
+        color: {
+            type: String,
+            default: crtProp['color']
+        },
+        // 字体大小，单位px
+        fontSize: {
+            type: [String],
+            default: crtProp['fontSize']
+        },
+        // 是否显示下划线
+        underLine: {
+            type: Boolean,
+            default: crtProp['underLine']
+        },
+        // 要跳转的链接
+        href: {
+            type: String,
+            default: crtProp['href']
+        },
+        // 小程序中复制到粘贴板的提示语
+        mpTips: {
+            type: String,
+            default: crtProp['mpTips']
+        },
+        // 下划线颜色
+        lineColor: {
+            type: String,
+            default: crtProp['lineColor']
+        },
+        // 超链接的问题，不使用slot形式传入，是因为nvue下无法修改颜色
+        text: {
+            type: String,
+            default: crtProp['text']
+        }
+    }
+})
diff --git a/src/uni_modules/uview-plus/components/up-link/up-link.uvue b/src/uni_modules/uview-plus/components/up-link/up-link.uvue
new file mode 100644
index 000000000..7a2570461
--- /dev/null
+++ b/src/uni_modules/uview-plus/components/up-link/up-link.uvue
@@ -0,0 +1,89 @@
+<template>
+	<text
+	    class="up-link"
+	    @tap.stop="openLink"
+	    :style="[linkStyle, addStyle(customStyle)]"
+	>{{text}}</text>
+</template>
+
+<script>
+	import { propsLink } from './props';
+	import { mpMixin } from '../../libs/mixin/mpMixin';
+	import { mixin } from '../../libs/mixin/mixin';
+	import { addStyle, addUnit, getPx, toast } from '../../libs/function/index';
+	/**
+	 * link 超链接
+	 * @description 该组件为超链接组件，在不同平台有不同表现形式：在APP平台会通过plus环境打开内置浏览器，在小程序中把链接复制到粘贴板，同时提示信息，在H5中通过window.open打开链接。
+	 * @tutorial https://ijry.github.io/uview-plus/components/link.html
+	 * @property {String}			color		文字颜色 （默认 color['up-primary'] ）
+	 * @property {String ｜ Number}	fontSize	字体大小，单位px （默认 15 ）
+	 * @property {Boolean}			underLine	是否显示下划线 （默认 false ）
+	 * @property {String}			href		跳转的链接，要带上http(s)
+	 * @property {String}			mpTips		各个小程序平台把链接复制到粘贴板后的提示语（默认“链接已复制，请在浏览器打开”）
+	 * @property {String}			lineColor	下划线颜色，默认同color参数颜色 
+	 * @property {String}			text		超链接的问题，不使用slot形式传入，是因为nvue下无法修改颜色 
+	 * @property {Object}			customStyle	定义需要用到的外部样式
+	 * 
+	 * @example <up-link href="http://www.uviewui.com">蜀道难，难于上青天</up-link>
+	 */
+	export default {
+		name: "up-link",
+		mixins: [mpMixin, mixin, propsLink],
+		computed: {
+			linkStyle(): any{
+				const style = {
+					color: this.color,
+					fontSize: addUnit(this.fontSize),
+					// line-height设置为比字体大小多2px
+					lineHeight: addUnit(parseInt(getPx(this.fontSize)) + 2),
+					textDecoration: this.underLine ? 'underline' : 'none'
+				}
+				// if (this.underLine) {
+				// 	style.borderBottomColor = this.lineColor || this.color
+				// 	style.borderBottomWidth = '1px'
+				// }
+				return style
+			}
+		},
+		emits: ["click"],
+		methods: {
+			addStyle(style: any): any {
+				return addStyle(style)
+			},
+			openLink(): void {
+				// #ifdef APP
+				// todo
+				//plus.runtime.openURL(this.href)
+				// #endif
+				// #ifdef H5
+				window.open(this.href)
+				// #endif
+				// #ifdef MP
+				// todo
+				// uni.setClipboardData({
+				// 	data: this.href,
+				// 	success: () => {
+				// 		uni.hideToast();
+				// 		this.$nextTick(() => {
+				// 			toast(this.mpTips);
+				// 		})
+				// 	}
+				// });
+				// #endif
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../libs/css/components.scss";
+	$up-link-line-height:1 !default;
+
+	.up-link {
+		line-height: $up-link-line-height;
+		@include flex;
+		flex-wrap: wrap;
+		flex: 1;
+	}
+</style>
diff --git a/src/uni_modules/uview-plus/components/up-link/up-link.vue b/src/uni_modules/uview-plus/components/up-link/up-link.vue
index 514ad479b..c3b257678 100644
--- a/src/uni_modules/uview-plus/components/up-link/up-link.vue
+++ b/src/uni_modules/uview-plus/components/up-link/up-link.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-	import { props } from './props.js';
+	import { propsLink } from './props.js';
 	import { mpMixin } from '../../libs/mixin/mpMixin.js';
 	import { mixin } from '../../libs/mixin/mixin.js';
 	import { addStyle, addUnit, getPx, toast } from '../../libs/function/index.js';
@@ -28,7 +28,7 @@
 	 */
 	export default {
 		name: "up-link",
-		mixins: [mpMixin, mixin, props],
+		mixins: [mpMixin, mixin, propsLink],
 		computed: {
 			linkStyle() {
 				const style = {
diff --git a/src/uni_modules/uview-plus/components/up-navbar/navbar.js b/src/uni_modules/uview-plus/components/up-navbar/navbar.js
index bd1311f6e..e399cf3a3 100644
--- a/src/uni_modules/uview-plus/components/up-navbar/navbar.js
+++ b/src/uni_modules/uview-plus/components/up-navbar/navbar.js
@@ -7,7 +7,8 @@
  * @lastTime     : 2024-08-20 14:20:58
  * @FilePath     : /uview-plus/libs/config/props/navbar.js
  */
-import color from '../../libs/config/color'
+import color from '../../libs/config/color.js'
+
 export default {
     // navbar 组件
     navbar: {
diff --git a/src/uni_modules/uview-plus/components/up-text/props.js b/src/uni_modules/uview-plus/components/up-text/props.js
index de39a2e86..b71ec8bbf 100644
--- a/src/uni_modules/uview-plus/components/up-text/props.js
+++ b/src/uni_modules/uview-plus/components/up-text/props.js
@@ -1,6 +1,7 @@
 import { defineMixin } from '../../libs/vue.js'
 import defProps from '../../libs/config/props.js'
-export const props = defineMixin({
+
+export const propsText = defineMixin({
     props: {
         // 主题颜色
         type: {
@@ -107,6 +108,11 @@ export const props = defineMixin({
         wordWrap: {
             type: String,
             default: () => defProps.text.wordWrap
+        },
+        // 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
+        lang: {
+            type: String,
+            default: () => defProps.text.lang
         }
     }
 })
diff --git a/src/uni_modules/uview-plus/components/up-text/props.uts b/src/uni_modules/uview-plus/components/up-text/props.uts
new file mode 100644
index 000000000..ac6729dd3
--- /dev/null
+++ b/src/uni_modules/uview-plus/components/up-text/props.uts
@@ -0,0 +1,154 @@
+import { defineMixin } from '../../libs/vue'
+import defProps from './text'
+let crtProp = defProps['text'] as UTSJSONObject
+
+export const propsText = defineMixin({
+    props: {
+        // 主题颜色
+        type: {
+            type: String,
+            default: crtProp['type']
+        },
+        // 是否显示
+        show: {
+            type: Boolean,
+            default: crtProp['show']
+        },
+        // 显示的值
+        text: {
+            type: [String, Number],
+            default: crtProp['text']
+        },
+        // 前置图标
+        prefixIcon: {
+            type: String,
+            default: crtProp['prefixIcon']
+        },
+        // 后置图标
+        suffixIcon: {
+            type: String,
+            default: crtProp['suffixIcon']
+        },
+        // 文本处理的匹配模式
+        // text-普通文本，price-价格，phone-手机号，name-姓名，date-日期，link-超链接
+        mode: {
+            type: String,
+            default: crtProp['mode']
+        },
+        // mode=link下，配置的链接
+        href: {
+            type: String,
+            default: crtProp['href']
+        },
+        // 格式化规则
+        format: {
+            type: [String, Function],
+            default: crtProp['format']
+        },
+        // mode=phone时，点击文本是否拨打电话
+        call: {
+            type: Boolean,
+            default: crtProp['call']
+        },
+        // 小程序的打开方式
+        openType: {
+            type: String,
+            default: crtProp['openType']
+        },
+        // 是否粗体，默认normal
+        bold: {
+            type: Boolean,
+            default: crtProp['bold']
+        },
+        // 是否块状
+        block: {
+            type: Boolean,
+            default: crtProp['block']
+        },
+        // 文本显示的行数，如果设置，超出此行数，将会显示省略号
+        lines: {
+            type: [String, Number],
+            default: crtProp['lines']
+        },
+        // 文本颜色
+        color: {
+            type: String,
+            default: crtProp['color']
+        },
+        // 字体大小
+        size: {
+            type: [String, Number],
+            default: crtProp['size']
+        },
+        // 图标的样式
+        iconStyle: {
+            type: [Object, String],
+            default: crtProp['iconStyle']
+        },
+        // 文字装饰，下划线，中划线等，可选值 none|underline|line-through
+        decoration: {
+            tepe: String,
+            default: crtProp['decoration']
+        },
+        // 外边距，对象、字符串，数值形式均可
+        margin: {
+            type: [Object, String, Number],
+            default: crtProp['margin']
+        },
+        // 文本行高
+        lineHeight: {
+            type: [String, Number],
+            default: crtProp['lineHeight']
+        },
+        // 文本对齐方式，可选值left|center|right
+        align: {
+            type: String,
+            default: crtProp['align']
+        },
+        // 文字换行，可选值break-word|normal|anywhere
+        wordWrap: {
+            type: String,
+            default: crtProp['wordWrap']
+        },
+        // 指定返回用户信息的语言，zh_CN 简体中文，zh_TW 繁体中文，en 英文。只微信小程序有效
+        lang: {
+            type: String,
+            default: crtProp['lang']
+        },
+        // 会话来源，open-type="contact"时有效。只微信小程序有效
+        sessionFrom: {
+            type: String,
+            default: crtProp['sessionFrom']
+        },
+        // 会话内消息卡片标题，open-type="contact"时有效
+        // 默认当前标题，只微信小程序有效
+        sendMessageTitle: {
+            type: String,
+            default: crtProp['sendMessageTitle']
+        },
+        // 会话内消息卡片点击跳转小程序路径，open-type="contact"时有效
+        // 默认当前分享路径，只微信小程序有效
+        sendMessagePath: {
+            type: String,
+            default: crtProp['sendMessagePath']
+        },
+        // 会话内消息卡片图片，open-type="contact"时有效
+        // 默认当前页面截图，只微信小程序有效
+        sendMessageImg: {
+            type: String,
+            default: crtProp['sendMessageImg']
+        },
+        // 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话会在右下角显示"可能要发送的小程序"提示，
+        // 用户点击后可以快速发送小程序消息，open-type="contact"时有效
+        showMessageCard: {
+            type: Boolean,
+            default: crtProp['showMessageCard']
+        },
+        // 打开 APP 时，向 APP 传递的参数，open-type=launchApp时有效
+        // 只微信小程序、QQ小程序有效
+        appParameter: {
+            type: String,
+            default: crtProp['appParameter']
+        },
+    }
+})
diff --git a/src/uni_modules/uview-plus/components/up-text/text.js b/src/uni_modules/uview-plus/components/up-text/text.js
index d1e1be8ae..8b63525a7 100644
--- a/src/uni_modules/uview-plus/components/up-text/text.js
+++ b/src/uni_modules/uview-plus/components/up-text/text.js
@@ -32,7 +32,8 @@ export default {
         margin: 0,
         lineHeight: '',
         align: 'left',
-        wordWrap: 'normal'
+        wordWrap: 'normal',
+        lang: 'en'
     }
 
 }
diff --git a/src/uni_modules/uview-plus/components/up-text/text.uts b/src/uni_modules/uview-plus/components/up-text/text.uts
new file mode 100644
index 000000000..99fad6105
--- /dev/null
+++ b/src/uni_modules/uview-plus/components/up-text/text.uts
@@ -0,0 +1,44 @@
+/*
+ * @Author       : LQ,jry
+ * @Description  :
+ * @version      : 3.0
+ * @Date         : 2021-08-20 16:44:21
+ * @LastAuthor   : jry
+ * @lastTime     : 2024-08-20 14:20:58
+ * @FilePath     : /uview-plus/libs/config/props/text.js
+ */
+export default {
+    // text 组件
+    text: {
+        type: '',
+        show: true,
+        text: '',
+        prefixIcon: '',
+        suffixIcon: '',
+        mode: '',
+        href: '',
+        format: '',
+        call: false,
+        openType: '',
+        bold: false,
+        block: false,
+        lines: '',
+        color: '#303133',
+        size: '15px',
+        iconStyle: {
+            fontSize: '15px'
+        },
+        decoration: 'none',
+        margin: '0',
+        lineHeight: '',
+        align: 'left',
+        wordWrap: 'normal',
+        lang: 'en',
+        sessionFrom: '',
+        sendMessageTitle: '',
+        sendMessagePath: '',
+        sendMessageImg: '',
+        showMessageCard: false,
+        appParameter: '',
+    }
+} as UTSJSONObject
diff --git a/src/uni_modules/uview-plus/components/up-text/up-text.uvue b/src/uni_modules/uview-plus/components/up-text/up-text.uvue
new file mode 100644
index 000000000..a78d96fcf
--- /dev/null
+++ b/src/uni_modules/uview-plus/components/up-text/up-text.uvue
@@ -0,0 +1,337 @@
+<template>
+    <view
+        class="up-text"
+        :class="[customClass]"
+        v-if="show"
+        :style="{
+            margin: margin,
+			justifyContent: align === 'left' ? 'flex-start' : align === 'center' ? 'center' : 'flex-end'
+        }"
+        @tap="clickHandler"
+    >
+        <text
+            :class="['up-text__price', `up-text__value--${type}`]"
+            v-if="mode === 'price'"
+            :style="[valueStyle]"
+            >￥</text
+        >
+        <view class="up-text__prefix-icon" v-if="prefixIcon">
+            <up-icon
+                :name="prefixIcon"
+                :customStyle="addStyle(iconStyle)"
+            ></up-icon>
+        </view>
+        <up-link
+            v-if="mode === 'link'" class="up-text__value"
+            :style="{fontWeight: valueStyle['fontWeight'], wordWrap: valueStyle['wordWrap'], fontSize: valueStyle['fontSize']}"
+            :class="[`up-text__value--${type}`,	`up-line-${lines}`]" :text="value"
+            :href="href"
+            underLine
+        ></up-link>
+        <template v-else-if="openType != '' && isMp">
+            <button
+                class="up-reset-button up-text__value"
+                :style="[valueStyle]"
+                data-index="index"
+                :openType="openType"
+                @getuserinfo="onGetUserInfo"
+                @contact="onContact"
+                @getphonenumber="onGetPhoneNumber"
+                @error="onError"
+                @launchapp="onLaunchApp"
+                @opensetting="onOpenSetting"
+                :lang="lang"
+                :session-from="sessionFrom"
+                :send-message-title="sendMessageTitle"
+                :send-message-path="sendMessagePath"
+                :send-message-img="sendMessageImg"
+                :show-message-card="showMessageCard"
+                :app-parameter="appParameter"
+            >
+                {{ value }}
+            </button>
+        </template>
+        <text
+            v-else
+            class="up-text__value"
+            :style="[valueStyle]"
+            :class="[
+                `up-text__value--${type}`,
+                `up-line-${lines}`
+            ]"
+            >{{ value }}</text
+        >
+        <view class="up-text__suffix-icon" v-if="suffixIcon != ''">
+            <up-icon
+                :name="suffixIcon"
+                :customStyle="addStyle(iconStyle)"
+            ></up-icon>
+        </view>
+    </view>
+</template>
+
+<script>
+import { propsText } from './props'
+import { mpMixin } from '../../libs/mixin/mpMixin';
+import { mixin } from '../../libs/mixin/mixin';
+import { buttonMixin } from '../../libs/mixin/button';
+import { openType } from '../../libs/mixin/openType';
+import { addStyle, addUnit, deepMerge } from '../../libs/function/index';
+import { error, priceFormat, timeFormat } from '../../libs/function/index';
+import {
+	func as testFunc,
+	date as testDate,
+	url as testUrl,
+} from '../../libs/function/test';
+/**
+ * Text 文本
+ * @description 此组件集成了文本类在项目中的常用功能，包括状态，拨打电话，格式化日期，*替换，超链接...等功能。 您大可不必在使用特殊文本时自己定义，text组件几乎涵盖您能使用的大部分场景。
+ * @tutorial https://ijry.github.io/uview-plus/components/loading.html
+ * @property {String} 					type		主题颜色
+ * @property {Boolean} 					show		是否显示（默认 true ）
+ * @property {String | Number}			text		显示的值
+ * @property {String}					prefixIcon	前置图标
+ * @property {String} 					suffixIcon	后置图标
+ * @property {String} 					mode		文本处理的匹配模式 text-普通文本，price-价格，phone-手机号，name-姓名，date-日期，link-超链接
+ * @property {String} 					href		mode=link下，配置的链接
+ * @property {String | Function} 		format		格式化规则
+ * @property {Boolean} 					call		mode=phone时，点击文本是否拨打电话（默认 false ）
+ * @property {String} 					openType	小程序的打开方式
+ * @property {Boolean} 					bold		是否粗体，默认normal（默认 false ）
+ * @property {Boolean} 					block		是否块状（默认 false ）
+ * @property {String | Number} 			lines		文本显示的行数，如果设置，超出此行数，将会显示省略号
+ * @property {String} 					color		文本颜色（默认 '#303133' ）
+ * @property {String | Number} 			size		字体大小（默认 15px ）
+ * @property {Object | String} 			iconStyle	图标的样式 （默认 {fontSize: '15px'} ）
+ * @property {String} 					decoration	文字装饰，下划线，中划线等，可选值 none|underline|line-through（默认 'none' ）
+ * @property {Object | String | Number}	margin		外边距，对象、字符串，数值形式均可（默认 0px ）
+ * @property {String | Number} 			lineHeight	文本行高
+ * @property {String} 					align		文本对齐方式，可选值left|center|right（默认 'left' ）
+ * @property {String} 					wordWrap	文字换行，可选值break-word|normal|anywhere（默认 'normal' ）
+ * @event {Function} click  点击触发事件
+ * @example <up-text text="我用十年青春,赴你最后之约"></up-text>
+ */
+export default {
+    name: 'up-text',
+    // #ifdef MP
+    mixins: [mpMixin, mixin, buttonMixin, openType, propsText],
+    // #endif
+    // #ifndef MP
+    mixins: [mpMixin, mixin, propsText],
+    // #endif
+	emits: ['click'],
+    computed: {
+        valueStyle(): UTSJSONObject {
+            let style = {
+                textDecoration: this.decoration,
+                fontWeight: this.bold ? 'bold' : 'normal',
+                wordWrap: this.wordWrap,
+                fontSize: addUnit(this.size)
+            }
+			if (this.type == '') {
+				style['color'] = this.color
+			}
+			if (this.lines != '') {
+				style['lines'] = this.lines
+			}
+			if (this.lineHeight != '') {
+				style['lineHeight'] = addUnit(this.lineHeight)
+			}
+			if (this.block) {
+				style['display'] = 'block'
+			}
+			return deepMerge(style, addStyle(this.customStyle)) as UTSJSONObject
+        },
+        // 经处理后需要显示的值
+        value(): string {
+            let {
+                text,
+                mode,
+                format,
+                href
+            } = this
+
+            let textStr = text.toString()
+
+            // 价格类型
+            if (mode === 'price') {
+                // 如果text不为金额进行提示
+                if (!/^\d+(\.\d+)?$/.test(textStr)) {
+                    error('金额模式下，text参数需要为金额格式');
+                }
+                // 进行格式化，判断用户传入的format参数为正则，或者函数，如果没有传入format，则使用默认的金额格式化处理
+                // todo
+				// if (testFunc(format)) {
+                //     // 如果用户传入的是函数，使用函数格式化
+                //     return format(text)
+                // }
+                // 如果format非正则，非函数，则使用默认的金额格式化方法进行操作
+                return priceFormat(textStr, 2)
+            } if (mode === 'date') {
+                // 判断是否合法的日期或者时间戳
+				if (!testDate(textStr)) {
+					error('日期模式下，text参数需要为日期或时间戳格式' + textStr)
+				}
+                // 进行格式化，判断用户传入的format参数为正则，或者函数，如果没有传入format，则使用默认的格式化处理
+                // todo
+                // if (testFunc(format)) {
+                //     // 如果用户传入的是函数，使用函数格式化
+                //     return format(textStr)
+                // }
+				if (format != '') {
+                    // 如果format非正则，非函数，则使用默认的时间格式化方法进行操作
+                    return timeFormat(textStr, format.toString())
+                }
+                // 如果没有设置format，则设置为默认的时间格式化形式
+                return timeFormat(textStr, 'yyyy-mm-dd')
+            } if (mode === 'phone') {
+                // 判断是否合法的手机号
+                // !testMobile(text) && error('手机号模式下，text参数需要为手机号码格式')
+                // todo
+                // if (testFunc(format)) {
+                //     // 如果用户传入的是函数，使用函数格式化
+                //     return format(text)
+                // }
+				if (format === 'encrypt') {
+                    // 如果format为encrypt，则将手机号进行星号加密处理
+                    return `${textStr.substring(0, 3)}****${textStr.substring(7)}`
+                }
+                return textStr
+            } if (mode === 'name') {
+                // 判断是否合法的字符粗
+				if (!(typeof (textStr) === 'string')) {
+					error('姓名模式下，text参数需要为字符串格式')
+				}
+                // if (testFunc(format)) {
+                //     // 如果用户传入的是函数，使用函数格式化
+                //     return format(textStr)
+                // }
+				if (format === 'encrypt') {
+                    // 如果format为encrypt，则将姓名进行星号加密处理
+                    return this.formatName(textStr)
+                }
+                return textStr
+            } if (mode === 'link') {
+                // 判断是否合法的字符粗
+				if (!testUrl(href)) {
+					error('超链接模式下，href参数需要为URL格式')
+				}
+                return textStr
+            }
+            return textStr
+        },
+        isMp(): Boolean {
+            let mp = false
+            // #ifdef MP
+            mp = true
+            // #endif
+            return mp
+        }
+    },
+    data() {
+        return {}
+    },
+    methods: {
+        addStyle(style: any): any {
+			return addStyle(style)
+		},
+        clickHandler() {
+            // 如果为手机号模式，拨打电话
+            if (this.call && this.mode === 'phone') {
+				// todo
+                // uni.makePhoneCall({
+                //     phoneNumber: this.text
+                // })
+            }
+            this.$emit('click')
+        },
+        // 默认的姓名脱敏规则
+        formatName(name: string): string {
+            let value = ''
+            if (name.length === 2) {
+                value = name.substring(0, 1) + '*'
+            } else if (name.length > 2) {
+                let char = ''
+                for (let i = 0, len = name.length - 2; i < len; i++) {
+                    char += '*'
+                }
+                value = name.substring(0, 1) + char + name.substring(-1, 1)
+            } else {
+                value = name
+            }
+            return value
+        },
+		onGetUserInfo(): void {
+		},
+		onContact(): void {
+		},
+		onGetPhoneNumber(): void {
+		},
+		onError(): void {
+		},
+		onLaunchApp(): void {
+		},
+		onOpenSetting(): void {
+		},
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '../../libs/css/components.scss';
+
+.up-text {
+    @include flex(row);
+    align-items: center;
+    flex-wrap: nowrap;
+    flex: 1;
+	width: 100%;
+
+    &__price {
+        font-size: 14px;
+        color: $up-content-color;
+    }
+
+    &__value {
+        font-size: 14px;
+        color: $up-content-color;
+        text-overflow: ellipsis;
+
+        &--primary {
+            color: $up-primary;
+        }
+
+        &--warning {
+            color: $up-warning;
+        }
+
+        &--success {
+            color: $up-success;
+        }
+
+        &--info {
+            color: $up-info;
+        }
+
+        &--error {
+            color: $up-error;
+        }
+
+        &--main {
+            color: $up-main-color;
+        }
+
+        &--content {
+            color: $up-content-color;
+        }
+
+        &--tips {
+            color: $up-tips-color;
+        }
+
+        &--light {
+            color: $up-light-color;
+        }
+    }
+}
+</style>
diff --git a/src/uni_modules/uview-plus/components/up-text/up-text.vue b/src/uni_modules/uview-plus/components/up-text/up-text.vue
index 20f3f7d15..e75b71454 100644
--- a/src/uni_modules/uview-plus/components/up-text/up-text.vue
+++ b/src/uni_modules/uview-plus/components/up-text/up-text.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import { props } from './props'
+import { propsText } from './props.js'
 import value from './value.js'
 import { mpMixin } from '../../libs/mixin/mpMixin.js';
 import { mixin } from '../../libs/mixin/mixin.js';
@@ -108,10 +108,10 @@ import { addStyle, addUnit, deepMerge } from '../../libs/function/index.js';
 export default {
     name: 'up-text',
     // #ifdef MP
-    mixins: [mpMixin, mixin, value, buttonMixin, openType, props],
+    mixins: [mpMixin, mixin, value, buttonMixin, openType, propsText],
     // #endif
     // #ifndef MP
-    mixins: [mpMixin, mixin, value, props],
+    mixins: [mpMixin, mixin, value, propsText],
     // #endif
 	emits: ['click'],
     computed: {
diff --git a/src/uni_modules/uview-plus/libs/function/digit.uts b/src/uni_modules/uview-plus/libs/function/digit.uts
index cbe0b2446..6990caf5f 100644
--- a/src/uni_modules/uview-plus/libs/function/digit.uts
+++ b/src/uni_modules/uview-plus/libs/function/digit.uts
@@ -5,8 +5,8 @@ let _boundaryCheckingState = true; // 是否进行越界检查的全局开关
  * @private
  * @example strip(0.09999999999999998)=0.1
  */
-function strip(num, precision = 15): any {
-  return +parseFloat(Number(num).toPrecision(precision));
+function strip(num: any, precision = 15): any {
+  return +parseFloat((num as Number).toPrecision(precision));
 }
 
 /**
@@ -14,10 +14,20 @@ function strip(num, precision = 15): any {
  * @private
  * @param {*number} num Input number
  */
-function digitLength(num): any {
+function digitLength(num: number): number {
   // Get digit length of e
-  const eSplit = num.toString().split(/[eE]/);
-  const len = (eSplit[0].split('.')[1] || '').length - +(eSplit[1] || 0);
+  const eSplit: string[] = num.toString().split(/[eE]/);
+  let tmp = eSplit[0].split('.')[1];
+  if (tmp != '') {
+	  tmp = ''
+  }
+  let tmp2 = eSplit[1];
+  let tmp2Number = 0;
+  if (tmp2 != '') {
+  	  tmp2Number = parseInt(tmp2);
+  }
+  
+  const len = tmp.length - +(tmp2Number);
   return len > 0 ? len : 0;
 }
 
@@ -26,12 +36,12 @@ function digitLength(num): any {
  * @private
  * @param {*number} num 输入数
  */
-function float2Fixed(num): any {
+function float2Fixed(num: number): any {
   if (num.toString().indexOf('e') === -1) {
-    return Number(num.toString().replace('.', ''));
+    return parseInt(num.toString().replace('.', ''));
   }
-  const dLen = digitLength(num);
-  return dLen > 0 ? strip(Number(num) * Math.pow(10, dLen)) : Number(num);
+  const dLen: number = digitLength(num);
+  return dLen > 0 ? strip((num) * Math.pow(10, dLen)) : (num);
 }
 
 /**
@@ -39,11 +49,12 @@ function float2Fixed(num): any {
  * @private
  * @param {*number} num 输入数
  */
-function checkBoundary(num): any {
+function checkBoundary(num: number): void {
   if (_boundaryCheckingState) {
-    if (num > Number.MAX_SAFE_INTEGER || num < Number.MIN_SAFE_INTEGER) {
-      console.warn(`${num} 超出了精度限制，结果可能不正确`);
-    }
+	// todo
+    // if (num > Number.MAX_SAFE_INTEGER || num < Number.MIN_SAFE_INTEGER) {
+    //   console.warn(`${num} 超出了精度限制，结果可能不正确`);
+    // }
   }
 }
 
@@ -53,7 +64,7 @@ function checkBoundary(num): any {
  * @param {function} operation 迭代操作
  * @private
  */
-function iteratorOperation(arr, operation): any {
+function iteratorOperation(arr: number[], operation: any): any {
   const [num1, num2, ...others] = arr;
   let res = operation(num1, num2);
 
@@ -68,20 +79,22 @@ function iteratorOperation(arr, operation): any {
  * 高精度乘法
  * @export
  */
-export function times(...nums): any {
-  if (nums.length > 2) {
-    return iteratorOperation(nums, times);
-  }
-
-  const [num1, num2] = nums;
-  const num1Changed = float2Fixed(num1);
-  const num2Changed = float2Fixed(num2);
-  const baseNum = digitLength(num1) + digitLength(num2);
-  const leftValue = num1Changed * num2Changed;
-
-  checkBoundary(leftValue);
-
-  return leftValue / Math.pow(10, baseNum);
+export function times(...nums: number[]): any {
+  // todo
+  // if (nums.length > 2) {
+  //   return iteratorOperation(nums, times);
+  // }
+
+  // const [num1, num2] = nums;
+  // const num1Changed = float2Fixed(num1);
+  // const num2Changed = float2Fixed(num2);
+  // const baseNum = digitLength(num1) + digitLength(num2);
+  // const leftValue = num1Changed * num2Changed;
+
+  // checkBoundary(leftValue);
+
+  // return leftValue / Math.pow(10, baseNum);
+  return ''
 }
 
 /**
@@ -118,32 +131,36 @@ export function minus(...nums): any {
  * 高精度除法
  * @export
  */
-export function divide(...nums): any {
-  if (nums.length > 2) {
-    return iteratorOperation(nums, divide);
-  }
-
-  const [num1, num2] = nums;
-  const num1Changed = float2Fixed(num1);
-  const num2Changed = float2Fixed(num2);
-  checkBoundary(num1Changed);
-  checkBoundary(num2Changed);
-  // 重要，这里必须用strip进行修正
-  return times(num1Changed / num2Changed, strip(Math.pow(10, digitLength(num2) - digitLength(num1))));
+export function divide(...nums: number[]): any {
+ // todo
+ //  if (nums.length > 2) {
+ //    return iteratorOperation(nums, divide);
+ //  }
+
+ //  const [num1, num2] = nums;
+ //  const num1Changed = float2Fixed(num1);
+ //  const num2Changed = float2Fixed(num2);
+ //  checkBoundary(num1Changed);
+ //  checkBoundary(num2Changed);
+ //  // 重要，这里必须用strip进行修正
+ //  return times(num1Changed / num2Changed,
+	// strip(Math.pow(10, digitLength(num2) - digitLength(num1))));
 }
 
 /**
  * 四舍五入
  * @export
  */
-export function round(num, ratio): any {
-  const base = Math.pow(10, ratio);
-  let result = divide(Math.round(Math.abs(times(num, base))), base);
-  if (num < 0 && result !== 0) {
-    result = times(result, -1);
-  }
-  // 位数不足则补0
-  return result;
+export function round(num: number, ratio: number): any {
+  // todo
+  // const base = Math.pow(10, ratio);
+  // let result = divide(Math.round(Math.abs(times(num, base))), base);
+  // if (num < 0 && result !== 0) {
+  //   result = times(result, -1);
+  // }
+  // // 位数不足则补0
+  // return result;
+  return ''
 }
 
 /**
diff --git a/src/uni_modules/uview-plus/libs/function/index.js b/src/uni_modules/uview-plus/libs/function/index.js
index 833ee5337..d9593f545 100644
--- a/src/uni_modules/uview-plus/libs/function/index.js
+++ b/src/uni_modules/uview-plus/libs/function/index.js
@@ -2,9 +2,9 @@ import {
 	number as testNumber,
 	array as testArray,
 	empty as testEmpty
-} from './test'
+} from './test.js'
 import { round } from './digit.js'
-import config from '../config/config';
+import config from '../config/config.js';
 /**
  * @description 如果value小于min，取min；如果value大于max，取max
  * @param {number} min 
diff --git a/src/uni_modules/uview-plus/libs/function/index.uts b/src/uni_modules/uview-plus/libs/function/index.uts
index 6f3268cef..0ed2d303e 100644
--- a/src/uni_modules/uview-plus/libs/function/index.uts
+++ b/src/uni_modules/uview-plus/libs/function/index.uts
@@ -1,10 +1,10 @@
-import {
-	number as testNumber,
-	array as testArray,
-	empty as testEmpty
+import {
+	number as testNumber,
+	array as testArray,
+	empty as testEmpty
 } from './test.uts'
-import { round } from './digit.uts'
-import config from '../config/config'
+import { round } from './digit.uts'
+import config from '../config/config'
 
 // /**
 //  * @description 如果value小于min，取min；如果value大于max，取max
@@ -16,22 +16,23 @@ import config from '../config/config'
 //     return Math.max(min, Math.min(max, Number(value)))
 // }
 
-// /**
-//  * @description 用于获取用户传递值的px值  如果用户传递了"xxpx"或者"xxrpx"，取出其数值部分，如果是"xxxrpx"还需要用过uni.upx2px进行转换
-//  * @param {number|string} value 用户传递值的px值
-//  * @param {boolean} unit 
-//  * @returns {number|string}
-//  */
-// export function getPx(value, unit = false): any {
-//     if (testNumber(value)) {
-//         return unit ? `${value}px` : Number(value)
-//     }
-//     // 如果带有rpx，先取出其数值部分，再转为px值
-//     if (/(rpx|upx)$/.test(value)) {
-//         return unit ? `${uni.rpx2px(parseInt(value))}px` : Number(uni.rpx2px(parseInt(value)))
-//     }
-//     return unit ? `${parseInt(value)}px` : parseInt(value)
-// }
+/**
+ * @description 用于获取用户传递值的px值  如果用户传递了"xxpx"或者"xxrpx"，取出其数值部分，如果是"xxxrpx"还需要用过uni.upx2px进行转换
+ * @param {number|string} value 用户传递值的px值
+ * @param {boolean} unit 
+ * @returns {number|string}
+ */
+export function getPx(valueOri: any, unit = false): string {
+	let value: string = valueOri.toString()
+    if (testNumber(value)) {
+        return unit ? `${value}px` : (value)
+    }
+    // 如果带有rpx，先取出其数值部分，再转为px值
+    if (/(rpx|upx)$/.test(value)) {
+        // return unit ? `${uni.upx2px(parseInt(value)).toString()}px` : uni.upx2px(parseInt(value))
+    }
+    return unit ? `${value}px` : (value)
+}
 
 // /**
 //  * @description 进行延时，以达到可以简写代码的目的 比如: await sleep(20)将会阻塞20ms
@@ -144,7 +145,7 @@ export function addStyle(customStyle: any, target = 'object'): any {
         return customStyle
     }
     // 字符串转对象
-    if (target === 'object') {
+    if (target === 'object') {
 		let customStyleStr = JSON.stringify(customStyle)
         // 去除字符串样式中的两端空格(中间的空格不能去掉，比如padding: 20px 0如果去掉了就错了)，空格是无用的
         customStyleStr = customStyleStr.trim()
@@ -162,14 +163,14 @@ export function addStyle(customStyle: any, target = 'object'): any {
         return style
     }
     // 这里为对象转字符串形式
-    let string = ''
-	let customStyleObj = JSON.parse(JSON.stringify(customStyle)) as Array
+    let string = ''
+	let customStyleObj = JSON.parse(JSON.stringify(customStyle)) as Array
 	if (customStyleObj != null && typeof customStyleObj === 'object') {
 		// customStyleObj.forEach((val: string, i: any) => {
 		// 	// 驼峰转为中划线的形式，否则css内联样式，无法识别驼峰样式属性名
 		// 	const key = i.replace(/([A-Z])/g, '-$1').toLowerCase()
 		// 	string += `${key}:${val};`
-		// })
+		// })
 	}
     // 去除两端空格
     return string.trim()
@@ -180,13 +181,13 @@ export function addStyle(customStyle: any, target = 'object'): any {
  * @param {string|number} value 需要添加单位的值
  * @param {string} unit 添加的单位名 比如px
  */
-export function addUnit(pvalue: any|null, punit = 'px'): string {
-	let value = pvalue
-	if (value == '' || value == null) {
-		value = 'auto'
-	}
-	let unit = punit
-    if (unit == null || unit == '') {
+export function addUnit(pvalue: any|null, punit = 'px'): string {
+	let value = pvalue
+	if (value == '' || value == null) {
+		value = 'auto'
+	}
+	let unit = punit
+    if (unit == null || unit == '') {
      	unit = config['unit'] as string
     }
     let valueStr = value.toString()
@@ -221,20 +222,20 @@ export function addUnit(pvalue: any|null, punit = 'px'): string {
  * @param {UTSJSONObject} source 拷贝的来源对象
  * @returns {UTSJSONObject|boolean} 深度合并后的对象或者false（入参有不是对象）
  */
-export function deepMerge(
-	targetOrigin: any = {},
-	source: any = {}): any {
-	let targetJson = JSON.parse(JSON.stringify(targetOrigin)) as UTSJSONObject
+export function deepMerge(
+	targetOrigin: any = {},
+	source: any = {}): any {
+	let targetJson = JSON.parse(JSON.stringify(targetOrigin)) as UTSJSONObject
 	let sourceJson = JSON.parse(JSON.stringify(source)) as UTSJSONObject
-    let target:UTSJSONObject = {}
-	// #ifdef APP
-	target = UTSJSONObject.assign(targetJson, sourceJson)
-	// #endif
-	// #ifdef WEB
-	target = Object.assign(targetJson, sourceJson)
-	// #endif
+    let target:UTSJSONObject = {}
+	// #ifdef APP
+	target = UTSJSONObject.assign(targetJson, sourceJson)
+	// #endif
+	// #ifdef WEB
+	target = Object.assign(targetJson, sourceJson)
+	// #endif
  //    if (typeof target !== 'object' || typeof source !== 'object') return false
- //    for (const prop in source) {
+ //    for (const prop in source) {
 	// source.forEach((val, prop) => {
  //        if (!source[prop]) continue
  //        if (target[prop]) {
@@ -260,7 +261,7 @@ export function deepMerge(
  * @description error提示
  * @param {*} err 错误内容
  */
-export function error(err) {
+export function error(err: string): void {
     // 开发环境才提示，生产环境不会提示
     if (process.env.NODE_ENV === 'development') {
         console.error(`uview-plus提示：${err}`)
@@ -303,59 +304,79 @@ export function error(err) {
 //     }
 // }
 
-// /**
-//  * @description 格式化时间
-//  * @param {String|Number} dateTime 需要格式化的时间戳
-//  * @param {String} fmt 格式化规则 yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合 默认yyyy-mm-dd
-//  * @returns {string} 返回格式化后的字符串
-//  */
-//  export function timeFormat(dateTime: any = 0, formatStr: any = 'yyyy-mm-dd'): any {
-//   let date: any
-//     // 若传入时间为假值，则取当前时间
-//   if (dateTime === 0) {
-//     date = new Date()
-//   }
-//   // 若为unix秒时间戳，则转为毫秒时间戳（逻辑有点奇怪，但不敢改，以保证历史兼容）
-//   else if (/^\d{10}$/.test(dateTime.toString().trim())) {
-//     date = new Date(dateTime * 1000)
-//   }
-//   // 若用户传入字符串格式时间戳，new Date无法解析，需做兼容
-//   else if (typeof dateTime === 'string' && /^\d+$/.test(dateTime.trim())) {
-//     date = new Date(Number(dateTime))
-//   }
-//   // 其他都认为符合 RFC 2822 规范
-//   else {
-//     // 处理平台性差异，在Safari/Webkit中，new Date仅支持/作为分割符的字符串时间
-//     date = new Date(
-//       typeof dateTime === 'string'
-//         ? dateTime.replace(/-/g, '/')
-//         : dateTime
-//     )
-//   }
-
-//     const timeSource = {
-//         'y': date.getFullYear().toString(), // 年
-//         'm': (date.getMonth() + 1).toString().padStart(2, '0'), // 月
-//         'd': date.getDate().toString().padStart(2, '0'), // 日
-//         'h': date.getHours().toString().padStart(2, '0'), // 时
-//         'M': date.getMinutes().toString().padStart(2, '0'), // 分
-//         's': date.getSeconds().toString().padStart(2, '0') // 秒
-//         // 有其他格式化字符需求可以继续添加，必须转化成字符串
-//     }
-
-//   for (const key in timeSource) {
-//     const ret = new RegExp(`${key}+`).exec(formatStr) || ['']
-//     if (ret[0]) {
-//       // 年可能只需展示两位
-//       const beginIndex = key === 'y' && ret.length === 2 ? 2 : 0
-//       if (timeSource && timeSource[key] && key) {
-//         formatStr = formatStr.replace(ret, timeSource[key].slice(beginIndex))
-//       }
-//     }
-//   }
+/**
+ * @description 格式化时间
+ * @param {String|Number} dateTime 需要格式化的时间戳
+ * @param {String} fmt 格式化规则 yyyy:mm:dd|yyyy:mm|yyyy年mm月dd日|yyyy年mm月dd日 hh时MM分等,可自定义组合 默认yyyy-mm-dd
+ * @returns {string} 返回格式化后的字符串
+ */
+ export function timeFormat(dateTime: any = 0, formatStr: string = 'yyyy-mm-dd'): string {
+  let date: any
+    // 若传入时间为假值，则取当前时间
+  if (dateTime === 0) {
+    date = new Date()
+  }
+  // 若为unix秒时间戳，则转为毫秒时间戳（逻辑有点奇怪，但不敢改，以保证历史兼容）
+  else if (/^\d{10}$/.test(dateTime.toString().trim())) {
+    date = new Date(parseInt(dateTime.toString()) * 1000)
+  }
+  // 若用户传入字符串格式时间戳，new Date无法解析，需做兼容
+  else if (typeof dateTime === 'string' && /^\d+$/.test(dateTime.toString().trim())) {
+    date = new Date(parseInt(dateTime.toString()))
+  }
+  // 其他都认为符合 RFC 2822 规范
+  else {
+    // 处理平台性差异，在Safari/Webkit中，new Date仅支持/作为分割符的字符串时间
+    date = new Date(
+      typeof dateTime === 'string'
+        ? dateTime.toString().replace(/-/g, '/')
+        : dateTime.toString()
+    )
+  }
+
+    const timeSource = {
+        // 'y': date.getFullYear().toString(), // 年
+        // 'm': (date.getMonth() as number + 1).toString().padStart(2, '0'), // 月
+        // 'd': date.getDate().toString().padStart(2, '0'), // 日
+        // 'h': date.getHours().toString().padStart(2, '0'), // 时
+        // 's': date.getSeconds().toString().padStart(2, '0') // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    } as UTSJSONObject
+	timeSource['y'] = date.getFullYear().toString()
+	timeSource['m'] = (date.getMonth() as number + 1).toString().padStart(2, '0').toString()
+	timeSource['d'] = date.getDate().toString().padStart(2, '0').toString()
+	timeSource['M'] = date.getMinutes().toString().padStart(2, '0').toString()
+	timeSource['h'] = date.getHours().toString().padStart(2, '0').toString()
+	timeSource['s'] = date.getSeconds().toString().padStart(2, '0').toString()
+
+  let timeSourceReturn = formatStr
+  // console.log(timeSource)
+  for (const key in timeSource) {
+    const ret = new RegExp(`${key}+`).exec(formatStr)
+    if (ret != null && ret[0] != null) {
+	  // console.log('ret', ret)
+	  // 年可能只需展示两位
+	  const beginIndex = key === 'y' && ret.length === 2 ? 2 : 0
+	  if (timeSource != null
+		&& timeSource != null
+		&& timeSource[key] != null
+		&& key != '') {
+		let replaceVal: string = ''
+		let timeSourceKey = timeSource.getString(key)
+		// console.log('timeSourceKey', typeof timeSourceKey)
+		if (timeSourceKey != null) {
+			replaceVal = timeSourceKey!!.slice(beginIndex)
+		}
+		timeSourceReturn = timeSourceReturn.replace(
+			ret[0].toString(),
+			replaceVal
+		)
+	  }
+    }
+  }
 
-//   return formatStr
-// }
+  return timeSourceReturn
+}
 
 // /**
 //  * @description 时间戳转为多久之前
@@ -482,18 +503,18 @@ export function error(err) {
 //     return _result.length ? prefix + _result.join('&') : ''
 // }
 
-// /**
-//  * 显示消息提示框
-//  * @param {String} title 提示的内容，长度与 icon 取值有关。
-//  * @param {Number} duration 提示的延迟时间，单位毫秒，默认：2000
-//  */
-// export function toast(title, duration = 2000) {
-//     uni.showToast({
-//         title: String(title),
-//         icon: 'none',
-//         duration
-//     })
-// }
+/**
+ * 显示消息提示框
+ * @param {String} title 提示的内容，长度与 icon 取值有关。
+ * @param {Number} duration 提示的延迟时间，单位毫秒，默认：2000
+ */
+export function toast(title: string, duration = 2000) {
+    uni.showToast({
+        title: title,
+        icon: 'none',
+        duration
+    })
+}
 
 // /**
 //  * @description 根据主题type值,获取对应的图标
@@ -529,34 +550,42 @@ export function error(err) {
 //     return iconName
 // }
 
-// /**
-//  * @description 数字格式化
-//  * @param {number|string} number 要格式化的数字
-//  * @param {number} decimals 保留几位小数
-//  * @param {string} decimalPoint 小数点符号
-//  * @param {string} thousandsSeparator 千分位符号
-//  * @returns {string} 格式化后的数字
-//  */
-// export function priceFormat(number, decimals = 0, decimalPoint = '.', thousandsSeparator = ','): any {
-//     number = (`${number}`).replace(/[^0-9+-Ee.]/g, '')
-//     const n = !isFinite(+number) ? 0 : +number
-//     const prec = !isFinite(+decimals) ? 0 : Math.abs(decimals)
-//     const sep = (typeof thousandsSeparator === 'undefined') ? ',' : thousandsSeparator
-//     const dec = (typeof decimalPoint === 'undefined') ? '.' : decimalPoint
-//     let s: any = []
-
-//     s = (prec ? round(n, prec) + '' : `${Math.round(n)}`).split('.')
-//     const re = /(-?\d+)(\d{3})/
-//     while (re.test(s[0])) {
-//         s[0] = s[0].replace(re, `$1${sep}$2`)
-//     }
+/**
+ * @description 数字格式化
+ * @param {number|string} number 要格式化的数字
+ * @param {number} decimals 保留几位小数
+ * @param {string} decimalPoint 小数点符号
+ * @param {string} thousandsSeparator 千分位符号
+ * @returns {string} 格式化后的数字
+ */
+export function priceFormat(numberOri: any, decimals = 0, decimalPoint = '.', thousandsSeparator = ','): string {
+	let numberStr: string = numberOri.toString()
+    let numberNo: number = parseFloat((`${numberStr}`).replace(/[^0-9+-Ee.]/g, ''))
+    const n = !isFinite(numberNo) ? 0 : numberNo
+    const prec: number = !isFinite(decimals) ? 0 : Math.abs(decimals)
+    const sep = (typeof thousandsSeparator === 'undefined') ? ',' : thousandsSeparator
+    const dec = (typeof decimalPoint === 'undefined') ? '.' : decimalPoint
+    let s: string[] = []
+	
+	if (prec > 0) {
+		s = n.toString().split('.')
+		s[1] = s[1].slice(0, prec)
+	} else {
+		s = (`${Math.round(n)}`).split('.')
+	}
+    const re = /(-?\d+)(\d{3})/
+    while (re.test(s[0])) {
+        s[0] = s[0].replace(re, `$1${sep}$2`)
+    }
+	if (s.length > 1) {
+		if ((s[1]).length < prec) {
+			s[1] = s[1]
+			s[1] += new Array(prec - s[1].length + 1).join('0')
+		}
+	}
     
-//     if ((s[1] || '').length < prec) {
-//         s[1] = s[1] || ''
-//         s[1] += new Array(prec - s[1].length + 1).join('0')
-//     }
-//     return s.join(dec)
-// }
+    return s.join(dec)
+}
 
 // /**
 //  * @description 获取duration值
@@ -585,21 +614,21 @@ export function error(err) {
 //     return `00${value}`.slice(-2)
 // }
 
-// /**
-//  * @description 在u-form的子组件内容发生变化，或者失去焦点时，尝试通知u-form执行校验方法
-//  * @param {*} instance
-//  * @param {*} event
-//  */
-// export function formValidate(instance, event): any {
-//     // todox
-//     // const formItem = uni.$u.$parent.call(instance, 'u-form-item')
-//     // const form = uni.$u.$parent.call(instance, 'u-form')
-//     // // 如果发生变化的input或者textarea等，其父组件中有u-form-item或者u-form等，就执行form的validate方法
-//     // // 同时将form-item的pros传递给form，让其进行精确对象验证
-//     // if (formItem && form) {
-//     // 	form.validateField(formItem.prop, () => {}, event)
-//     // }
-// }
+/**
+ * @description 在up-form的子组件内容发生变化，或者失去焦点时，尝试通知up-form执行校验方法
+ * @param {*} instance
+ * @param {*} event
+ */
+export function formValidate(instance, event): void {
+    // todox
+    // const formItem = uni.$u.$parent.call(instance, 'up-form-item')
+    // const form = uni.$u.$parent.call(instance, 'up-form')
+    // // 如果发生变化的input或者textarea等，其父组件中有up-form-item或者up-form等，就执行form的validate方法
+    // // 同时将form-item的pros传递给form，让其进行精确对象验证
+    // if (formItem && form) {
+    // 	form.validateField(formItem.prop, () => {}, event)
+    // }
+}
 
 // /**
 //  * @description 获取某个对象下的属性，用于通过类似'a.b.c'的形式去获取一个对象的的属性的形式
@@ -696,7 +725,7 @@ export function error(err) {
 //     config = {},
 //     color = {},
 //     zIndex = {}
-// }): object {
+// }): object {
 // 	return {}
 //     // const {
 //     // 	deepMerge,
diff --git a/src/uni_modules/uview-plus/libs/function/test.uts b/src/uni_modules/uview-plus/libs/function/test.uts
index ef4152a68..2e3ce9e09 100644
--- a/src/uni_modules/uview-plus/libs/function/test.uts
+++ b/src/uni_modules/uview-plus/libs/function/test.uts
@@ -26,8 +26,11 @@ export function url(value: string): boolean {
 export function date(value: string): boolean {
     if (value == '') return false
     // 判断是否数值或者字符串数值(意味着为时间戳)，转为数值，否则new Date无法识别字符串时间戳
-    // if (number(value)) value = +value
-    return !/Invalid|NaN/.test(new Date(value).toString())
+    let valueNo = 0
+	if (number(value)) {
+		valueNo = parseInt(value)
+	}
+    return !/Invalid|NaN/.test(new Date(valueNo).toString())
 }
 
 /**
@@ -125,7 +128,7 @@ export function contains(value: string, param: string): boolean {
 /**
  * 验证一个值范围[min, max]
  */
-export function range(value: number, param: Array<number>): boolean {
+export function range(value: number, param: Array<number>): boolean {
 	return true
     // return value >= param[0] && value <= param[1]
 }
@@ -133,7 +136,7 @@ export function range(value: number, param: Array<number>): boolean {
 /**
  * 验证一个长度范围[min, max]
  */
-export function rangeLength(value: string, param: Array<number>): boolean {
+export function rangeLength(value: string, param: Array<number>): boolean {
 	return true
     // return value.length >= param[0] && value.length <= param[1]
 }
@@ -149,26 +152,26 @@ export function landline(value: string): boolean {
 /**
  * 判断是否为空
  */
-export function empty(value: any): boolean {
-    switch (typeof value) {
-        case 'undefined':
-            return true;
-        case 'string':
-            // 去除字符串两端的空白字符，并检查长度是否为0。
-            return value == '';
-        case 'boolean':
-            return value == false;
-        case 'number':
-            return value === 0;
-        case 'object':
-            // 对于数组，检查其长度是否为0
-            // if (Array.isArray(value) && value.length === 0) {
-            //     return true;
-            // }
-            // 对于null或其他对象类型，返回false  
-            return false;
-    }
-    return false;
+export function empty(value: any): boolean {
+    switch (typeof value) {
+        case 'undefined':
+            return true;
+        case 'string':
+            // 去除字符串两端的空白字符，并检查长度是否为0。
+            return value == '';
+        case 'boolean':
+            return value == false;
+        case 'number':
+            return value === 0;
+        case 'object':
+            // 对于数组，检查其长度是否为0
+            // if (Array.isArray(value) && value.length === 0) {
+            //     return true;
+            // }
+            // 对于null或其他对象类型，返回false  
+            return false;
+    }
+    return false;
 }
 
 /**
@@ -192,11 +195,11 @@ export function jsonString(value: string): boolean {
 /**
  * 是否数组
  */
-export function array(value: any): boolean {
-	if ("object" == typeof value) {
-		return value instanceof Array
-	} else {
-		return false
+export function array(value: any): boolean {
+	if ("object" == typeof value) {
+		return value instanceof Array
+	} else {
+		return false
 	}
 }
 
@@ -204,10 +207,10 @@ export function array(value: any): boolean {
  * 是否对象
  */
 export function object(value: any): boolean {
-    if ("object" == typeof value) {
-    	return value instanceof Object
-    } else {
-    	return false
+    if ("object" == typeof value) {
+    	return value instanceof Object
+    } else {
+    	return false
     }
 }
 
@@ -222,18 +225,16 @@ export function code(value: string, len = 6): boolean {
  * 是否函数方法
  * @param {Object} value
  */
-export function func(value: string): boolean {
-	return true
-//     return typeof value === 'export function'
+export function func(value: any): boolean {
+    return typeof value === 'function'
 }
 
 /**
  * 是否promise对象
  * @param {Object} value
  */
-export function promise(value: any): boolean {
-	return true
-	// return value instanceof Promise<T>
+export function promise(value: any): boolean {
+	return value instanceof Promise<T>
 	// return object(value) && func(value.then) && func(value.catch)
 }
 
@@ -260,18 +261,18 @@ export function video(value: string): boolean {
  * @param {Object}
  * @return {Boolean}
  */
-export function regExp(o: object): boolean {
+export function regExp(o: object): boolean {
 	return true
     // return o && Object.prototype.toString.call(o) === '[object RegExp]'
-}
+}
 
 // export default {
-//     email,
-//     mobile,
-//     url,
-//     date,
-//     dateISO,
-//     number,
+//     email: email,
+//     mobile: mobile,
+//     url: url,
+//     date: date,
+//     dateISO: dateISO,
+//     number: number,
 //     digits,
 //     idCard,
 //     carNo,
diff --git a/uni-app-x/components/page-nav/page-nav.vue b/uni-app-x/components/page-nav/page-nav.vue
index eade4a8b5..46d374f3e 100644
--- a/uni-app-x/components/page-nav/page-nav.vue
+++ b/uni-app-x/components/page-nav/page-nav.vue
@@ -5,7 +5,7 @@
 				height="70px" /> -->
 			<view class="nav-info">
 				<view class="nav-info__title" @tap="jumpToWx">
-					<text class="nav-info__title__text">uview-plus3</text>
+					<text class="nav-info__title__text">uview-plus 4</text>
 					<!-- #ifdef MP-WEIXIN -->
 					<!-- uni-app不支持text内部的text组件的tap事件，所以放到外部响应tap -->
 					<text class="nav-info__title__jump">查看演示</text>
diff --git a/uni-app-x/pages.json b/uni-app-x/pages.json
index 33e92a422..d77be871c 100644
--- a/uni-app-x/pages.json
+++ b/uni-app-x/pages.json
@@ -1,5 +1,560 @@
 {
-	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
		{
			"path": "pages/example/components",
			"style": {
				"navigationBarTitleText": "uview-plus"
			}
		},
		// 演示-模板
		{
			"path": "pages/example/template",
			"style": {
				"navigationBarTitleText": "模板"
			}
		}
	],
	"subPackages": [{
		"root": "pages/componentsA",
		"pages": [
			// 过渡动画
			// {
			// 	"path": "transition/transition",
			// 	"style": {
			// 		"navigationBarTitleText": "过渡动画"
			// 	}
			// },
			// {
			// 	"path": "test/test",
			// 	"style": {
			// 		"navigationBarTitleText": "测试"
			// 	}
			// },
			{
				"path": "icon/icon",
				"style": {
					"navigationBarTitleText": "图标"
				}
			},
			// {
			// 	"path": "cell/cell",
			// 	"style": {
			// 		"navigationBarTitleText": "单元格"
			// 	}
			// },
			{
				"path": "line/line",
				"style": {
					"navigationBarTitleText": "线条"
				}
			},
			{
				"path": "image/image",
				"style": {
					"navigationBarTitleText": "图片"
				}
			},
			// {
			// 	"path": "link/link",
			// 	"style": {
			// 		"navigationBarTitleText": "超链接"
			// 	}
			// },
			{
				"path": "button/button",
				"style": {
					"navigationBarTitleText": "按钮"
				}
			}
			// {
			// 	"path": "loading-icon/loading-icon",
			// 	"style": {
			// 		"navigationBarTitleText": "加载中图标"
			// 	}
			// },
			// {
			// 	"path": "overlay/overlay",
			// 	"style": {
			// 		"navigationBarTitleText": "遮罩层",
			// 		"navigationStyle": "custom"
			// 	}
			// },
			// {
			// 	"path": "loading-page/loading-page",
			// 	"style": {
			// 		"navigationBarTitleText": "加载页",
			// 		"navigationStyle": "custom"
			// 	}
			// },
			// {
			// 	"path": "popup/popup",
			// 	"style": {
			// 		"navigationBarTitleText": "弹窗",
			// 		"navigationStyle": "custom"
			// 	}
			// },
			// {
			// 	"path": "swipeAction/swipeAction",
			// 	"style": {
			// 		"navigationBarTitleText": "滑动单元格"
			// 	}
			// },
			// {
			// 	"path": "sticky/sticky",
			// 	"style": {
			// 		"navigationBarTitleText": "吸顶"
			// 	}
			// },
			// {
			// 	"path": "radio/radio",
			// 	"style": {
			// 		"navigationBarTitleText": "单选框"
			// 	}
			// },
			// {
			// 	"path": "checkbox/checkbox",
			// 	"style": {
			// 		"navigationBarTitleText": "复选框"
			// 	}
			// },
			// {
			// 	"path": "empty/empty",
			// 	"style": {
			// 		"navigationBarTitleText": "内容为空"
			// 	}
			// },
			// {
			// 	"path": "backtop/backtop",
			// 	"style": {
			// 		"navigationBarTitleText": "返回顶部"
			// 	}
			// },
			// {
			// 	"path": "divider/divider",
			// 	"style": {
			// 		"navigationBarTitleText": "分割线"
			// 	}
			// },
			// {
			// 	"path": "rate/rate",
			// 	"style": {
			// 		"navigationBarTitleText": "评分"
			// 	}
			// },
			// {
			// 	"path": "gap/gap",
			// 	"style": {
			// 		"navigationBarTitleText": "间隔槽"
			// 	}
			// },
			// {
			// 	"path": "grid/grid",
			// 	"style": {
			// 		"navigationBarTitleText": "宫格"
			// 	}
			// }
		]
	}, {
		"root": "pages/componentsB",
		"pages": [
		// {
		// 	"path": "dropdown/dropdown",
		// 	"style": {
		// 		"navigationBarTitleText": "下拉菜单"
		// 	}
		// }, {
		// 	"path": "actionSheet/actionSheet",
		// 	"style": {
		// 		"navigationBarTitleText": "上拉菜单",
		// 		"navigationStyle": "custom"
		// 	}
		// }, {
		// 	"path": "parse/parse",
		// 	"style": {
		// 		"navigationBarTitleText": "富文本解析器"
		// 	}
		// }, {
		// 	"path": "parse/jump",
		// 	"style": {
		// 		"navigationBarTitleText": "内部链接"
		// 	}
		// }, {
		// 	"path": "toast/toast",
		// 	"style": {
		// 		"navigationBarTitleText": "提示消息"
		// 	}
		// }, {
		// 	"path": "keyboard/keyboard",
		// 	"style": {
		// 		"navigationBarTitleText": "键盘",
		// 		"navigationStyle": "custom"
		// 	}
		// }, {
		// 	"path": "slider/slider",
		// 	"style": {
		// 		"navigationBarTitleText": "滑动选择器"
		// 	}
		// }, {
		// 	"path": "upload/upload",
		// 	"style": {
		// 		"navigationBarTitleText": "上传"
		// 	}
		// }, {
		// 	"path": "notify/notify",
		// 	"style": {
		// 		"navigationBarTitleText": "消息提示"
		// 	}
		// }, {
		// 	"path": "countDown/countDown",
		// 	"style": {
		// 		"navigationBarTitleText": "倒计时"
		// 	}
		// }, {
		// 	"path": "color/color",
		// 	"style": {
		// 		"navigationBarTitleText": "色彩"
		// 	}
		// }, {
		// 	"path": "numberBox/numberBox",
		// 	"style": {
		// 		"navigationBarTitleText": "步进器"
		// 	}
		// }, {
		// 	"path": "countTo/countTo",
		// 	"style": {
		// 		"navigationBarTitleText": "数字滚动"
		// 	}
		// }, {
		// 	"path": "search/search",
		// 	"style": {
		// 		"navigationBarTitleText": "搜索"
		// 	}
		// }, {
		// 	"path": "badge/badge",
		// 	"style": {
		// 		"navigationBarTitleText": "徽标数"
		// 	}
		// }, {
		// 	"path": "tag/tag",
		// 	"style": {
		// 		"navigationBarTitleText": "标签"
		// 	}
		// }, {
		// 	"path": "alert/alert",
		// 	"style": {
		// 		"navigationBarTitleText": "警告"
		// 	}
		// }, {
		// 	"path": "switch/switch",
		// 	"style": {
		// 		"navigationBarTitleText": "开关"
		// 	}
		// }, {
		// 	"path": "collapse/collapse",
		// 	"style": {
		// 		"navigationBarTitleText": "折叠面板"
		// 	}
		// }, {
		// 	"path": "code/code",
		// 	"style": {
		// 		"navigationBarTitleText": "验证码"
		// 	}
		// }, {
		// 	"path": "noticeBar/noticeBar",
		// 	"style": {
		// 		"navigationBarTitleText": "滚动通知"
		// 	}
		// }, {
		// 	"path": "progress/progress",
		// 	"style": {
		// 		"navigationBarTitleText": "进度条"
		// 	}
		// }, {
		// 	"path": "tabbar/tabbar",
		// 	"style": {
		// 		"navigationBarTitleText": "Tabbar"
		// 	}
		// },
		]
	}, {
		"root": "pages/componentsC",
		"pages": [
		// {
		// 	"path": "table/table",
		// 	"style": {
		// 		"navigationBarTitleText": "表格"
		// 	}
		// }, {
		// 	"path": "form/form",
		// 	"style": {
		// 		"navigationBarTitleText": "表单",
		// 		"navigationStyle": "custom"
		// 	}
		// }, {
		// 	"path": "textarea/textarea",
		// 	"style": {
		// 		"navigationBarTitleText": "文本域"
		// 	}
		// }, {
		// 	"path": "noNetwork/noNetwork",
		// 	"style": {
		// 		"navigationBarTitleText": "无网络提示"
		// 	}
		// }, {
		// 	"path": "loadmore/loadmore",
		// 	"style": {
		// 		"navigationBarTitleText": "加载更多"
		// 	}
		// }, {
		// 	"path": "text/text",
		// 	"style": {
		// 		"navigationBarTitleText": "文本"
		// 	}
		// }, {
		// 	"path": "steps/steps",
		// 	"style": {
		// 		"navigationBarTitleText": "步骤条"
		// 	}
		// }, {
		// 	"path": "navbar/navbar",
		// 	"style": {
		// 		"navigationBarTitleText": "导航栏",
		// 		"navigationStyle": "custom"
		// 	}
		// }, {
		// 	"path": "skeleton/skeleton",
		// 	"style": {
		// 		"navigationBarTitleText": "骨架屏"
		// 	}
		// }, {
		// 	"path": "input/input",
		// 	"style": {
		// 		"navigationBarTitleText": "输入框"
		// 	}
		// }, {
		// 	"path": "album/album",
		// 	"style": {
		// 		"navigationBarTitleText": "相册"
		// 	}
		// }, {
		// 	"path": "avatar/avatar",
		// 	"style": {
		// 		"navigationBarTitleText": "头像"
		// 	}
		// }, {
		// 	"path": "readMore/readMore",
		// 	"style": {
		// 		"navigationBarTitleText": "阅读更多"
		// 	}
		// }, {
		// 	"path": "layout/layout",
		// 	"style": {
		// 		"navigationBarTitleText": "布局"
		// 	}
		// }, {
		// 	"path": "indexList/indexList",
		// 	"style": {
		// 		"navigationBarTitleText": "索引列表"
		// 	}
		// }, {
		// 	"path": "tooltip/tooltip",
		// 	"style": {
		// 		"navigationBarTitleText": "长按提示"
		// 	}
		// }, {
		// 	"path": "tabs/tabs",
		// 	"style": {
		// 		"navigationBarTitleText": "标签"
		// 	}
		// }, {
		// 	"path": "list/list",
		// 	"style": {
		// 		"navigationBarTitleText": "列表"
		// 	}
		// }, {
		// 	"path": "swiper/swiper",
		// 	"style": {
		// 		"navigationBarTitleText": "轮播"
		// 	}
		// }, {
		// 	"path": "scrollList/scrollList",
		// 	"style": {
		// 		"navigationBarTitleText": "横向滚动列表"
		// 	}
		// }, {
		// 	"path": "codeInput/codeInput",
		// 	"style": {
		// 		"navigationBarTitleText": "验证码输入"
		// 	}
		// }, {
		// 	"path": "modal/modal",
		// 	"style": {
		// 		"navigationBarTitleText": "模态框",
		// 		"navigationStyle": "custom"
		// 	}
		// }, {
		// 	"path": "picker/picker",
		// 	"style": {
		// 		"navigationBarTitleText": "选择器",
		// 		"navigationStyle": "custom"
		// 	}
		// }, {
		// 	"path": "calendar/calendar",
		// 	"style": {
		// 		"navigationBarTitleText": "日历",
		// 		"navigationStyle": "custom"
		// 	}
		// }, {
		// 	"path": "datetimePicker/datetimePicker",
		// 	"style": {
		// 		"navigationBarTitleText": "时间选择",
		// 		"navigationStyle": "custom"
		// 	}
		// }, {
		// 	"path": "subsection/subsection",
		// 	"style": {
		// 		"navigationBarTitleText": "分段器"
		// 	}
		// },
		]
	},
	{
		"root": "pages/componentsD",
		"pages": [
			// {
			// 	"path": "qrcode/qrcode",
			// 	"style": {
			// 		"navigationBarTitleText": "二维码"
			// 	}
			// },
		]
	},
	{
		"root": "pages/template",
		"pages": [
			// wxCenter 仿微信个人中心
			// {
			// 	"path": "wxCenter/index",
			// 	"style": {
			// 		"navigationBarTitleText": "wxCenter 仿微信个人中心",
			// 		"navigationStyle": "custom"
			// 	}
			// },
			// // keyboardPay 自定义键盘支付
			// {
			// 	"path": "keyboardPay/index",
			// 	"style": {
			// 		"navigationBarTitleText": "keyboardPay 自定义键盘支付"
			// 	}
			// },
			// // douyin 仿抖音
			// // {
			// // 	"path": "douyin/index",
			// // 	"style": {
			// // 		"navigationBarTitleText": "douyin 仿抖音"
			// // 	}
			// // },
			// // mallMenu商城分类
			// {
			// 	"path": "mallMenu/index2",
			// 	"style": {
			// 		"navigationBarTitleText": "mallMenu-商城分类"
			// 	}
			// },
			// // mallMenu商城分类
			// {
			// 	"path": "mallMenu/index1",
			// 	"style": {
			// 		"navigationBarTitleText": "mallMenu-商城分类"
			// 	}
			// },
			// // coupon优惠券
			// {
			// 	"path": "coupon/index",
			// 	"style": {
			// 		"navigationBarTitleText": "coupon-优惠券"
			// 	}
			// },
			// {
			// 	"path": "login/index",
			// 	"style": {
			// 		"navigationBarTitleText": "美团登录"
			// 	}
			// },
			// // 城市选择
			// {
			// 	"path": "citySelect/index",
			// 	"style": {
			// 		"navigationBarTitleText": "城市选择"
			// 	}
			// },
			// // SubmitBar提交订单栏
			// {
			// 	"path": "submitBar/index",
			// 	"style": {
			// 		"navigationBarTitleText": "提交订单栏"
			// 	}
			// },
			// // comment评论
			// {
			// 	"path": "comment/index",
			// 	"style": {
			// 		"navigationBarTitleText": "评论"
			// 	}
			// },
			// // comment评论详情
			// {
			// 	"path": "comment/reply",
			// 	"style": {
			// 		"navigationBarTitleText": "评论详情"
			// 	}
			// },
			// // order订单
			// {
			// 	"path": "order/index",
			// 	"style": {
			// 		"navigationBarTitleText": "订单"
			// 	}
			// },
			// // login登录获取验证码
			// {
			// 	"path": "login/code",
			// 	"style": {
			// 		"navigationBarTitleText": "登录获取验证码"
			// 	}
			// },
			// // address用户地址
			// {
			// 	"path": "address/index",
			// 	"style": {
			// 		"navigationBarTitleText": "用户地址"
			// 	}
			// },
			// // address添加用户地址
			// {
			// 	"path": "address/addSite",
			// 	"style": {
			// 		"navigationBarTitleText": "添加用户地址"
			// 	}
			// }
		]
	}],
	"preloadRule": {
		"pages/example/components": {
			"network": "all",
			"packages": ["pages/componentsA", "pages/componentsB"]
		}
	},
	"easycom": {
		// 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175
		"custom": {
			"^up-(.*)": "@/uni_modules/uview-plus/components/up-$1/up-$1.uvue"
		}
	},
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/example/components",
+			"style": {
+				"navigationBarTitleText": "uview-plus"
+			}
+		},
+		// 演示-模板
+		{
+			"path": "pages/example/template",
+			"style": {
+				"navigationBarTitleText": "模板"
+			}
+		}
+	],
+	"subPackages": [{
+		"root": "pages/componentsA",
+		"pages": [
+			// 过渡动画
+			// {
+			// 	"path": "transition/transition",
+			// 	"style": {
+			// 		"navigationBarTitleText": "过渡动画"
+			// 	}
+			// },
+			// {
+			// 	"path": "test/test",
+			// 	"style": {
+			// 		"navigationBarTitleText": "测试"
+			// 	}
+			// },
+			{
+				"path": "icon/icon",
+				"style": {
+					"navigationBarTitleText": "图标"
+				}
+			},
+			// {
+			// 	"path": "cell/cell",
+			// 	"style": {
+			// 		"navigationBarTitleText": "单元格"
+			// 	}
+			// },
+			{
+				"path": "line/line",
+				"style": {
+					"navigationBarTitleText": "线条"
+				}
+			},
+			{
+				"path": "image/image",
+				"style": {
+					"navigationBarTitleText": "图片"
+				}
+			},
+			// {
+			// 	"path": "link/link",
+			// 	"style": {
+			// 		"navigationBarTitleText": "超链接"
+			// 	}
+			// },
+			{
+				"path": "button/button",
+				"style": {
+					"navigationBarTitleText": "按钮"
+				}
+			}
+			// {
+			// 	"path": "loading-icon/loading-icon",
+			// 	"style": {
+			// 		"navigationBarTitleText": "加载中图标"
+			// 	}
+			// },
+			// {
+			// 	"path": "overlay/overlay",
+			// 	"style": {
+			// 		"navigationBarTitleText": "遮罩层",
+			// 		"navigationStyle": "custom"
+			// 	}
+			// },
+			// {
+			// 	"path": "loading-page/loading-page",
+			// 	"style": {
+			// 		"navigationBarTitleText": "加载页",
+			// 		"navigationStyle": "custom"
+			// 	}
+			// },
+			// {
+			// 	"path": "popup/popup",
+			// 	"style": {
+			// 		"navigationBarTitleText": "弹窗",
+			// 		"navigationStyle": "custom"
+			// 	}
+			// },
+			// {
+			// 	"path": "swipeAction/swipeAction",
+			// 	"style": {
+			// 		"navigationBarTitleText": "滑动单元格"
+			// 	}
+			// },
+			// {
+			// 	"path": "sticky/sticky",
+			// 	"style": {
+			// 		"navigationBarTitleText": "吸顶"
+			// 	}
+			// },
+			// {
+			// 	"path": "radio/radio",
+			// 	"style": {
+			// 		"navigationBarTitleText": "单选框"
+			// 	}
+			// },
+			// {
+			// 	"path": "checkbox/checkbox",
+			// 	"style": {
+			// 		"navigationBarTitleText": "复选框"
+			// 	}
+			// },
+			// {
+			// 	"path": "empty/empty",
+			// 	"style": {
+			// 		"navigationBarTitleText": "内容为空"
+			// 	}
+			// },
+			// {
+			// 	"path": "backtop/backtop",
+			// 	"style": {
+			// 		"navigationBarTitleText": "返回顶部"
+			// 	}
+			// },
+			// {
+			// 	"path": "divider/divider",
+			// 	"style": {
+			// 		"navigationBarTitleText": "分割线"
+			// 	}
+			// },
+			// {
+			// 	"path": "rate/rate",
+			// 	"style": {
+			// 		"navigationBarTitleText": "评分"
+			// 	}
+			// },
+			// {
+			// 	"path": "gap/gap",
+			// 	"style": {
+			// 		"navigationBarTitleText": "间隔槽"
+			// 	}
+			// },
+			// {
+			// 	"path": "grid/grid",
+			// 	"style": {
+			// 		"navigationBarTitleText": "宫格"
+			// 	}
+			// }
+		]
+	}, {
+		"root": "pages/componentsB",
+		"pages": [
+		// {
+		// 	"path": "dropdown/dropdown",
+		// 	"style": {
+		// 		"navigationBarTitleText": "下拉菜单"
+		// 	}
+		// }, {
+		// 	"path": "actionSheet/actionSheet",
+		// 	"style": {
+		// 		"navigationBarTitleText": "上拉菜单",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "parse/parse",
+		// 	"style": {
+		// 		"navigationBarTitleText": "富文本解析器"
+		// 	}
+		// }, {
+		// 	"path": "parse/jump",
+		// 	"style": {
+		// 		"navigationBarTitleText": "内部链接"
+		// 	}
+		// }, {
+		// 	"path": "toast/toast",
+		// 	"style": {
+		// 		"navigationBarTitleText": "提示消息"
+		// 	}
+		// }, {
+		// 	"path": "keyboard/keyboard",
+		// 	"style": {
+		// 		"navigationBarTitleText": "键盘",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "slider/slider",
+		// 	"style": {
+		// 		"navigationBarTitleText": "滑动选择器"
+		// 	}
+		// }, {
+		// 	"path": "upload/upload",
+		// 	"style": {
+		// 		"navigationBarTitleText": "上传"
+		// 	}
+		// }, {
+		// 	"path": "notify/notify",
+		// 	"style": {
+		// 		"navigationBarTitleText": "消息提示"
+		// 	}
+		// }, {
+		// 	"path": "countDown/countDown",
+		// 	"style": {
+		// 		"navigationBarTitleText": "倒计时"
+		// 	}
+		// }, 
+		{
+			"path": "color/color",
+			"style": {
+				"navigationBarTitleText": "色彩"
+			}
+		}
+		// , {
+		// 	"path": "numberBox/numberBox",
+		// 	"style": {
+		// 		"navigationBarTitleText": "步进器"
+		// 	}
+		// }, {
+		// 	"path": "countTo/countTo",
+		// 	"style": {
+		// 		"navigationBarTitleText": "数字滚动"
+		// 	}
+		// }, {
+		// 	"path": "search/search",
+		// 	"style": {
+		// 		"navigationBarTitleText": "搜索"
+		// 	}
+		// }, {
+		// 	"path": "badge/badge",
+		// 	"style": {
+		// 		"navigationBarTitleText": "徽标数"
+		// 	}
+		// }, {
+		// 	"path": "tag/tag",
+		// 	"style": {
+		// 		"navigationBarTitleText": "标签"
+		// 	}
+		// }, {
+		// 	"path": "alert/alert",
+		// 	"style": {
+		// 		"navigationBarTitleText": "警告"
+		// 	}
+		// }, {
+		// 	"path": "switch/switch",
+		// 	"style": {
+		// 		"navigationBarTitleText": "开关"
+		// 	}
+		// }, {
+		// 	"path": "collapse/collapse",
+		// 	"style": {
+		// 		"navigationBarTitleText": "折叠面板"
+		// 	}
+		// }, {
+		// 	"path": "code/code",
+		// 	"style": {
+		// 		"navigationBarTitleText": "验证码"
+		// 	}
+		// }, {
+		// 	"path": "noticeBar/noticeBar",
+		// 	"style": {
+		// 		"navigationBarTitleText": "滚动通知"
+		// 	}
+		// }, {
+		// 	"path": "progress/progress",
+		// 	"style": {
+		// 		"navigationBarTitleText": "进度条"
+		// 	}
+		// }, {
+		// 	"path": "tabbar/tabbar",
+		// 	"style": {
+		// 		"navigationBarTitleText": "Tabbar"
+		// 	}
+		// },
+		]
+	}, {
+		"root": "pages/componentsC",
+		"pages": [
+		// {
+		// 	"path": "table/table",
+		// 	"style": {
+		// 		"navigationBarTitleText": "表格"
+		// 	}
+		// }, {
+		// 	"path": "form/form",
+		// 	"style": {
+		// 		"navigationBarTitleText": "表单",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "textarea/textarea",
+		// 	"style": {
+		// 		"navigationBarTitleText": "文本域"
+		// 	}
+		// }, {
+		// 	"path": "noNetwork/noNetwork",
+		// 	"style": {
+		// 		"navigationBarTitleText": "无网络提示"
+		// 	}
+		// }, {
+		// 	"path": "loadmore/loadmore",
+		// 	"style": {
+		// 		"navigationBarTitleText": "加载更多"
+		// 	}
+		// },
+		{
+			"path": "text/text",
+			"style": {
+				"navigationBarTitleText": "文本"
+			}
+		}
+		// {
+		// 	"path": "steps/steps",
+		// 	"style": {
+		// 		"navigationBarTitleText": "步骤条"
+		// 	}
+		// }, {
+		// 	"path": "navbar/navbar",
+		// 	"style": {
+		// 		"navigationBarTitleText": "导航栏",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "skeleton/skeleton",
+		// 	"style": {
+		// 		"navigationBarTitleText": "骨架屏"
+		// 	}
+		// }, {
+		// 	"path": "input/input",
+		// 	"style": {
+		// 		"navigationBarTitleText": "输入框"
+		// 	}
+		// }, {
+		// 	"path": "album/album",
+		// 	"style": {
+		// 		"navigationBarTitleText": "相册"
+		// 	}
+		// }, {
+		// 	"path": "avatar/avatar",
+		// 	"style": {
+		// 		"navigationBarTitleText": "头像"
+		// 	}
+		// }, {
+		// 	"path": "readMore/readMore",
+		// 	"style": {
+		// 		"navigationBarTitleText": "阅读更多"
+		// 	}
+		// }, {
+		// 	"path": "layout/layout",
+		// 	"style": {
+		// 		"navigationBarTitleText": "布局"
+		// 	}
+		// }, {
+		// 	"path": "indexList/indexList",
+		// 	"style": {
+		// 		"navigationBarTitleText": "索引列表"
+		// 	}
+		// }, {
+		// 	"path": "tooltip/tooltip",
+		// 	"style": {
+		// 		"navigationBarTitleText": "长按提示"
+		// 	}
+		// }, {
+		// 	"path": "tabs/tabs",
+		// 	"style": {
+		// 		"navigationBarTitleText": "标签"
+		// 	}
+		// }, {
+		// 	"path": "list/list",
+		// 	"style": {
+		// 		"navigationBarTitleText": "列表"
+		// 	}
+		// }, {
+		// 	"path": "swiper/swiper",
+		// 	"style": {
+		// 		"navigationBarTitleText": "轮播"
+		// 	}
+		// }, {
+		// 	"path": "scrollList/scrollList",
+		// 	"style": {
+		// 		"navigationBarTitleText": "横向滚动列表"
+		// 	}
+		// }, {
+		// 	"path": "codeInput/codeInput",
+		// 	"style": {
+		// 		"navigationBarTitleText": "验证码输入"
+		// 	}
+		// }, {
+		// 	"path": "modal/modal",
+		// 	"style": {
+		// 		"navigationBarTitleText": "模态框",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "picker/picker",
+		// 	"style": {
+		// 		"navigationBarTitleText": "选择器",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "calendar/calendar",
+		// 	"style": {
+		// 		"navigationBarTitleText": "日历",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "datetimePicker/datetimePicker",
+		// 	"style": {
+		// 		"navigationBarTitleText": "时间选择",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }, {
+		// 	"path": "subsection/subsection",
+		// 	"style": {
+		// 		"navigationBarTitleText": "分段器"
+		// 	}
+		// },
+		]
+	},
+	{
+		"root": "pages/componentsD",
+		"pages": [
+			// {
+			// 	"path": "qrcode/qrcode",
+			// 	"style": {
+			// 		"navigationBarTitleText": "二维码"
+			// 	}
+			// },
+		]
+	},
+	{
+		"root": "pages/template",
+		"pages": [
+			// wxCenter 仿微信个人中心
+			// {
+			// 	"path": "wxCenter/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "wxCenter 仿微信个人中心",
+			// 		"navigationStyle": "custom"
+			// 	}
+			// },
+			// // keyboardPay 自定义键盘支付
+			// {
+			// 	"path": "keyboardPay/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "keyboardPay 自定义键盘支付"
+			// 	}
+			// },
+			// // douyin 仿抖音
+			// // {
+			// // 	"path": "douyin/index",
+			// // 	"style": {
+			// // 		"navigationBarTitleText": "douyin 仿抖音"
+			// // 	}
+			// // },
+			// // mallMenu商城分类
+			// {
+			// 	"path": "mallMenu/index2",
+			// 	"style": {
+			// 		"navigationBarTitleText": "mallMenu-商城分类"
+			// 	}
+			// },
+			// // mallMenu商城分类
+			// {
+			// 	"path": "mallMenu/index1",
+			// 	"style": {
+			// 		"navigationBarTitleText": "mallMenu-商城分类"
+			// 	}
+			// },
+			// // coupon优惠券
+			// {
+			// 	"path": "coupon/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "coupon-优惠券"
+			// 	}
+			// },
+			// {
+			// 	"path": "login/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "美团登录"
+			// 	}
+			// },
+			// // 城市选择
+			// {
+			// 	"path": "citySelect/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "城市选择"
+			// 	}
+			// },
+			// // SubmitBar提交订单栏
+			// {
+			// 	"path": "submitBar/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "提交订单栏"
+			// 	}
+			// },
+			// // comment评论
+			// {
+			// 	"path": "comment/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "评论"
+			// 	}
+			// },
+			// // comment评论详情
+			// {
+			// 	"path": "comment/reply",
+			// 	"style": {
+			// 		"navigationBarTitleText": "评论详情"
+			// 	}
+			// },
+			// // order订单
+			// {
+			// 	"path": "order/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "订单"
+			// 	}
+			// },
+			// // login登录获取验证码
+			// {
+			// 	"path": "login/code",
+			// 	"style": {
+			// 		"navigationBarTitleText": "登录获取验证码"
+			// 	}
+			// },
+			// // address用户地址
+			// {
+			// 	"path": "address/index",
+			// 	"style": {
+			// 		"navigationBarTitleText": "用户地址"
+			// 	}
+			// },
+			// // address添加用户地址
+			// {
+			// 	"path": "address/addSite",
+			// 	"style": {
+			// 		"navigationBarTitleText": "添加用户地址"
+			// 	}
+			// }
+		]
+	}],
+	"preloadRule": {
+		"pages/example/components": {
+			"network": "all",
+			"packages": ["pages/componentsA", "pages/componentsB"]
+		}
+	},
+	"easycom": {
+		// 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175
+		"custom": {
+			"^up-(.*)": "@/uni_modules/uview-plus/components/up-$1/up-$1.uvue"
+		}
+	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app x",
@@ -7,4 +562,4 @@
 		"backgroundColor": "#F8F8F8"
 	},
 	"uniIdRouter": {}
-}
+}
diff --git a/uni-app-x/pages/componentsA/sticky/sticky.nvue b/uni-app-x/pages/componentsA/sticky/sticky.nvue
index 62f92c56f..030f48c44 100644
--- a/uni-app-x/pages/componentsA/sticky/sticky.nvue
+++ b/uni-app-x/pages/componentsA/sticky/sticky.nvue
@@ -9,15 +9,15 @@
 		></up-navbar> -->
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">基础使用</text>
-			<up--text
+			<up-text
 				type="content"
 				text="滚动页面,即可看到下方的按钮会吸顶。"
-			></up--text>
+			></up-text>
 			<!-- #ifdef APP-NVUE -->
-			<up--text
+			<up-text
 				type="warning"
 				text="目前由于nvue的bug,设置sticky的top值无效。"
-			></up--text>
+			></up-text>
 			<!-- #endif -->
 		</view>
 		<up-sticky>
diff --git a/uni-app-x/pages/componentsB/color/color.nvue b/uni-app-x/pages/componentsB/color/color.uvue
similarity index 100%
rename from uni-app-x/pages/componentsB/color/color.nvue
rename to uni-app-x/pages/componentsB/color/color.uvue
diff --git a/uni-app-x/pages/componentsC/album/album.nvue b/uni-app-x/pages/componentsC/album/album.nvue
index c55f148f2..a849c6db0 100644
--- a/uni-app-x/pages/componentsC/album/album.nvue
+++ b/uni-app-x/pages/componentsC/album/album.nvue
@@ -12,16 +12,16 @@
 						></image>
 					</view>
 					<view class="album__content">
-						<up--text
+						<up-text
 						    text="uView UI"
 						    type="primary"
 						    bold
 						    size="17"
-						></up--text>
-						<up--text
+						></up-text>
+						<up-text
 						    margin="0 0 8px 0"
 						    text="全面的组件和便捷的工具会让您信手拈来，如鱼得水"
-						></up--text>
+						></up-text>
 						<up-album
 						    :urls="urls1"
 						    keyName="src2"
@@ -42,16 +42,16 @@
 						></image>
 					</view>
 					<view class="album__content">
-						<up--text
+						<up-text
 						    text="uView UI"
 						    type="primary"
 						    bold
 						    size="17"
-						></up--text>
-						<up--text
+						></up-text>
+						<up-text
 						    margin="0 0 8px 0"
 						    text="全面的组件和便捷的工具会让您信手拈来，如鱼得水"
-						></up--text>
+						></up-text>
 						<up-album :urls="urls2"></up-album>
 					</view>
 				</view>
@@ -69,22 +69,22 @@
 						></image>
 					</view>
 					<view class="album__content">
-						<up--text
+						<up-text
 						    text="uView UI"
 						    type="primary"
 						    bold
 						    size="17"
-						></up--text>
+						></up-text>
 						<view :style="{
 							marginBottom: '8px',
 							width: albumWidth + 'px'
 						}">
-							<up--text
+							<up-text
 							    text="全面的组件和便捷的工具会让您信手拈来，如鱼得水"
 							    :customStyle="{
 									width: albumWidth + 'px'
 								}"
-							></up--text>
+							></up-text>
 						</view>
 						<up-album
 						    :urls="urls2"
@@ -107,16 +107,16 @@
 						></image>
 					</view>
 					<view class="album__content">
-						<up--text
+						<up-text
 						    text="uView UI"
 						    type="primary"
 						    bold
 						    size="17"
-						></up--text>
-						<up--text
+						></up-text>
+						<up-text
 						    margin="0 0 8px 0"
 						    text="全面的组件和便捷的工具会让您信手拈来，如鱼得水"
-						></up--text>
+						></up-text>
 						<up-album
 						    :urls="urls3"
 						    rowCount="2"
@@ -139,16 +139,16 @@
 						></image>
 					</view>
 					<view class="album__content">
-						<up--text
+						<up-text
 						    text="uView UI"
 						    type="primary"
 						    bold
 						    size="17"
-						></up--text>
-						<up--text
+						></up-text>
+						<up-text
 						    margin="0 0 8px 0"
 						    text="全面的组件和便捷的工具会让您信手拈来，如鱼得水"
-						></up--text>
+						></up-text>
 						<up-album
 						    :urls="urls4"
 						    rowCount="2"
diff --git a/uni-app-x/pages/componentsC/form/form.nvue b/uni-app-x/pages/componentsC/form/form.nvue
index d0fcff36d..61c810c83 100644
--- a/uni-app-x/pages/componentsC/form/form.nvue
+++ b/uni-app-x/pages/componentsC/form/form.nvue
@@ -11,7 +11,7 @@
 			<text class="u-demo-block__title">基础使用</text>
 			<view class="u-demo-block__content">
 				<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
-				<up--form
+				<up-form
 					labelPosition="left"
 					:model="model1"
 					ref="form1"
@@ -22,11 +22,11 @@
 						borderBottom
 						ref="item1"
 					>
-						<up--input
+						<up-input
 							v-model="model1.userInfo.name"
 							border="none"
 							placeholder="姓名,只能为中文"
-						></up--input>
+						></up-input>
 					</up-form-item>
 					<up-form-item
 						label="性别"
@@ -35,13 +35,13 @@
 						@click="showSex = true; hideKeyboard()"
 						ref="item1"
 					>
-						<up--input
+						<up-input
 							v-model="model1.userInfo.sex"
 							disabled
 							disabledColor="#ffffff"
 							placeholder="请选择性别"
 							border="none"
-						></up--input>
+						></up-input>
 						<up-icon
 							slot="right"
 							name="arrow-right"
@@ -92,11 +92,11 @@
 						borderBottom
 						ref="item3"
 					>
-						<up--textarea
+						<up-textarea
 							placeholder="不低于3个字"
 							v-model="model1.intro"
 							count
-						></up--textarea>
+						></up-textarea>
 					</up-form-item>
 					<up-form-item
 						label="住店时间"
@@ -105,13 +105,13 @@
 						borderBottom
 						@click="showCalendar = true; hideKeyboard()"
 					>
-						<up--input
+						<up-input
 							v-model="model1.hotel"
 							disabled
 							disabledColor="#ffffff"
 							placeholder="请选择住店和离店时间"
 							border="none"
-						></up--input>
+						></up-input>
 						<up-icon
 							slot="right"
 							name="arrow-right"
@@ -123,11 +123,11 @@
 						labelWidth="80"
 						borderBottom
 					>
-						<up--input
+						<up-input
 							v-model="model1.code"
 							border="none"
 							placeholder="请填写验证码"
-						></up--input>
+						></up-input>
 						<up-button
 							#right
 							@tap="getCode"
@@ -145,19 +145,19 @@
 						@click="showBirthday = true; hideKeyboard()"
 						ref="item1"
 					>
-						<up--input
+						<up-input
 							v-model="model1.userInfo.birthday"
 							disabled
 							disabledColor="#ffffff"
 							placeholder="请选择生日"
 							border="none"
-						></up--input>
+						></up-input>
 						<up-icon
 							slot="right"
 							name="arrow-right"
 						></up-icon>
 					</up-form-item>
-				</up--form>
+				</up-form>
 				<up-button
 					type="primary"
 					text="提交"
diff --git a/uni-app-x/pages/componentsC/input/input.nvue b/uni-app-x/pages/componentsC/input/input.nvue
index f34943e33..175dd50de 100644
--- a/uni-app-x/pages/componentsC/input/input.nvue
+++ b/uni-app-x/pages/componentsC/input/input.nvue
@@ -15,83 +15,83 @@
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">可清空内容</text>
 			<view class="u-demo-block__content">
-				<up--input
+				<up-input
 					placeholder="请输入内容"
 					border="surround"
 					clearable
-				></up--input>
+				></up-input>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">数字键盘</text>
 			<view class="u-demo-block__content">
-				<up--input
+				<up-input
 					placeholder="请输入内容"
 					border="surround"
 					type="number"
 					clearable
-				></up--input>
+				></up-input>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">密码类型</text>
 			<view class="u-demo-block__content">
-				<up--input
+				<up-input
 					placeholder="请输入内容"
 					border="surround"
 					password
 					clearable
-				></up--input>
+				></up-input>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">显示下划线</text>
 			<view class="u-demo-block__content">
-				<up--input
+				<up-input
 					placeholder="请输入内容"
 					border="bottom"
 					clearable
-				></up--input>
+				></up-input>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">禁用状态</text>
 			<view class="u-demo-block__content">
-				<up--input
+				<up-input
 					placeholder="禁用状态"
 					border="surround"
 					disabled
-				></up--input>
+				></up-input>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">圆形</text>
 			<view class="u-demo-block__content">
-				<up--input
+				<up-input
 					placeholder="请输入内容"
 					border="surround"
 					shape="circle"
-				></up--input>
+				></up-input>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">前后图标</text>
 			<view class="u-demo-block__content">
-				<up--input
+				<up-input
 					placeholder="前置图标"
 					prefixIcon="search"
 					prefixIconStyle="font-size: 22px;color: #909399"
-				></up--input>
+				></up-input>
 			</view>
 			<view
 				class="u-demo-block__content"
 				style="margin-top: 15px;"
 			>
-				<up--input
+				<up-input
 					placeholder="后置图标"
 					suffixIcon="map-fill"
 					suffixIconStyle="color: #909399"
-				></up--input>
+				></up-input>
 			</view>
 		</view>
 		<view class="u-demo-block">
@@ -102,19 +102,19 @@
 				<up-input placeholder="前置插槽">
 					<!-- #endif -->
 					<!-- #ifdef APP-NVUE -->
-					<up--input placeholder="前置插槽">
+					<up-input placeholder="前置插槽">
 						<!-- #endif -->
-						<up--text
+						<up-text
 							text="http://"
 							slot="prefix"
 							margin="0 3px 0 0"
 							type="tips"
-						></up--text>
+						></up-text>
 						<!-- #ifndef APP-NVUE -->
 				</up-input>
 				<!-- #endif -->
 				<!-- #ifdef APP-NVUE -->
-				</up--input>
+				</up-input>
 				<!-- #endif -->
 			</view>
 			<view
@@ -126,7 +126,7 @@
 				<up-input placeholder="后置插槽">
 					<!-- #endif -->
 					<!-- #ifdef APP-NVUE -->
-					<up--input placeholder="后置插槽">
+					<up-input placeholder="后置插槽">
 						<!-- #endif -->
 						<template slot="suffix">
 							<up-code
@@ -146,7 +146,7 @@
 				</up-input>
 				<!-- #endif -->
 				<!-- #ifdef APP-NVUE -->
-				</up--input>
+				</up-input>
 				<!-- #endif -->
 			</view>
 		</view>
diff --git a/uni-app-x/pages/componentsC/skeleton/skeleton.nvue b/uni-app-x/pages/componentsC/skeleton/skeleton.nvue
index b74366a75..2f422fde7 100644
--- a/uni-app-x/pages/componentsC/skeleton/skeleton.nvue
+++ b/uni-app-x/pages/componentsC/skeleton/skeleton.nvue
@@ -106,17 +106,17 @@
 								class="u-skeleton-slot__image"
 							></image>
 							<view class="u-skeleton-slot__content">
-								<up--text
+								<up-text
 									text="利剑出鞘,一统江湖"
 									type="main"
 									size="16"
-								></up--text>
-								<up--text
+								></up-text>
+								<up-text
 									type="tips"
 									size="14"
 									customStyle="margin-top: 5px"
 									text="众多组件覆盖开发过程的各个需求，组件功能丰富，多端兼容。让您快速集成，开箱即用"
-								></up--text>
+								></up-text>
 							</view>
 						</view>
 					</view>
diff --git a/uni-app-x/pages/componentsC/table/table.nvue b/uni-app-x/pages/componentsC/table/table.nvue
index 5863095c5..85b6ddbee 100644
--- a/uni-app-x/pages/componentsC/table/table.nvue
+++ b/uni-app-x/pages/componentsC/table/table.nvue
@@ -3,9 +3,9 @@
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">基础使用</text>
 			<view class="u-demo-block__content">
-				<up--form>
+				<up-form>
 					<up-form-item lable="电话"></up-form-item>
-				</up--form>
+				</up-form>
 			</view>
 		</view>
 	</view>
diff --git a/uni-app-x/pages/componentsC/text/text.nvue b/uni-app-x/pages/componentsC/text/text.uvue
similarity index 77%
rename from uni-app-x/pages/componentsC/text/text.nvue
rename to uni-app-x/pages/componentsC/text/text.uvue
index 7c7d7ab22..68d4cae10 100644
--- a/uni-app-x/pages/componentsC/text/text.nvue
+++ b/uni-app-x/pages/componentsC/text/text.uvue
@@ -4,10 +4,10 @@
 			<text class="u-demo-block__title">基础功能</text>
 			<view class="u-demo-block__content">
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 						text="我用十年青春,赴你最后之约"
 						@click="test">
-					</up--text>
+					</up-text>
 				</view>
 			</view>
 		</view>
@@ -15,34 +15,34 @@
 			<text class="u-demo-block__title">设置主题</text>
 			<view class="u-demo-block__content">
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    text="主色"
 					    type="primary"
-					></up--text>
+					></up-text>
 				</view>
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    type="error"
 					    text="错误"
-					></up--text>
+					></up-text>
 				</view>
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    type="success"
 					    text="成功"
-					></up--text>
+					></up-text>
 				</view>
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    type="warning"
 					    text="警告"
-					></up--text>
+					></up-text>
 				</view>
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    type="info"
 					    text="信息"
-					></up--text>
+					></up-text>
 				</view>
 			</view>
 		</view>
@@ -50,10 +50,10 @@
 			<text class="u-demo-block__title">拨打电话</text>
 			<view class="u-demo-block__content">
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    mode="phone"
 					    text="15019479320"
-					></up--text>
+					></up-text>
 				</view>
 			</view>
 		</view>
@@ -61,10 +61,10 @@
 			<text class="u-demo-block__title">日期格式化</text>
 			<view class="u-demo-block__content">
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    mode="date"
 					    text="1612959739"
-					></up--text>
+					></up-text>
 				</view>
 			</view>
 		</view>
@@ -72,11 +72,11 @@
 			<text class="u-demo-block__title">姓名脱敏</text>
 			<view class="u-demo-block__content">
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    mode="name"
 					    text="张三三"
 						format="encrypt"
-					></up--text>
+					></up-text>
 				</view>
 			</view>
 		</view>
@@ -84,11 +84,11 @@
 			<text class="u-demo-block__title">超链接</text>
 			<view class="u-demo-block__content">
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    mode="link"
 					    text="Go to uview-plus docs"
 					    href="https://ijry.github.io/uview-plus/"
-					></up--text>
+					></up-text>
 				</view>
 			</view>
 		</view>
@@ -96,10 +96,10 @@
 			<text class="u-demo-block__title">显示金额</text>
 			<view class="u-demo-block__content">
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    mode="price"
 					    text="728732.32"
-					></up--text>
+					></up-text>
 				</view>
 			</view>
 		</view>
@@ -110,39 +110,39 @@
 				    class="u-page__text-item"
 				    style="margin-right: 50px;"
 				>
-					<up--text
+					<up-text
 					    prefixIcon="baidu"
 					    iconStyle="font-size: 19px"
 					    text="百度一下"
-					></up--text>
+					></up-text>
 				</view>
 				<view class="u-page__text-item">
-					<up--text
+					<up-text
 					    suffixIcon="arrow-rightward"
 					    iconStyle="font-size: 18px"
 					    text="查看更多"
-					></up--text>
+					></up-text>
 				</view>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">超出隐藏</text>
 			<view class="u-demo-block__content">
-				<up--text
+				<up-text
 				    :lines="2"
-				    text="关于uView的取名来由，首字母u来自于uni-app首字母，uni-app是基于Vue.js，Vue和View(延伸为UI、视图之意)同音，同时view组件uni-app中 最基础，最重要的组件，故取名uView，表达源于uni-app和Vue之意，同时在此也对它们表示感谢。"
-				></up--text>
+				    text="关于uview-plus的取名来由，首字母u来自于uni-app首字母，uni-app是基于Vue.js，Vue和View(延伸为UI、视图之意)同音，同时view组件uni-app中 最基础，最重要的组件，故取名uview-pls，表达源于uni-app和Vue之意，同时在此也对它们表示感谢。"
+				></up-text>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">小程序开放能力</text>
 			<view class="u-demo-block__content">
-				<up--text
+				<up-text
 				    text="分享到微信"
 				    openType="share"
 				    type="success"
 					@click="clickHandler"
-				></up--text>
+				></up-text>
 			</view>
 		</view>
 	</view>
@@ -156,8 +156,10 @@
 				console.log('test')
 			},
 			clickHandler() {
-				// #ifndef MP-WEIXIN
-				uni.$u.toast('请在微信小程序内查看效果')
+				// #ifndef MP-WEIXIN
+				uni.showToast({
+					title: '请在微信小程序内查看效果'
+				});
 				// #endif
 			}
 		},
diff --git a/uni-app-x/pages/componentsC/textarea/textarea.nvue b/uni-app-x/pages/componentsC/textarea/textarea.nvue
index 0fb3da257..296465eca 100644
--- a/uni-app-x/pages/componentsC/textarea/textarea.nvue
+++ b/uni-app-x/pages/componentsC/textarea/textarea.nvue
@@ -3,53 +3,53 @@
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">基础使用</text>
 			<view class="u-demo-block__content">
-				<up--textarea
+				<up-textarea
 					v-model="value1"
 					placeholder="请输入内容"
-				></up--textarea>
+				></up-textarea>
 				{{value1}}
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">字数统计</text>
 			<view class="u-demo-block__content">
-				<up--textarea
+				<up-textarea
 					v-model="value2"
 					placeholder="请输入内容"
 					count
-				></up--textarea>
+				></up-textarea>
 				{{value2}}
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">自动增高</text>
 			<view class="u-demo-block__content">
-				<up--textarea
+				<up-textarea
 					v-model="value3"
 					placeholder="请输入内容"
 					autoHeight
-				></up--textarea>
+				></up-textarea>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">禁用状态</text>
 			<view class="u-demo-block__content">
-				<up--textarea
+				<up-textarea
 					v-model="value4"
 					placeholder="文本域已被禁用"
 					disabled
 					count
-				></up--textarea>
+				></up-textarea>
 			</view>
 		</view>
 		<view class="u-demo-block">
 			<text class="u-demo-block__title">下划线模式</text>
 			<view class="u-demo-block__content">
-				<up--textarea
+				<up-textarea
 					v-model="value5"
 					placeholder="请输入内容"
 					border="bottom"
-				></up--textarea>
+				></up-textarea>
 			</view>
 		</view>
 	</view>